From a7929b70045ca70281a995a2cde19f5adc791b00 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, 23 Feb 2022 09:56:31 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standardWarning.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 9afac44ff..0d0d7d54e 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -689,13 +689,11 @@ export default { this.$http.get('sys/EarlyWarning/ChangePermissions', { id: row.id, }, {}, res => { - if (res.ok === true) { this.pageConfig.page = 1 this.pageConfig.newPolicyPage = 1 this.pageConfig.oldPolicyPage = 1 this.searchBtnClick() this.getEarlyDate() - } } ) }).catch(() => { From c47d8474e8d4d43b62f42e0a4693eaefe5d35954 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 23 Feb 2022 09:59:32 +0800 Subject: [PATCH 2/6] commit --- .../CustomFormComponents/InputForStandardsForForeign.vue | 2 +- src/pages/details/otherBussStandardDetails/index.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/CustomFormComponents/InputForStandardsForForeign.vue b/src/components/CustomFormComponents/InputForStandardsForForeign.vue index 9cbdc4d10..2a6ee0d94 100644 --- a/src/components/CustomFormComponents/InputForStandardsForForeign.vue +++ b/src/components/CustomFormComponents/InputForStandardsForForeign.vue @@ -25,7 +25,7 @@ style="position:absolute;top: 10px;right: 0;" @click="selectLaws" v-if="(processModel && !disabled) || !processModel" - >手动查找123 + >手动查找 - {{ child.value }} - diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index c9dc34bae..27c278776 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1104,7 +1104,6 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) - this.xgdFileId = processForm.xgd this.fbgbjbdFileId = processForm.fbgbjbd this.bpgFileId = processForm.bpg From 9c80377db808c7af40efc21afcbd7a9baa89638c 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, 23 Feb 2022 10:15:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=9D=A1=E6=95=B0?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdjhgk/component/cancel.vue | 2 +- .../pages/creatProcess/qbzxdjhgk/component/delay.vue | 2 +- .../pages/creatProcess/qbzxdjhgk/component/merge.vue | 2 +- .../pages/creatProcess/qbzxdjhgk/component/rename.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 98b183dcf..3929de539 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -425,7 +425,7 @@ export default { this.standinfoList.push(item) } }) - this.total = res.data.count + this.total = this.standinfoList.length }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 400d5eb8d..26671f8e2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -446,7 +446,7 @@ export default { this.standinfoList.push(item) } }) - this.total = res.data.count + this.total = this.standinfoList.length }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 535091d3e..0410568e9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -1035,7 +1035,7 @@ export default { this.standinfoList.push(item) } }) - this.total = res.data.count + this.total = this.standinfoList.length }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 105a646a9..9e7431fed 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -433,7 +433,7 @@ export default { this.standinfoList.push(item) } }) - this.total = res.data.count + this.total = this.standinfoList.length }) }, From 87b506dfc3584de4f9051f99c4ba783fdda52d0e Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 23 Feb 2022 10:50:27 +0800 Subject: [PATCH 4/6] commit --- src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue | 6 +++++- .../standardForComments/pags/consultationDetails.vue | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 8053a57c9..e6942c2bc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -360,6 +360,7 @@ reason: '', cause: '', department: '', + responUser: '', responUserName: '', state: '', source: '', @@ -469,6 +470,7 @@ cause: row.cause, department: row.department, responUserName: row.responUserName, + responUser: row.responUser, state: row.state, source: row.source, id: row.id, @@ -571,7 +573,7 @@ json.oldinfo = this.oldData; json.commentText = this.commentText5; json.introduce = true; - this.$http.post("lawss/activiti/completeTask", { + this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), taskId: this.taskIds, userId: this.$store.getters.userInfo.userId @@ -590,6 +592,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg); + console.log(data); this.commentText5 = data.commentText5 || '' this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] ) @@ -617,6 +620,7 @@ res.data.forEach(item => { item.chapterNumber = item.partCode; item.responUserName = item.userName; + item.responUser = item.userId item.state = '1' item.source = '2' this.data.push(item); diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 0fc96470c..c3dd3003f 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -436,7 +436,6 @@ }) }) }) - let routeData = this.$router.resolve({ name: "AddFileDetails", query: { From be7ac11c5969506bfa980531789bb30f59e65819 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, 23 Feb 2022 11:06:13 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 9154cd1d9..0193652ae 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -459,6 +459,7 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; + this.listForm.commentText = this.commentText; let json = Object.assign(qbzxdFrom, this.roleForm); this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, From e2dfddf8276a4e7ed6a6b27b700881b66957d411 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 23 Feb 2022 11:30:02 +0800 Subject: [PATCH 6/6] commit --- src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 4f1fec128..09d306018 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -953,6 +953,7 @@ standCode: '', standName: '', } + this.QYBZmodal = false }, QYBZenterDrawer () { if (this.QYBZformSelect.length > 1) {