[update] 修改企标流程节点1发起和驳回后调不同接口

src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue

@@ -412,7 +412,6 @@ export default {
       activelyReportSave(paramObj).then(res => {
         if (res.success) {
           this.$message.success(res.message)
-          this.goBack()
         } else {
           this.$message.warning(res.message)
         }
@@ -439,7 +438,15 @@ export default {
             const param = {} // 需要给后端的参数
             param.common = { ...values, ...approvalValues, ...data.formInline }
             param.flowUser = personnelObj
-            activelyReportApproval(param).then(res => {
+            let func
+            if (this.$route.query.taskId) {
+              // 有taskId说明是驳回的提交
+              func = activelyReportAgree
+              param.common.taskId = this.$route.query.taskId
+            } else {
+              func = activelyReportApproval
+            }
+            func(param).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
                 this.goBack()

src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue

@@ -146,8 +146,6 @@ import {
   standardizationInitReject,
   standardizationInitGetDataById
 } from '@/api/workCenter'
-import Vue from 'vue'
-import { USER_INFO } from '@/store/mutation-types'
 import pick from 'lodash.pick'
 import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 import { ProcessKey } from '../../../enums/commonEnums'
@@ -331,7 +329,6 @@ export default {
       standardizationInitSave(param).then(res => {
         if (res.success) {
           this.$message.success(res.message)
-          this.goBack()
         } else {
           this.$message.warning(res.message)
         }
@@ -355,7 +352,15 @@ export default {
             param.common = { ...values, ...approvalValues }
             param.dataList = data.dataSource
             param.flowUser = personnelObj
-            standardizationInitApproval(param).then(res => {
+            let func
+            if (this.$route.query.taskId) {
+              // 有taskId说明是驳回的提交
+              func = standardizationInitAgree
+              param.common.taskId = this.$route.query.taskId
+            } else {
+              func = standardizationInitApproval
+            }
+            func(param).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
                 this.goBack()

src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue

@@ -346,7 +346,15 @@ export default {
             paramObj.common = { ...values, ...approvalValues }
             paramObj.flowUser = personnelObj
             paramObj.data = data.formInline
-            enStandardAnnulApproval(paramObj).then(res => {
+            let func
+            if (this.$route.query.taskId) {
+              // 有taskId说明是驳回的提交
+              func = enStandardAnnulAgree
+              paramObj.common.taskId = this.$route.query.taskId
+            } else {
+              func = enStandardAnnulApproval
+            }
+            func(paramObj).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
                 this.goBack()

src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue

@@ -328,7 +328,6 @@ export default {
       enStandardChangeSave(paramObj).then(res => {
         if (res.success) {
           this.$message.success(res.message)
-          this.goBack()
         } else {
           this.$message.warning(res.message)
         }
@@ -356,7 +355,15 @@ export default {
             param.flowUser = personnelObj
             param.data = Object.assign({}, data.formInline)
             param.data.list = data.dataSource
-            enStandardChangeApproval(param).then(res => {
+            let func
+            if (this.$route.query.taskId) {
+              // 有taskId说明是驳回的提交
+              func = enStandardChangeAgree
+              param.common.taskId = this.$route.query.taskId
+            } else {
+              func = enStandardChangeApproval
+            }
+            func(param).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
                 this.goBack()

src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue

@@ -716,7 +716,6 @@ export default {
       enterprisePlanApprovalSave(param).then(res => {
         if (res.success) {
           this.$message.success(res.message)
-          this.goBack()
         } else {
           this.$message.warning(res.message)
         }

src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue

@@ -52,15 +52,14 @@
 
       <!--  业务基本信息  -->
       <div class="process-part-title">{{ $t('basicServiceInformation') }}</div>
-      <!--  节点1、发起人发起  -->
+      <!--  节点1、是标准化发起  -->
-      <!--  是联络人发起  -->
+      <standardization-init-base-info v-if="currentNode === 1" ref="baseInfoRef" @processNameChange="processNameChange"></standardization-init-base-info>
-      <contact-init-base-info v-if="currentNode === 1" ref="baseInfoRef" @processNameChange="processNameChange"></contact-init-base-info>
+      <!--  节点2、是联络人发起  -->
-      <!--  是标准化发起  -->
+      <contact-init-base-info v-else-if="currentNode === 2" ref="baseInfoRef" @processNameChange="processNameChange"></contact-init-base-info>
-      <standardization-init-base-info v-else-if="currentNode === 2" ref="baseInfoRef" @processNameChange="processNameChange"></standardization-init-base-info>
+      <!--  节点3、起草人填写意见  -->
-      <!--  节点2、起草人填写意见  -->
       <drafter-enter-option-base-info v-else-if="currentNode === 3" ref="baseInfoRef"></drafter-enter-option-base-info>
-      <!--  节点3、起草人部长审批  -->
+      <!--  节点4、起草人部长审批  -->
-      <!--  节点4、标准化审批  -->
+      <!--  节点5、标准化审批  -->
       <recheck-approve-base-info v-else-if="currentNode === 4 || currentNode === 5" ref="baseInfoRef"></recheck-approve-base-info>
 
       <!--  流程审批信息  -->
@@ -232,7 +231,7 @@ export default {
       switchValue: 'base', // 头部tab选中值
       disabled: false,
       onlyLook: false, // 是否仅查看
-      currentNode: 1, // 当前节点
+      currentNode: 2, // 当前节点
       currentNodeName: '',
       model: {},
       processInfoForm: this.$form.createForm(this),
@@ -376,7 +375,15 @@ export default {
             paramObj.common = { ...values, ...approvalValues }
             paramObj.flowUser = personnelObj
             paramObj.data = data.formInline
-            enStandardRecheckApproval(paramObj).then(res => {
+            let func
+            if (this.$route.query.taskId) {
+              // 有taskId说明是驳回的提交，或者自动发起的节点1
+              func = enStandardRecheckAgree
+              paramObj.common.taskId = this.$route.query.taskId
+            } else {
+              func = enStandardRecheckApproval
+            }
+            func(paramObj).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
                 this.goBack()

src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue

@@ -423,7 +423,6 @@ export default {
       enStandardEditSave(paramObj).then(res => {
         if (res.success) {
           this.$message.success(res.message)
-          this.goBack()
         } else {
           this.$message.warning(res.message)
         }
@@ -453,7 +452,15 @@ export default {
             } else {
               param.dataList = [data.formInline]
             }
-            enStandardEditApproval(param).then(res => {
+            let func
+            if (this.$route.query.taskId) {
+              // 有taskId说明是驳回的提交
+              func = enStandardEditAgree
+              param.common.taskId = this.$route.query.taskId
+            } else {
+              func = enStandardEditApproval
+            }
+            func(param).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
                 this.goBack()

src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue

@@ -346,7 +346,15 @@ export default {
             paramObj.common = { ...values, ...approvalValues }
             paramObj.flowUser = personnelObj
             paramObj.data = data.formInline
-            enStandardSealSaveApproval(paramObj).then(res => {
+            let func
+            if (this.$route.query.taskId) {
+              // 有taskId说明是驳回的提交
+              func = enStandardSealSaveAgree
+              paramObj.common.taskId = this.$route.query.taskId
+            } else {
+              func = enStandardSealSaveApproval
+            }
+            func(paramObj).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
                 this.goBack()

src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue

@@ -346,7 +346,15 @@ export default {
             paramObj.common = { ...values, ...approvalValues }
             paramObj.flowUser = personnelObj
             paramObj.data = data.formInline
-            enStandardStartUseApproval(paramObj).then(res => {
+            let func
+            if (this.$route.query.taskId) {
+              // 有taskId说明是驳回的提交
+              func = enStandardStartUseAgree
+              paramObj.common.taskId = this.$route.query.taskId
+            } else {
+              func = enStandardStartUseApproval
+            }
+            func(paramObj).then(res => {
               if (res.success) {
                 this.$message.success(res.message)
                 this.goBack()