From 88c935f7a1c7c817f0009e0c4306dfbba8903f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 28 Mar 2022 11:06:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A6=85=E9=81=93bug=2051958=20=2051993?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 80 +++++++++---------- .../domesticStandardsAndRegulations/index.vue | 47 ++++++++++- 2 files changed, 86 insertions(+), 41 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index fa49035fe..c25feaa1a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1896,46 +1896,46 @@ export default { this.form.standInData = this.standardSearchForm.standType === 'INLAND' ? '0' : '1' }, },*/ - 'form.standNumber': { - handler: function () { - this.standardSearchForm.standNumber = this.form.standNumber - }, - }, - 'standardSearchForm.standNumber': { - handler: function () { - this.form.standNumber = this.standardSearchForm.standNumber - }, - }, - 'form.standSort': { - handler: function () { - this.standardSearchForm.standSort = this.form.standSort - }, - }, - 'standardSearchForm.standSort': { - handler: function () { - this.form.standSort = this.standardSearchForm.standSort - }, - }, - 'form.standName': { - handler: function () { - this.standardSearchForm.standName = this.form.standName - }, - }, - 'standardSearchForm.standName': { - handler: function () { - this.form.standName = this.standardSearchForm.standName - }, - }, - 'form.standEnName': { - handler: function () { - this.standardSearchForm.standEnName = this.form.standEnName - }, - }, - 'standardSearchForm.standEnName': { - handler: function () { - this.form.standEnName = this.standardSearchForm.standEnName - }, - }, + // 'form.standNumber': { + // handler: function () { + // this.standardSearchForm.standNumber = this.form.standNumber + // }, + // }, + // 'standardSearchForm.standNumber': { + // handler: function () { + // this.form.standNumber = this.standardSearchForm.standNumber + // }, + // }, + // 'form.standSort': { + // handler: function () { + // this.standardSearchForm.standSort = this.form.standSort + // }, + // }, + // 'standardSearchForm.standSort': { + // handler: function () { + // this.form.standSort = this.standardSearchForm.standSort + // }, + // }, + // 'form.standName': { + // handler: function () { + // this.standardSearchForm.standName = this.form.standName + // }, + // }, + // 'standardSearchForm.standName': { + // handler: function () { + // this.form.standName = this.standardSearchForm.standName + // }, + // }, + // 'form.standEnName': { + // handler: function () { + // this.standardSearchForm.standEnName = this.form.standEnName + // }, + // }, + // 'standardSearchForm.standEnName': { + // handler: function () { + // this.form.standEnName = this.standardSearchForm.standEnName + // }, + // }, }, methods: { // 标准来源改变事件 diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 7f760d98e..d4d8f97c3 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3718,6 +3718,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 !== '' && (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 @@ -4575,7 +4612,15 @@ export default { }); } } - formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); + 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, + }) + } + formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList) this.SarExportSearchEo = formData formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null From f28a12a67687f6fa519a99588e4daf4b6b9fb375 Mon Sep 17 00:00:00 2001 From: zhangyichen <5277314+zacty@user.noreply.gitee.com> Date: Mon, 28 Mar 2022 11:23:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052185=20=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95--=E6=9F=A5=E7=9C=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=AE=8C=E6=B2=A1=E5=8F=8D=E5=BA=94=EF=BC=8C=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=B0=E6=B2=A1=E7=9C=8B=E8=A7=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/details.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 7c1f2fcc1..9e1fb8f91 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -621,14 +621,14 @@ export default { const advanceSearchVOList = []; for (let key in formData) { const value = formData[key]; - if (value !== null && value !== '' && value.length > 0 && (key === 'SYRZ' || key === 'CLLX')) { + if (value !== null && value !== '' && value !== undefined && value !== [] && (key === 'SYRZ' || key === 'CLLX')) { advanceSearchVOList.push({ connect: "and", field: key || '', type: 'regexp', value: value.join(',') }); - } else if (value !== null && value !== '' && value.length > 0 && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) { + } else if (value !== null && value !== '' && value !== undefined && value !== [] && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) { advanceSearchVOList.push({ connect: "and", field: key || '',