From 382f34cf284148da3a94c29410d8fe2d1f928eee Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 29 Dec 2021 20:01:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86=20-=20?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=20-=20=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 84d5db3ed..c64f123cf 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -4289,7 +4289,7 @@ export default { }, // 分页查询国内标准 getDomesticStandardTable(item) { - console.log(item) + console.log('4292',item) if (item !== '' && item !== null && item !== undefined) { item.pageSize = this.$store.getters.userInfo.configContent } @@ -4330,9 +4330,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 || '', From 80f74d0fcaf1979ad2db8257958a008ac6294d25 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 29 Dec 2021 20:06:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=20-=20?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2=20-=20=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2=E5=92=8C=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) 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 || '', From 3f7af8fc63d6006819aa95abf636b0b2bf3912bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 29 Dec 2021 20:42:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdjhgk/component/establish.vue | 4 ++-- .../pages/creatProcess/qbzxdjhgk/component/merge.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index 23c33f0ad..c91987b76 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -268,7 +268,7 @@
@@ -344,7 +344,7 @@ export default { standSystemOptions: [], QYBZform: { page: 1, - pageSzie: this.$store.getters.userInfo.configContent, + pageSize: this.$store.getters.userInfo.configContent, validFlag: '0', userId: this.$store.getters.userInfo.userId, standCode: '', diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index fb1329fd4..6ba125ffd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -436,7 +436,7 @@
@@ -514,7 +514,7 @@ export default { standSystemOptions: [], QYBZform: { page: 1, - pageSzie: this.$store.getters.userInfo.configContent, + pageSize: this.$store.getters.userInfo.configContent, validFlag: '0', userId: this.$store.getters.userInfo.userId, standCode: '', From 843179208260ef1b6dbb46679cc02772e4228351 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 30 Dec 2021 10:53:11 +0800 Subject: [PATCH 4/4] commit --- .../pages/creatProcess/bzjd/step2.vue | 2 +- .../pages/creatProcess/bzjd/step3.vue | 2 +- .../pages/creatProcess/bzjd/step4.vue | 2 +- .../pages/creatProcess/bzjd/step5.vue | 2 +- .../pages/creatProcess/bzjd/step6.vue | 2 +- .../pages/creatProcess/bzzqyj/step1-1.vue | 55 ++++++++++++------- .../pages/creatProcess/bzzqyj/step1-9.vue | 2 +- .../pages/creatProcess/bzzqyj/step1.vue | 48 ++++++++-------- .../pages/creatProcess/bzzqyj/step2.vue | 2 +- .../pages/creatProcess/bzzqyj/step3.vue | 5 +- .../pages/creatProcess/bzzqyj/step4-1.vue | 2 +- .../pages/creatProcess/bzzqyj/step4-2.vue | 2 +- .../pages/creatProcess/bzzqyj/step4.vue | 4 +- .../pages/creatProcess/bzzqyj/step5.vue | 2 +- .../pages/creatProcess/bzzqyj/step6.vue | 2 +- .../pages/creatProcess/bzzqyj/step7.vue | 2 +- .../pages/creatProcess/bzzqyj/step8.vue | 2 +- .../pages/creatProcess/bzzqyj/step9.vue | 2 +- 18 files changed, 79 insertions(+), 61 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 0bd81f495..32df2bcfe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -150,7 +150,7 @@ show-overflow-tooltip align="center"> + + + + + +
选择附件 @@ -51,7 +61,7 @@ v-model="form.fjListId" style="display: none;" > -
+
{{ item.fileName }} { - // this.fjList = res.data - // this.fzlistModel = true - // }) }, handleSelection2(data) { - if (data.length > 1) { - this.$message.warning('最多选择1条附件') - } else { - this.addFjList = data - } + this.addFjList = data }, closeDrawer2() { this.fzlistModel = false @@ -619,16 +623,18 @@ export default { enterDrawer2() { this.fzlistModel = false this.form.fjList = this.addFjList - this.form.textType = this.setWBType(this.addFjList[0].standFileClassify) - this.form.textValue = this.addFjList[0].standFileClassify let idList = [] let nameList = [] this.addFjList.forEach(item => { - idList.push(item.id) - nameList.push(item.fileName) + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.fileName }) - this.form.fjListName = nameList.join(',') - this.form.fjListId = idList.join(',') + this.form.fjListName = nameList + this.form.fjListId = idList }, // 点击查看 handlePreview(item) { @@ -681,7 +687,7 @@ export default { sarStandCompareHis() { this.spinShow = true var formData = this.standCommonlySearch - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1', formData, { _this: this }, res => { this.standInfoList = res.data.list @@ -725,7 +731,14 @@ export default { } else { this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName } + this.form.standType = bringData[0].standType + this.form.standId = bringData[0].id this.listModel = false; + this.$http.get('SarStandItems/sar-stand-items/getFileType', { + standId: bringData[0].id + }, {}, res => { + this.textTypeList = res.data + }) } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); } else { @@ -747,7 +760,7 @@ export default { }) if (this.type2 === '1') { this.roleForm.dockUserList = idList - this.roleForm.dockUserName = nameList + this.roleForm.dockUserListName = nameList } else { this.roleForm.directorUser = idList this.roleForm.directorUserName = nameList diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index 0a2f22706..3d6e695ee 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -53,7 +53,7 @@ v-model="form.fjListId" style="display: none;" > -
+
{{ item.fileName }}
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 850227d12..947de6b05 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -43,6 +43,16 @@ placeholder="请选择结束日期"> + + + + + +
选择附件 @@ -51,7 +61,7 @@ v-model="form.fjListId" style="display: none;" > -
+
{{ item.fileName }} { - // this.fjList = res.data - // this.fzlistModel = true - // }) }, handleSelection2(data) { - if (data.length > 1) { - this.$message.warning('最多选择1条附件') - } else { - this.addFjList = data - } + this.addFjList = data }, closeDrawer2() { this.fzlistModel = false @@ -629,16 +632,18 @@ export default { enterDrawer2() { this.fzlistModel = false this.form.fjList = this.addFjList - this.form.textType = this.setWBType(this.addFjList[0].standFileClassify) - this.form.textValue = this.addFjList[0].standFileClassify let idList = [] let nameList = [] this.addFjList.forEach(item => { - idList.push(item.id) - nameList.push(item.fileName) + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.fileName }) - this.form.fjListName = nameList.join(',') - this.form.fjListId = idList.join(',') + this.form.fjListName = nameList + this.form.fjListId = idList }, // 点击查看 handlePreview(item) { @@ -729,9 +734,8 @@ export default { this.listModel = false; this.$http.get('SarStandItems/sar-stand-items/getFileType', { standId: bringData[0].id - }, res => { - console.log(data); - console.log(res.data); + }, {}, res => { + this.textTypeList = res.data }) } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 94ef10e6d..3b8a22377 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -45,7 +45,7 @@ v-model="form.fjListId" style="display: none;" > -
+
-
+
{ if (res.ok) { this.options = res.data.list + console.log(res); } }, e => { }) @@ -691,7 +692,7 @@ this.form.endTime = data.endTime || data.form.endTime this.todoId = res.id this.json = data - this.getItemList(data.standId,this.form.textValue) + this.getItemList(data.standId,data.textType) this.data = data.info || data.data || data.form.data || [] }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 9a957e8d5..f885298fb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -45,7 +45,7 @@ v-model="form.fjListId" style="display: none;" > -
+
-
+
-
+
{ }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 7982461c2..1dbab8c1c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -45,7 +45,7 @@ v-model="form.fjListId" style="display: none;" > -
+
-
+
-
+
-
+
-
+