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({