From 382f34cf284148da3a94c29410d8fe2d1f928eee Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 29 Dec 2021 20:01:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86=20-=20?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=20-=20=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 84d5db3ed..c64f123cf 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -4289,7 +4289,7 @@ export default {
     },
     // 分页查询国内标准
     getDomesticStandardTable(item) {
-      console.log(item)
+      console.log('4292',item)
       if (item !== '' && item !== null && item !== undefined) {
         item.pageSize = this.$store.getters.userInfo.configContent
       }
@@ -4330,9 +4330,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 || '',