From 80ff6deb1e2f9695f9ff00fb88ffb4d359a5c8e2 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Sun, 20 Nov 2022 13:00:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 6 +- .../pages/creatProcess/qbrk/step1.vue | 7 ++- .../enterpriseStandardPlan/index.vue | 55 ++++++++++--------- 3 files changed, 39 insertions(+), 29 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index e1d3b128a..c04b17fbc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -3084,7 +3084,11 @@ export default { json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName - json.standCode = this.tableData.standardData[0].standCode + if(this.form.reviseStatus == '1' || this.form.reviseStatus == '2'){ + json.nowEsId = this.tableData.standardData[0].id + }else if(this.form.reviseStatus == '3'){ + json.standCode = this.tableData.standardData[0].standCode + } this.$http.post('lawss/activiti/completeTask', { taskIds: this.$route.query.taskIds, userId : this.$store.getters.userInfo.userId, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 6d05c73e1..83c318d8c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -3087,8 +3087,11 @@ export default { json.applyUpdUserId = this.form.applyUpdUserId json.prcCreateUser = this.form.prcCreateUser json.prcCreateUserName = this.form.prcCreateUserName - json.standCode = this.standardCheckedList[0].standCode - json.id = this.standardCheckedList[0].id + if(this.form.reviseStatus == '3'){ + json.standCode = this.standardCheckedList[0].standCode + json.id = this.standardCheckedList[0].id + } + this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 76b9bca00..9f5cdc10b 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -1230,33 +1230,36 @@ this.addDrawer = false this.$message.success(tips + '成功') this.getData() - this.addForm.addFlag = '1' - this.addForm.prcCreateUser = this.$store.getters.userInfo.userId - this.addForm.prcCreateUserName = this.$store.getters.userInfo.userName - this.addForm.type = '5' - var json = Object.assign(this.addForm) - this.$http.post('lawss/activiti/startProcessRollBack', { - createUser: this.$store.getters.userInfo.userId, - createUserName: this.$store.getters.userInfo.userName, - type: '25', - json: JSON.stringify({ - qbfsForm: this.addForm - }) - }, {}, res => { - if (res.ok) { - this.$http.post('lawss/activiti/completeTask', { - taskIds: res.data, - userId : this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - // this.$message.success(res.message) - } - }) - } + if(this.DrawerType === 'add'){ + this.addForm.addFlag = '1' + this.addForm.prcCreateUser = this.$store.getters.userInfo.userId + this.addForm.prcCreateUserName = this.$store.getters.userInfo.userName + this.addForm.esId = res.message + this.addForm.type = '5' + var json = Object.assign(this.addForm) + this.$http.post('lawss/activiti/startProcessRollBack', { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '25', + json: JSON.stringify({ + qbfsForm: this.addForm }) + }, {}, res => { + if (res.ok) { + this.$http.post('lawss/activiti/completeTask', { + taskIds: res.data, + userId : this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + // this.$message.success(res.message) + } + }) + } + }) + } } else { this.addDrawer = false this.$message.warning(res.data)