From 65e0c185180694d87e4f86cc3a072de280b5bbfa Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 19 Jul 2022 15:16:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=2056586=20?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=E9=87=8C=E8=BE=B9=E7=9A=84?= =?UTF-8?q?=E4=BB=A5=E4=B8=8B=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B9=8B=E5=90=8E=E7=82=B9=E5=87=BB=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E4=B8=8D=E8=83=BD=E9=87=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E5=BF=85=E9=A1=BB=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 41 +------------------ 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 02d131d22..42aac9d03 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3777,43 +3777,6 @@ 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: 'between', - value: value.join(',') - }); - } 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 @@ -4651,12 +4614,12 @@ export default { 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))) { + if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (key === 'CLLX' && item.CLLX && item.CLLX.length > 0))) { advanceSearchVOList.push({ connect: "and", field: key || '', type: 'regexp', - value: value.join(',') + value: list.join(',') }); } else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) { advanceSearchVOList.push({