禅道bug 51958 51993

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -1896,46 +1896,46 @@ export default {
         this.form.standInData = this.standardSearchForm.standType === 'INLAND' ? '0' : '1'
       },
     },*/
-    'form.standNumber': {
+    // 'form.standNumber': {
-      handler: function () {
+    //   handler: function () {
-        this.standardSearchForm.standNumber = this.form.standNumber
+    //     this.standardSearchForm.standNumber = this.form.standNumber
-      },
+    //   },
-    },
+    // },
-    'standardSearchForm.standNumber': {
+    // 'standardSearchForm.standNumber': {
-      handler: function () {
+    //   handler: function () {
-        this.form.standNumber = this.standardSearchForm.standNumber
+    //     this.form.standNumber = this.standardSearchForm.standNumber
-      },
+    //   },
-    },
+    // },
-    'form.standSort': {
+    // 'form.standSort': {
-      handler: function () {
+    //   handler: function () {
-        this.standardSearchForm.standSort = this.form.standSort
+    //     this.standardSearchForm.standSort = this.form.standSort
-      },
+    //   },
-    },
+    // },
-    'standardSearchForm.standSort': {
+    // 'standardSearchForm.standSort': {
-      handler: function () {
+    //   handler: function () {
-        this.form.standSort = this.standardSearchForm.standSort
+    //     this.form.standSort = this.standardSearchForm.standSort
-      },
+    //   },
-    },
+    // },
-    'form.standName': {
+    // 'form.standName': {
-      handler: function () {
+    //   handler: function () {
-        this.standardSearchForm.standName = this.form.standName
+    //     this.standardSearchForm.standName = this.form.standName
-      },
+    //   },
-    },
+    // },
-    'standardSearchForm.standName': {
+    // 'standardSearchForm.standName': {
-      handler: function () {
+    //   handler: function () {
-        this.form.standName = this.standardSearchForm.standName
+    //     this.form.standName = this.standardSearchForm.standName
-      },
+    //   },
-    },
+    // },
-    'form.standEnName': {
+    // 'form.standEnName': {
-      handler: function () {
+    //   handler: function () {
-        this.standardSearchForm.standEnName = this.form.standEnName
+    //     this.standardSearchForm.standEnName = this.form.standEnName
-      },
+    //   },
-    },
+    // },
-    'standardSearchForm.standEnName': {
+    // 'standardSearchForm.standEnName': {
-      handler: function () {
+    //   handler: function () {
-        this.form.standEnName = this.standardSearchForm.standEnName
+    //     this.form.standEnName = this.standardSearchForm.standEnName
-      },
+    //   },
-    },
+    // },
   },
   methods: {
     // 标准来源改变事件

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -3718,6 +3718,43 @@ export default {
     },
     // 搜索
     getDomesticStandardTableBtn(item) {
+      // // 自定义属性字段高级搜索处理
+      //advanceSearchVOStr
+      const advanceSearchVOList = [];
+      for (let key in this.advanceSearchMapping) {
+        const value = this.advanceSearchMapping[key];
+        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 !== '' && (key === 'BARQ')) {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'equals',
+            value: value
+          });
+        } else if (value !== null && value !== '' && (key === 'TXLBName')) {
+        } else if (value !== null && value !== '') {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'like',
+            value: value
+          });
+        }
+      }
+      item.advanceSearchVOStr = advanceSearchVOList
       sessionStorage.setItem('tableFlag', JSON.stringify(item))
       this.tableFlag = item
       item.page = 1
@@ -4575,7 +4612,15 @@ export default {
           });
         }
       }
-      formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+      if(item.advanceSearchVOStr){
+        advanceSearchVOList.push({
+          connect: item.advanceSearchVOStr[0].connect,
+          field: item.advanceSearchVOStr[0].field,
+          type: item.advanceSearchVOStr[0].type,
+          value: item.advanceSearchVOStr[0].value,
+        })
+      }
+      formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList)
       this.SarExportSearchEo = formData
       formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
       formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null