From dc7f11c8c06325e66cc611cbd46ed606fc79bf7b Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 21 Jan 2022 10:30:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BD=93=E7=B3=BB=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 389bfc5c2..b55a81e2f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -659,7 +659,7 @@ > - + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 1929470df..86a37b849 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -466,7 +466,7 @@ > - + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 83c9feb63..9c77d2db4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -377,7 +377,7 @@ > - + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 4fdc1be61..48955485f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -866,7 +866,7 @@ > - + From 40e48c191540733eb273f973bae3e440d67f3ed0 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 21 Jan 2022 12:01:36 +0800 Subject: [PATCH 2/4] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 3 +++ src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 3 +++ src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 35a648308..176dc863b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -423,6 +423,7 @@ Date: Fri, 21 Jan 2022 15:59:40 +0800 Subject: [PATCH 3/4] commit --- .../pages/creatProcess/bzzqyj/step3.vue | 21 +++++++++++++++---- .../pages/creatProcess/bzzqyj/step4.vue | 18 +++++++++++++++- .../pages/creatProcess/bzzqyj/step5.vue | 6 ------ .../pags/consultationDetails.vue | 13 ++++++++++-- 4 files changed, 45 insertions(+), 13 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 1279e34f5..b96977649 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -432,7 +432,6 @@ } } }, - saveUserInfo2 () { if (this.addType === 'add') { this.data.push(this.editForm) @@ -446,8 +445,23 @@ this.data[a].reason = this.editForm.reason } } - this.modalshowflag2 = false - console.log(this.editForm); + if (this.addType === 'add') { + var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); + this.itemId = id + this.editForm = { + chapterNumber: '', + chapterName: '', + oldText: '', + newText: '', + reason: '', + id: id, + department: this.$store.getters.userInfo.institutionName, + responUserName: this.$store.getters.userInfo.userName, + responUser: this.$store.getters.userInfo.userId + } + } else if (this.addType === 'edit') { + this.modalshowflag2 = false + } }, addModal() { var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); @@ -480,7 +494,6 @@ reason: row.reason, } }, - cancleUserInfo2 () { this.modalshowflag2 = false }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 049c5d3e5..aa0bb8ae0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -486,7 +486,23 @@ export default { this.data[a].reason = this.editForm.reason } } - this.modalshowflag2 = false + if (this.addType === 'add') { + var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); + this.itemId = id + this.editForm = { + chapterNumber: '', + chapterName: '', + oldText: '', + newText: '', + reason: '', + id: id, + department: this.$store.getters.userInfo.institutionName, + responUserName: this.$store.getters.userInfo.userName, + responUser: this.$store.getters.userInfo.userId + } + } else if (this.addType === 'edit') { + this.modalshowflag2 = false + } }, addModal() { var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 51142db10..47b55eca0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -450,12 +450,6 @@ saveUserInfo2 () { for( let a = 0; a < this.data.length; a++) { if (this.data[a].id === this.itemId) { - // this.data[a].chapterNumber = this.editForm.chapterNumber - // this.data[a].chapterName = this.editForm.chapterName - // this.data[a].oldText = this.editForm.oldText - // this.data[a].newText = this.editForm.newText - // this.data[a].reason = this.editForm.reason - // this.data[a].cause = this.editForm.cause this.$set(this.data, a, this.editForm); } } diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 381663abc..212a98648 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -210,7 +210,7 @@ - +
@@ -465,9 +465,18 @@ export default { if (res.respCode === '200') { this.form.page = 1 this.getList() + if (this.type === 'edit') { + this.isDialog = false + } else { + this.id = '' + this.opinionContent.partCode = '' + this.opinionContent.reason = '' + this.opinionContent.oldText = '' + this.opinionContent.newText = '' + this.opinionContent.cause = '' + } } }) - this.isDialog = false } }) }, From 2ed370e48ccbb90ec15448afbf56b376c32ca79e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 21 Jan 2022 16:48:58 +0800 Subject: [PATCH 4/4] feat: There is no way the, --- .../processList/tabComponents/taskDraft/index.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 304e79380..a5f18c6c3 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -291,6 +291,16 @@ export default { verifySarStandard: true, } }) + }else if (mes.taskInfo === '发起企标制修订流程'){ + this.$router.push({ + name: 'bussLibrary1', + query: { + type: 'buss1', + processName: mes.taskInfo, + bpnId: id, + verifySarStandard: true, + } + }) }else if (mes.taskInfo === '企标编写汇总修订'){ this.$router.push({ name: 'bussLibrary3',