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 1/3] =?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 || '', From 80f74d0fcaf1979ad2db8257958a008ac6294d25 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 29 Dec 2021 20:06:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=B7=E5=A4=96=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 --- .../foreignStandardsAndRegulations/index.vue | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 1f8b30b35..0ed587664 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -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 || '', From 3f7af8fc63d6006819aa95abf636b0b2bf3912bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 29 Dec 2021 20:42:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdjhgk/component/establish.vue | 4 ++-- .../pages/creatProcess/qbzxdjhgk/component/merge.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 23c33f0ad..c91987b76 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -268,7 +268,7 @@
@@ -344,7 +344,7 @@ export default { standSystemOptions: [], QYBZform: { page: 1, - pageSzie: this.$store.getters.userInfo.configContent, + pageSize: this.$store.getters.userInfo.configContent, validFlag: '0', userId: this.$store.getters.userInfo.userId, standCode: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index fb1329fd4..6ba125ffd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -436,7 +436,7 @@
@@ -514,7 +514,7 @@ export default { standSystemOptions: [], QYBZform: { page: 1, - pageSzie: this.$store.getters.userInfo.configContent, + pageSize: this.$store.getters.userInfo.configContent, validFlag: '0', userId: this.$store.getters.userInfo.userId, standCode: '',