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 || '',