Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -390,7 +390,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {startProcess, saveTaskFirst, completeTask, queryTaskFirst} from '@/api/process.js'
+import {startProcess, saveTaskFirst, completeTask, queryTaskFirst, taskDel} from '@/api/process.js'
 
 export default {
   components: {
@@ -494,6 +494,7 @@ export default {
       saveLoading: false,
 
       commentText: '',
+      bpnId: ''
     }
   },
 
@@ -728,6 +729,14 @@ export default {
                 completeTask(params).then(res => {
                   if (res.success === true) {
                     this.$message.success('提交成功')
+                    if (this.bpnId !== '') {
+                      let taskId = {
+                        id: this.bpnId
+                      }
+                      taskDel(taskId).then(res=>{
+                        return res
+                      })
+                    }
                     this.$router.push("/processCenter");
                   }
                   this.isSubmit = false

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -333,7 +333,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {startProcess, queryTaskFirst, saveTaskFirst, completeTask} from '@/api/process.js'
+import {startProcess, queryTaskFirst, saveTaskFirst, completeTask,taskDel} from '@/api/process.js'
 
 export default {
   components: {
@@ -417,7 +417,8 @@ export default {
       roleShowflagOne: false,
       isSubmit: false,
       saveLoading: false,
-      commentText: ''
+      commentText: '',
+      bpnId: ''
     }
   },
   mounted() {
@@ -640,6 +641,14 @@ export default {
                 completeTask(params).then(res => {
                   if (res.success === true) {
                     this.$message.success('提交成功')
+                    if (this.bpnId !== '') {
+                      let taskId = {
+                        id: this.bpnId
+                      }
+                      taskDel(taskId).then(res=>{
+                        return res
+                      })
+                    }
                     this.$router.push("/processCenter");
                   }
                   this.isSubmit = false

src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue

@@ -265,7 +265,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import { startProcess, completeTask, saveTaskFirst, queryTaskFirst } from '@/api/process.js'
+import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel } from '@/api/process.js'
 import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js'
 export default {
   name: "wfhxzgStep1",
@@ -314,6 +314,7 @@ export default {
         label: 'name'
       },
       taskID: '',
+      bpnId: '',
     }
   },
   components: {
@@ -516,6 +517,14 @@ export default {
                 completeTask(params).then(res => {
                   if(res.success === true) {
                     this.$message.success('提交成功')
+                    if (this.bpnId !== '') {
+                      let taskId = {
+                        id: this.bpnId
+                      }
+                      taskDel(taskId).then(res=>{
+                        return res
+                      })
+                    }
                     this.$router.push("/processCenter");
                   }
                   this.isSubmit = false