Commit c7315d91dcc148e5574190c3d816eec283ac870f

Authored by Min
1 parent 2d8b2b73

1.EBC版本都有这个问题,选择第三个查询方案”全部机台计划”

src/components/Common/SearchComponent/index.js
@@ -744,7 +744,7 @@ export default class SearchComponent extends Component { @@ -744,7 +744,7 @@ export default class SearchComponent extends Component {
744 sSqlCondition = searchColumnsCurrent[0].sSqlCondition; 744 sSqlCondition = searchColumnsCurrent[0].sSqlCondition;
745 ([{ showDropDown, sAssignField }] = searchColumnsCurrent); 745 ([{ showDropDown, sAssignField }] = searchColumnsCurrent);
746 } 746 }
747 - const sSecondConditionPro = firstDataIndex === 's' && sFirstValue.endsWith('_pro'); /* 字段名以s开头,sFilterName以pro结尾,则只有等于条件 */ 747 + const sSecondConditionPro = firstDataIndex === 's' && sFirstValue?.endsWith('_pro'); /* 字段名以s开头,sFilterName以pro结尾,则只有等于条件 */
748 const showSecondConfig = { 748 const showSecondConfig = {
749 sId: commonUtils.createSid(), 749 sId: commonUtils.createSid(),
750 sName: `sSecond-${key}`, 750 sName: `sSecond-${key}`,
@@ -1243,7 +1243,7 @@ export default class SearchComponent extends Component { @@ -1243,7 +1243,7 @@ export default class SearchComponent extends Component {
1243 getTranslatedSeaJudge = (type, sLanguage) => { 1243 getTranslatedSeaJudge = (type, sLanguage) => {
1244 const { seaJudge } = commonConfig; 1244 const { seaJudge } = commonConfig;
1245 const judgeMap = seaJudge[type] || []; 1245 const judgeMap = seaJudge[type] || [];
1246 - 1246 +
1247 // 定义翻译映射 1247 // 定义翻译映射
1248 const translations = { 1248 const translations = {
1249 sEnglish: { 1249 sEnglish: {
@@ -1300,7 +1300,7 @@ export default class SearchComponent extends Component { @@ -1300,7 +1300,7 @@ export default class SearchComponent extends Component {
1300 value: translations[sLanguage][item.value] || item.value 1300 value: translations[sLanguage][item.value] || item.value
1301 })); 1301 }));
1302 } 1302 }
1303 - 1303 +
1304 return judgeMap; 1304 return judgeMap;
1305 }; 1305 };
1306 1306