[update] 年度制修订标准化发起流程修改

src/common/lang/workCenter/en.js

@@ -106,7 +106,8 @@ module.exports = {
     drafter: '主起草人',
     pleaseSelectContact: '请选择联络人',
     pleaseSelectApprover: '请选择审批人',
-    pleaseSelectDrafter: '请选择主起草人'
+    pleaseSelectDrafter: '请选择主起草人',
+    pleaseSelectSameApprover: '请选择相同的审批人'
   },
   // 企标制修订流程
   enStandardRevision: {

src/common/lang/workCenter/zh.js

@@ -107,7 +107,8 @@ module.exports = {
     drafter: '主起草人',
     pleaseSelectContact: '请选择联络人',
     pleaseSelectApprover: '请选择审批人',
-    pleaseSelectDrafter: '请选择主起草人'
+    pleaseSelectDrafter: '请选择主起草人',
+    pleaseSelectSameApprover: '请选择相同的审批人'
   },
   // 企标制修订流程
   enStandardRevision: {

src/enums/commonEnums.js

@@ -446,7 +446,8 @@ export const EsRevisionPlanStandardizationInitNodes = new EsEnums({
   mainDrafterEnterInfo: { text: '主起草人填写信息', value: 'sid-E2015AB3-9C52-4E49-A261-DA11CB4BAA7E' },
   contactsApproval: { text: '部所联络人汇总', value: 'sid-158523C5-7D8F-4433-B2DB-8A6C09DFDB1B' },
   mainDrafterLeaderApproval: { text: '主起草单位主管级领导批准', value: 'sid-57656F2E-0AE1-45D8-85D0-CE3E37D9E926' },
-  standardizationSumUp: { text: '标准化归档', value: 'sid-86610E08-1DDB-467A-A32E-C661FE889A57' }
+  standardizationSumUp: { text: '标准化归档', value: 'sid-86610E08-1DDB-467A-A32E-C661FE889A57' },
+  standardizationTwoUpdate: { text: '标准化工程师二次修改调整', value: 'sid-BEAAC29F-17D8-4162-8C0B-01A4A8ED7729' }
 })
 
 // 企标制修订流程

src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue

@@ -55,7 +55,7 @@
       <!--  业务基本信息  -->
       <div class="process-part-title">{{ $t('basicServiceInformation') }}</div>
       <!--  节点1、标准工程师发起的基本信息表单  -->
-      <engineer-init-base-info v-if="[1, 3].includes(currentNode)" ref="baseInfoRef" :currentNode="currentNode"></engineer-init-base-info>
+      <engineer-init-base-info v-if="[1, 3, 10].includes(currentNode)" ref="baseInfoRef" :currentNode="currentNode"></engineer-init-base-info>
       <!--  节点2、部所联络人选取审批人  -->
       <contact-select-approver-base-info v-else-if="[2, 5].includes(currentNode)" ref="baseInfoRef" :currentNode="currentNode" @batchReject="handleBatchReject"></contact-select-approver-base-info>
       <!--  节点3、主起草单位主管级领导审批下发  -->
@@ -93,7 +93,7 @@
     <!--  操作按钮  -->
     <div class="detail-page-bottom-operate-box">
       <!--  发起节点  -->
-      <template v-if="currentNode === 1">
+      <template v-if="[1, 3, 10].includes(currentNode)">
         <!--  保存  -->
         <a-button type="primary" ghost :loading="loading" @click="handleSave"><i class="iconfont icon-save"></i> {{ $t('preservation') }}</a-button>
         <!--  提交  -->
@@ -205,6 +205,9 @@ export default {
       } else if (nodeId === EsRevisionPlanStandardizationInitNodes.standardizationSumUp.value) {
         // 标准化归档
         this.currentNode = 9
+      } else if (nodeId === EsRevisionPlanStandardizationInitNodes.standardizationTwoUpdate.value) {
+        // 标准化归档
+        this.currentNode = 10
       } else {
         // 预留加签节点
         this.currentNode = 999

src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue

@@ -64,6 +64,11 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    currentNode: {
+      type: Number,
+      required: false,
+      default: 0
     }
   },
   data () {
@@ -242,7 +247,20 @@ export default {
         this.$message.warning(this.$t('workCenter.revisionPlanActivelyReport.pleaseSelectApprover'))
         data = false
       } else {
-        data.dataSource = this.dataSource
+        if (this.currentNode === 5) {
+          // 是部所联络人修改调整节点，即被驳回到了部所联络人选审批人，需要审批人是同一个人
+          const arr = this.dataSource.map(item => item.approvalUser)
+          const isEquals = arr.every(item => item === arr[0])
+          if (!isEquals) {
+            // 不是同一个人，提示
+            this.$message.warning(this.$t('workCenter.revisionPlanActivelyReport.pleaseSelectSameApprover'))
+            data = false
+          } else {
+            data.dataSource = this.dataSource
+          }
+        } else {
+          data.dataSource = this.dataSource
+        }
       }
       return data
     },