【修改】修改传参

src/views/permissionApplication/launch.vue

@@ -95,6 +95,7 @@
         </div>
       </div>
     <process-footer
+      v-if="!formControl"
       showCancel
       :show-reset="isShowReset"
       :show-submit="isShowSubmit"
@@ -196,8 +197,7 @@ export default {
           max: 1000, message: '说明最多填写1000字符'
         }]
       },
-      taskId:'',
-      prcNum:''
+      prcType:1
     }
   },
   created () {
@@ -210,17 +210,15 @@ export default {
     }
     if(this.$route.query.taskDefinitionKey == 'aid4'){
       this.taskId=this.$route.query.taskId
-      this.prcNum=this.$route.query.prcNum
+      this.prcNum = this.$route.query.prcNum
+      this.prcId = this.$route.query.prcId
       this.initShow = true
       this.formControlname=true
-      this.getProcessDetail({
-        taskId: this.taskId,
-        prcType: 1
-      }).then(res =>{
+      this.getProcessDetail().then(res =>{
         //基础信息
         this.applicationForm.applyReason = JSON.parse(this.processOld.dataJson).applyReason
         this.applicationForm.power = JSON.parse(this.processOld.dataJson).power
-        this.tableData = JSON.parse(this.processOld.dataJson).dataMsg
+        this.tableData = JSON.parse(this.processOld.dataJson)
         this.processForm.prcName = JSON.parse(this.processOld.dataJson).prcName
         //指派信息
         this.assignForm=JSON.parse(this.processOld.submitJson)
@@ -228,6 +226,9 @@ export default {
     }
     if(this.$route.query.type=='yiban'){
        this.taskId=this.$route.query.taskId
+        this.prcNum = this.$route.query.prcNum
+        this.prcId = this.$route.query.prcId
+        this.formControl = true
        this.getProcessDetail().then(()=>{
          this.applicationForm.applyReason = JSON.parse(this.processOld.dataJson).applyReason
          this.applicationForm.power = JSON.parse(this.processOld.dataJson).power
@@ -330,7 +331,7 @@ export default {
                 if(this.initShow){
                   let dataJson=JSON.stringify({...this.applicationForm,...this.processForm,dataMsg:this.tableData})
                   let submitJson=JSON.stringify(this.assignForm)
-                  this.completeProcess({dataJson,submitJson,taskId:this.taskId,userId:form.userId})
+                  this.completeProcess({dataJson,submitJson,taskId:this.taskId,userId:this.$store.getters.userInfo.usid,prcType:this.prcType})
                 }else{
                     this.startProcess()
                 }
@@ -347,15 +348,19 @@ export default {
 
     },
     startProcess() {
+      //把表单都整合到form中
+      // dataJson与submitJson需要发到completeProcess
       let form = {}
-      form={...this.assignForm,approveData:{...this.applicationForm,...this.processForm},dataMsg:this.tableData}
-      form.prcType= '1'
+      form={approveData:{...this.applicationForm,...this.processForm,...this.assignForm,userId:this.$store.getters.userInfo.usid},dataMsg:this.tableData}
+
+      form.prcType= this.prcType
       form.prcName= this.processForm.prcName
       form.userId= this.$store.getters.userInfo.usid
-      let dataJson=JSON.stringify({...this.applicationForm,...this.processForm,dataMsg:this.tableData})
-      let submitJson=JSON.stringify(this.assignForm)
+      //...this.applicationForm,...this.processForm,
+      let dataJson=JSON.stringify(this.tableData)
+      let submitJson=JSON.stringify({...this.assignForm,userId:this.$store.getters.userInfo.usid})
       this.$api.process.startProcess(form).then( ({data}) =>{
-        this.completeProcess({dataJson,submitJson,taskId:data.result,userId:form.userId})
+        this.completeProcess({dataJson,submitJson,taskId:data.result,userId:form.userId,prcType: this.prcType})
       })
     },
     //获取流程详细信息