diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 0c90b9971..be81bde45 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -4617,14 +4617,16 @@ export default { }); } } - if(item.advanceSearchVOStr){ - advanceSearchVOList.push({ - connect: item.advanceSearchVOStr[0].connect, - field: item.advanceSearchVOStr[0].field, - type: item.advanceSearchVOStr[0].type, - value: item.advanceSearchVOStr[0].value, - }) - } + if(item){ + if(item.advanceSearchVOStr.length){ + advanceSearchVOList.push({ + connect: item.advanceSearchVOStr[0].connect, + field: item.advanceSearchVOStr[0].field, + type: item.advanceSearchVOStr[0].type, + value: item.advanceSearchVOStr[0].value, + }) + } + } formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList) this.SarExportSearchEo = formData formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 1f4c48b98..825560ead 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3150,6 +3150,43 @@ 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: 'equals', + value: value + }); + } else if (value !== null && value !== '') { + advanceSearchVOList.push({ + connect: "and", + field: key || '', + type: 'like', + value: value + }); + } + } + item.advanceSearchVOStr = advanceSearchVOList + sessionStorage.setItem('tableFlag', JSON.stringify(item)) item.page = 1 this.standCommonlySearch.page = 1 this.standCommonlySearch.sarStandardsSearch = JSON.stringify(item) || '' @@ -3860,7 +3897,6 @@ export default { * 1、空:普通检索 2:高级检索 * */ getDomesticStandardTable(item) { - // if (item === 2) { // data.standSort = '' // data.standNumber = '' @@ -3939,7 +3975,17 @@ export default { } } - formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); + if(item){ + if(item.advanceSearchVOStr.length){ + advanceSearchVOList.push({ + connect: item.advanceSearchVOStr[0].connect, + field: item.advanceSearchVOStr[0].field, + type: item.advanceSearchVOStr[0].type, + value: item.advanceSearchVOStr[0].value, + }) + } + } + formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList) this.SarExportSearchEo = formData formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null