From d4a0170cb19380f385b89cb7aef7306edafe7194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 28 Dec 2021 13:51:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=B5=81=E7=A8=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 9 ++++++++- .../processCenter/pages/creatProcess/bzqdfb/step1.vue | 11 +++++++++-- .../pages/creatProcess/cywbbzzxd/step1.vue | 1 - .../pages/creatProcess/jrbzhxh/step1.vue | 1 - .../processCenter/pages/creatProcess/qbfs/step1.vue | 1 - .../processCenter/pages/creatProcess/qbfz/step1.vue | 1 - .../pages/creatProcess/qbzxdjhgk/step1.vue | 5 ++--- .../processCenter/pages/creatProcess/wbsm/step1.vue | 1 - .../processCenter/pages/creatProcess/xmpg/step1-1.vue | 9 ++++++++- .../processCenter/pages/creatProcess/xmpg/step1.vue | 11 +++++++++-- .../pages/creatProcess/xmpg2/step1-1.vue | 9 ++++++++- .../processCenter/pages/creatProcess/xmpg2/step1.vue | 11 +++++++++-- .../pages/creatProcess/xmqdqr/step1-1.vue | 9 ++++++++- .../processCenter/pages/creatProcess/xmqdqr/step1.vue | 11 +++++++++-- 14 files changed, 70 insertions(+), 20 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 3d6f1cccd..2c79ed7ac 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1134,7 +1134,6 @@ export default { if (valid) { this.isSubmit = true this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '4', @@ -1157,6 +1156,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 412e435de..3707f0182 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -690,7 +690,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import {saveTaskFirst} from "api/process"; +import { saveTaskFirst, taskDel } from "api/process"; import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis"; export default { @@ -1064,7 +1064,6 @@ export default { if (valid) { this.isSubmit = true this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '4', @@ -1087,6 +1086,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue index c1af624bd..893c90db0 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue @@ -187,7 +187,6 @@ export default { if (valid) { this.isSubmit = true this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '14', diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue index 99c95e502..0e330888d 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue @@ -186,7 +186,6 @@ export default { if (valid) { this.isSubmit = true this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '15', diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index cee4400f8..1a6c39107 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -584,7 +584,6 @@ export default { this.qbfsForm.commentText = this.commentText var json = Object.assign(this.qbfsForm, this.roleForm) this.$http.post('lawss/activiti/startProcessRollBack', { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '23', diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index 5f2df297e..be20c9c24 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -625,7 +625,6 @@ export default { this.standardSearch.commentText = this.commentText var json = Object.assign(this.standardSearch, this.roleForm) this.$http.post('lawss/activiti/startProcessRollBack', { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '24', diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index b809e03e2..a7f8c1792 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -472,10 +472,9 @@ export default { if (flag) { this.$refs["roleForm"].validate((valid) => { if (valid) { - // this.isSubmit = true; - var json = Object.assign(qbzxdFrom, this.roleForm); + this.isSubmit = true; + let json = Object.assign(qbzxdFrom, this.roleForm); this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '25', diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue index 111d9af70..7c1bab24d 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -681,7 +681,6 @@ export default { if (valid) { this.isSubmit = true this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '16', diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 2196af865..92c075e4a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -877,7 +877,6 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '5', @@ -900,6 +899,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index c6c5f1476..6c0589b4a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -511,7 +511,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { saveTaskFirst } from "api/process"; +import { saveTaskFirst, taskDel } from "api/process"; import file from "@/pages/knowledgeGraph/components/file"; export default { @@ -870,7 +870,6 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '5', @@ -893,6 +892,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 05e50fb08..05b9d1b6a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -613,7 +613,6 @@ export default { if (valid) { this.isSubmit = true; this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '6', @@ -635,6 +634,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 395c8b95f..f7d0fb5b7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -346,7 +346,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { saveTaskFirst } from "api/process"; +import { saveTaskFirst, taskDel } from "api/process"; import file from "@/pages/knowledgeGraph/components/file"; export default { @@ -630,7 +630,6 @@ export default { if (valid) { this.isSubmit = true; this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '6', @@ -652,6 +651,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index a3a4344c8..fd3614b34 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -655,7 +655,6 @@ export default { if (valid) { this.isSubmit = true; this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '10', @@ -678,6 +677,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 44c57ab17..103f23601 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -388,7 +388,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { saveTaskFirst } from "api/process"; +import { saveTaskFirst, taskDel } from "api/process"; export default { name: "xmqdqrStep1", @@ -665,7 +665,6 @@ export default { if (valid) { this.isSubmit = true; this.$http.post("lawss/activiti/startProcessRollBack", { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '10', @@ -688,6 +687,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push("/processCenter"); } this.isSubmit = false;