海外标准 - 高级查询 - 日期范围查询和多选查询

2021-12-29 20:06:10 +08:00
parent 38d78f0f06
commit 80f74d0fca
1 changed files with 18 additions and 1 deletions
@@ -3810,9 +3810,26 @@ export default {
      // // 自定义属性字段高级搜索处理
      //advanceSearchVOStr
      const advanceSearchVOList = [];
+      console.log('4333',this.advanceSearchMapping)
      for (let key in this.advanceSearchMapping) {
+        console.log('key',key)
        const value = this.advanceSearchMapping[key];
-        if (value !== null && value !== '') {
+        console.log('value',value)
+        if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'regexp',
+            value: value.join(',')
+          });
+        }else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ' )){
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'between',
+            value: value.join(',')
+          });
+        }else if (value !== null && value !== ''){
          advanceSearchVOList.push({
            connect: "and",
            field: key || '',