[update] 企标流程联调

src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue

@@ -256,7 +256,6 @@ import {
   enterprisePlanApprovalTurnTo,
   enterprisePlanApprovalAgree,
   enterprisePlanApprovalReject,
-  enterprisePlanApprovalDetermine,
   enterprisePlanApprovalSave,
   enterprisePlanApproval,
   getProcessDataById
@@ -374,28 +373,32 @@ const changePersonalInfo = [
     nodeName: '新起草部门主管级上一级领导下发',
     nodeRoleName: '新起草部门主管级上一级领导',
     canChoose: false,
-    chooseType: 'radio'
+    chooseType: 'radio',
+    fieldName: 'newMainDraftUserLeaderLeader'
   },
   {
     id: 7,
     nodeName: '新起草部门主管级领导确认',
     nodeRoleName: '新起草部门主管级领导',
     canChoose: false,
-    chooseType: 'radio'
+    chooseType: 'radio',
+    fieldName: 'newMainDraftUserLeader'
   },
   {
     id: 8,
     nodeName: '相关人员会签',
     nodeRoleName: '相关人员',
     canChoose: false,
-    chooseType: 'checkbox'
+    chooseType: 'checkbox',
+    fieldName: 'relatedUser'
   },
   {
     id: 9,
     nodeName: '抄送主起草人',
     nodeRoleName: '主起草人',
     canChoose: false,
-    chooseType: 'checkbox'
+    chooseType: 'checkbox',
+    fieldName: 'createUser'
   }
 ]
 
@@ -811,6 +814,7 @@ export default {
       enterprisePlanApprovalSave(param).then(res => {
         if (res.success) {
           this.$message.success(res.message)
+          this.goBack()
         } else {
           this.$message.warning(res.message)
         }
@@ -825,7 +829,7 @@ export default {
       const personnelInfo = this.$refs.personnelInfo.stepsData
       const personnelObj = {}
       for (const item of personnelInfo) {
-        if (item.fieldName) {
+        if (item.fieldName && item.canChoose) {
           personnelObj[item.fieldName] = item.user
         }
       }
@@ -940,6 +944,7 @@ export default {
             func(param).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
+                this.goBack()
               } else {
                 this.$message.warning(res.message)
               }
@@ -964,6 +969,7 @@ export default {
             enterprisePlanApprovalAgree(param).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
+                this.goBack()
               } else {
                 this.$message.warning(res.message)
               }
@@ -991,6 +997,7 @@ export default {
           enterprisePlanApprovalTurnTo(param).then(res => {
             if (res.success) {
               this.$message.success(res.message)
+              this.goBack()
             } else {
               this.$message.warning(res.message)
             }
@@ -1026,6 +1033,7 @@ export default {
         enterprisePlanApprovalAgree(param).then(res => {
           if (res.success) {
             this.$message.success(res.message)
+            this.goBack()
           } else {
             this.$message.warning(res.message)
           }
@@ -1052,6 +1060,7 @@ export default {
             enterprisePlanApprovalReject(param).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
+                this.goBack()
               } else {
                 this.$message.warning(res.message)
               }
@@ -1069,11 +1078,13 @@ export default {
       this.approvalInfoForm.validateFields((err, values) => {
         if (!err) {
           this.loading = true
-          const param = Object.assign({}, values)
-          param.taskId = this.$route.query.taskId
-          enterprisePlanApprovalDetermine(param).then(res => {
+          const param = {}
+          param.common = Object.assign({}, values)
+          param.common.taskId = this.$route.query.taskId
+          enterprisePlanApprovalAgree(param).then(res => {
             if (res.success) {
               this.$message.success(res.message)
+              this.goBack()
             } else {
               this.$message.warning(res.message)
             }
@@ -1082,6 +1093,9 @@ export default {
           })
         }
       })
+    },
+    goBack () {
+      this.$router.go(-1)
     }
   }
 }