diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 661379ce7..ba13e4698 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1124,15 +1124,26 @@ export default { if (this.dataList.length < 1) { this.$message.warning("标准不能为空"); } else { - this.listForm.commentText = this.commentText; - this.listForm.fileName = this.fileInfoList; + this.listForm.commentText = this.commentText + this.listForm.fileName = this.fileInfoList var json = Object.assign(this.listForm, this.roleForm); this.$refs["qdfbForm"].validate((valid) => { if (valid) { this.$refs["Form"].validate((valid) => { if (valid) { - this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "4" }, { + 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', + json: JSON.stringify({ + taskInfo: '引入法规标准清单', + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -1145,17 +1156,9 @@ 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; + this.isSubmit = false }); } }); diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue index 21eda1b26..99c95e502 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue @@ -185,7 +185,16 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "15"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '15', + json: JSON.stringify({ + taskInfo: '备案任务下发', + roleForm: this.roleForm, + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 4b687c61d..cee4400f8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -583,7 +583,17 @@ export default { this.qbfsForm.fileList = this.fileList this.qbfsForm.commentText = this.commentText var json = Object.assign(this.qbfsForm, this.roleForm) - this.$http.get('lawss/activiti/startProcess', {type: '23'}, { + this.$http.post('lawss/activiti/startProcessRollBack', { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '23', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: this.qbfsForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index c93be5d1e..5f2df297e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -624,7 +624,17 @@ export default { this.isSubmit = true this.standardSearch.commentText = this.commentText var json = Object.assign(this.standardSearch, this.roleForm) - this.$http.get('lawss/activiti/startProcess', {type: '24'}, { + this.$http.post('lawss/activiti/startProcessRollBack', { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '24', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: this.standardSearch, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index cc933eb41..d0dc8ab97 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -474,9 +474,17 @@ export default { if (valid) { // this.isSubmit = true; var json = Object.assign(qbzxdFrom, this.roleForm); - console.log(json); - return - this.$http.get("lawss/activiti/startProcess", { type: "25" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '25', + json: JSON.stringify({ + roleForm: this.roleForm, + qbfsForm: qbzxdFrom, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue index d88f83492..111d9af70 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -680,7 +680,17 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "16"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '16', + json: JSON.stringify({ + roleForm: this.roleForm, + dataList: this.dataList, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue index 99c1f4b43..aca7388ec 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue @@ -854,14 +854,14 @@ export default { if (this.dataList.length < 1) { this.satisfyFlag = false this.$message.warning("请添加产品线信息"); - }else{ + }else { this.satisfyFlag = true } this.dataList.forEach(item => { if (!item.distributePerson) { this.satisfyFlag = false this.$message.warning("请选择分发责任人"); - }else{ + }else { this.satisfyFlag = true } }); @@ -874,7 +874,18 @@ export default { if (valid) { this.$refs["roleForm"].validate((valid) => { if (valid) { - this.$http.get("lawss/activiti/startProcess", { type: "5" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '5', + json: JSON.stringify({ + taskInfo: "选择已拆分标准", + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -887,14 +898,6 @@ 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 13b74f4af..2909c7f85 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -867,7 +867,18 @@ export default { if (valid) { this.$refs["roleForm"].validate((valid) => { if (valid) { - this.$http.get("lawss/activiti/startProcess", { type: "5" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '5', + json: JSON.stringify({ + taskInfo: "选择已拆分标准", + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index ab5bfa4d4..05e50fb08 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -612,7 +612,17 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '6', + json: JSON.stringify({ + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -625,14 +635,6 @@ 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; @@ -647,7 +649,7 @@ export default { return this.$message.warning("请完善基础信息"); } }); - } + } } }, choiceZRR(type, title, id) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index ccdd41aac..395c8b95f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -629,7 +629,17 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "6" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '6', + json: JSON.stringify({ + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index 0cf0dad19..6179964e5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -655,7 +655,18 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "10" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '10', + json: JSON.stringify({ + taskInfo: "产品经理分发", + form: this.qdform, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { @@ -668,14 +679,6 @@ 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 028182e51..ab4dd630f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -659,7 +659,18 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true; - this.$http.get("lawss/activiti/startProcess", { type: "10" }, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '10', + json: JSON.stringify({ + taskInfo: "产品经理分发", + form: this.qdform, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) {