From 800b8bb9eb642ada0ab8b7b881527a1f321d5e4e Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 24 Jul 2024 18:26:51 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E4=B8=A4=E4=B8=AA=E6=B5=81=E7=A8=8B=E6=9C=80=E5=90=8E?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=8A=82=E7=82=B9=E5=8F=AF=E4=BB=A5=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=96=B0=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RevisionPlanActivelyReportFlow.vue        |  2 +-
 .../modules/ContactEnterSendTaskModal.vue     | 90 ++++++++++---------
 .../modules/OnlyTableForm.vue                 | 10 ++-
 .../RevisionPlanStandardizationInitFlow.vue   |  4 +-
 .../modules/BaseInfoTableModal.vue            | 90 ++++++++++---------
 .../modules/TableBaseInfo.vue                 | 11 ++-
 6 files changed, 120 insertions(+), 87 deletions(-)

diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
index 282e0766..d70b7dbd 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue
@@ -76,7 +76,7 @@
       <!--  节点6、联络人主管级上一级领导审批  表格不可操作，可以查看详情  -->
       <only-table-form v-else-if="currentNode === 6" :onlyCanLook="true" ref="baseInfoFormRef"></only-table-form>
       <!--  节点7、标准化工程师归档  表格不可新增，可以编辑和删除  -->
-      <only-table-form v-else-if="currentNode === 7" disabled :editAndDelete="true" ref="baseInfoFormRef"></only-table-form>
+      <only-table-form v-else-if="currentNode === 7" disabled :editAndDelete="true" canEditNewStandardNumber ref="baseInfoFormRef"></only-table-form>
 
       <!--  流程审批信息  -->
       <div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
index b6acd84a..c3bbbf4c 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
@@ -51,23 +51,23 @@
             </div>
             <!--  标准立项-制定  -->
             <template v-if="formInline.projectType && formInline.projectType === ProjectType.ENACT.value">
-              <!--  企标编号-新企标编号  流程结束才生成企标编号  -->
-              <!--<div class="box-title-text form-flex-item-half">-->
-              <!--  <div class="title-text">-->
-              <!--    &lt;!&ndash;<span class="required">*</span>&ndash;&gt;-->
-              <!--    <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')">-->
-              <!--    {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}-->
-              <!--  </span>-->
-              <!--  </div>-->
-              <!--  <a-form-model-item class="item-model" prop="newEnStandardNo">-->
-              <!--    <a-input class="box-input"-->
-              <!--             v-model="formInline.newEnStandardNo"-->
-              <!--             :maxLength="50"-->
-              <!--             disabled-->
-              <!--             @change="event => event.target.value = event.target.value.trim()"-->
-              <!--             :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')" />-->
-              <!--  </a-form-model-item>-->
-              <!--</div>-->
+              <!--  企标编号-新企标编号  流程结束才生成企标编号  2024-07-24变更最后一个节点显示并且可以编辑企标编号  -->
+              <div v-if="canEditNewStandardNumber" class="box-title-text form-flex-item-half">
+                <div class="title-text">
+                  <span class="required">*</span>
+                  <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')">
+                  {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}
+                </span>
+                </div>
+                <a-form-model-item class="item-model" prop="newEnStandardNo">
+                  <a-input class="box-input"
+                           v-model="formInline.newEnStandardNo"
+                           :maxLength="50"
+                           :disabled="!canEditNewStandardNumber"
+                           @change="event => event.target.value = event.target.value.trim()"
+                           :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')" />
+                </a-form-model-item>
+              </div>
               <!--  企标名称-新企标名称  -->
               <div class="box-title-text form-flex-item-half">
                 <div class="title-text">
@@ -193,23 +193,23 @@
                            :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')" />
                 </a-form-model-item>
               </div>
-              <!--  新企标编号  审批结束后才回显？？  -->
-              <!--<div class="box-title-text form-flex-item-half">-->
-              <!--  <div class="title-text">-->
-              <!--    <span class="required">*</span>-->
-              <!--    <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum')">-->
-              <!--    {{ $t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum') }}-->
-              <!--  </span>-->
-              <!--  </div>-->
-              <!--  <a-form-model-item class="item-model" prop="newEnStandardNo">-->
-              <!--    <a-input class="box-input"-->
-              <!--             v-model="formInline.newEnStandardNo"-->
-              <!--             :maxLength="50"-->
-              <!--             disabled-->
-              <!--@change="event => event.target.value = event.target.value.trim()"-->
-              <!--             :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum')" />-->
-              <!--  </a-form-model-item>-->
-              <!--</div>-->
+              <!--  新企标编号  审批结束后才回显  2024-07-24变更：最后一个节点显示并且可以修改新企标编号  -->
+              <div v-if="canEditNewStandardNumber" class="box-title-text form-flex-item-half">
+                <div class="title-text">
+                  <span class="required">*</span>
+                  <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum')">
+                  {{ $t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum') }}
+                </span>
+                </div>
+                <a-form-model-item class="item-model" prop="newEnStandardNo">
+                  <a-input class="box-input"
+                           v-model="formInline.newEnStandardNo"
+                           :maxLength="50"
+                           :disabled="!canEditNewStandardNumber"
+                           @change="event => event.target.value = event.target.value.trim()"
+                           :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum')" />
+                </a-form-model-item>
+              </div>
               <!--  新企标名称  -->
               <div class="box-title-text form-flex-item-half">
                 <div class="title-text">
@@ -549,6 +549,14 @@ import TreeSelection from '@/components/selection/TreeSelection'
 export default {
   name: 'ContactEnterSendTaskModal',
   components: { UserSelection, StandardSelection, UploadFile, TreeSelection },
+  props: {
+    // 是否可以编辑新企标编号
+    canEditNewStandardNumber: {
+      type: Boolean,
+      required: false,
+      default: false
+    }
+  },
   data () {
     return {
       StandardSource,
@@ -580,13 +588,13 @@ export default {
           }
         ],
         // 企标编号-新企标编号（制定-企标编号，修订新企标编号）
-        // newEnStandardNo: [
-        //   {
-        //     required: true,
-        //     message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + this.$t('cannotEmpty'),
-        //     trigger: 'change'
-        //   }
-        // ],
+        newEnStandardNo: [
+          {
+            required: true,
+            message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
         // 企标编号-原企标编号（修订-企标编号）
         originEnStandardNo: [
           {
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue
index 5e47fc31..4b3053d2 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue
@@ -70,7 +70,9 @@
       </j-table>
     </div>
     <!--  表格新增、编辑弹框  -->
-    <contact-enter-send-task-modal ref="contactEnterSendTaskModal" @ok="modelFormOk"></contact-enter-send-task-modal>
+    <contact-enter-send-task-modal
+      ref="contactEnterSendTaskModal" @ok="modelFormOk" :canEditNewStandardNumber="canEditNewStandardNumber">
+    </contact-enter-send-task-modal>
   </div>
 </template>
 
@@ -116,6 +118,12 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    // 是否可以编辑新企标编号
+    canEditNewStandardNumber: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   computed: {
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
index 93cfa367..8f853342 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
@@ -63,7 +63,7 @@
       <!--  节点5、部所联络人汇总  -->
       <!--  节点6、主起草单位主管级领导批准  -->
       <!--  节点7、标准化归档  -->
-      <table-base-info v-else ref="baseInfoRef" :current-node="currentNode"></table-base-info>
+      <table-base-info v-else ref="baseInfoRef" :current-node="currentNode" :canEditNewStandardNumber="currentNode === 9"></table-base-info>
 
       <!--  流程审批信息  -->
       <div class="process-part-title">{{ $t('processApprovalInformation') }}</div>
@@ -206,7 +206,7 @@ export default {
         // 标准化归档
         this.currentNode = 9
       } else if (nodeId === EsRevisionPlanStandardizationInitNodes.standardizationTwoUpdate.value) {
-        // 标准化归档
+        // 标准化工程师二次修改调整
         this.currentNode = 10
       } else {
         // 预留加签节点
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
index 858baeaf..194afb73 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
@@ -51,23 +51,23 @@
             </div>
             <!--  标准立项-制定  -->
             <template v-if="formInline.projectType && formInline.projectType === ProjectType.ENACT.value">
-              <!--  企标编号  -->
-              <!--<div class="box-title-text form-flex-item-half">-->
-              <!--  <div class="title-text">-->
-              <!--    <span v-if="rules.newEnStandardNo[0].required" class="required">*</span>-->
-              <!--    <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')">-->
-              <!--    {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}-->
-              <!--  </span>-->
-              <!--  </div>-->
-              <!--  <a-form-model-item class="item-model" prop="newEnStandardNo">-->
-              <!--    <a-input class="box-input"-->
-              <!--             v-model="formInline.newEnStandardNo"-->
-              <!--             :maxLength="50"-->
-              <!--             disabled-->
-              <!--             @change="event => event.target.value = event.target.value.trim()"-->
-              <!--             :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')" />-->
-              <!--  </a-form-model-item>-->
-              <!--</div>-->
+              <!--  企标编号 2024-07-24周变更，最后一个节点显示并且可以修改企标编号  -->
+              <div v-if="canEditNewStandardNumber" class="box-title-text form-flex-item-half">
+                <div class="title-text">
+                  <span v-if="rules.newEnStandardNo[0].required" class="required">*</span>
+                  <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')">
+                  {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}
+                </span>
+                </div>
+                <a-form-model-item class="item-model" prop="newEnStandardNo">
+                  <a-input class="box-input"
+                           v-model="formInline.newEnStandardNo"
+                           :maxLength="50"
+                           :disabled="!canEditNewStandardNumber"
+                           @change="event => event.target.value = event.target.value.trim()"
+                           :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')" />
+                </a-form-model-item>
+              </div>
               <!--  企标名称  -->
               <div class="box-title-text form-flex-item-half">
                 <div class="title-text">
@@ -177,22 +177,6 @@
                                       @nameChange="nameChange"/>
                 </a-form-model-item>
               </div>
-              <!--  新企标编号  审批结束后才回显？？  -->
-              <!--<div class="box-title-text form-flex-item-half">-->
-              <!--  <div class="title-text">-->
-              <!--    <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum')">-->
-              <!--    {{ $t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum') }}-->
-              <!--  </span>-->
-              <!--  </div>-->
-              <!--  <a-form-model-item class="item-model" prop="newEnStandardNo">-->
-              <!--    <a-input class="box-input"-->
-              <!--             v-model="formInline.newEnStandardNo"-->
-              <!--             :maxLength="50"-->
-              <!--             disabled-->
-              <!--@change="event => event.target.value = event.target.value.trim()"-->
-              <!--             :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum')" />-->
-              <!--  </a-form-model-item>-->
-              <!--</div>-->
               <!--  企标名称  原企标名称  -->
               <div class="box-title-text form-flex-item-half">
                 <div class="title-text">
@@ -209,6 +193,22 @@
                            :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName')" />
                 </a-form-model-item>
               </div>
+              <!--  新企标编号  审批结束后才回显  2024-07-24周变更，最后一个节点显示并且可以修改企标编号  -->
+              <div v-if="canEditNewStandardNumber" class="box-title-text form-flex-item-half">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum')">
+                  {{ $t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum') }}
+                </span>
+                </div>
+                <a-form-model-item class="item-model" prop="newEnStandardNo">
+                  <a-input class="box-input"
+                           v-model="formInline.newEnStandardNo"
+                           :maxLength="50"
+                           :disabled="!canEditNewStandardNumber"
+                           @change="event => event.target.value = event.target.value.trim()"
+                           :placeholder="$t('pleaseEnter')+$t('workCenter.enterpriseInitChangePlan.newEnterpriseStandardNum')" />
+                </a-form-model-item>
+              </div>
               <!--  新企标名称  -->
               <div class="box-title-text form-flex-item-half">
                 <div class="title-text">
@@ -552,6 +552,12 @@ export default {
       default: () => {
         return []
       }
+    },
+    // 是否可以编辑新企标编号
+    canEditNewStandardNumber: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   data () {
@@ -586,14 +592,6 @@ export default {
             trigger: 'change'
           }
         ],
-        // 企标编号-新企标编号（制定-企标编号，修订-新企标编号）
-        // newEnStandardNo: [
-        //   {
-        //     required: false,
-        //     message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + this.$t('cannotEmpty'),
-        //     trigger: 'change'
-        //   }
-        // ],
         // 企业标准代号
         enStandardCode: [
           {
@@ -872,6 +870,16 @@ export default {
       this.rules = Object.assign({}, this.rules)
       console.log(this.rules)
     }
+    if (this.canEditNewStandardNumber) {
+      // 企标编号-新企标编号（制定-企标编号，修订-新企标编号）
+      this.rules.newEnStandardNo = [
+        {
+          required: false,
+          message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + this.$t('cannotEmpty'),
+          trigger: 'change'
+        }
+      ]
+    }
   },
   methods: {
     add () {
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
index ff4fcbf2..83f89df6 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
@@ -32,7 +32,10 @@
     </div>
 
     <!--  新增，编辑的弹框  -->
-    <base-info-table-modal ref="baseInfoTableModal" source="tableBaseInfo" :currentNode="currentNode" :initDataSource="initDataSource" @ok="modelFormOk"></base-info-table-modal>
+    <base-info-table-modal
+      ref="baseInfoTableModal" source="tableBaseInfo" :currentNode="currentNode"
+      :initDataSource="initDataSource" @ok="modelFormOk" :canEditNewStandardNumber="canEditNewStandardNumber">
+    </base-info-table-modal>
   </div>
 </template>
 
@@ -55,6 +58,12 @@ export default {
       type: Number,
       required: false,
       default: 1
+    },
+    // 是否可以修改企标编号
+    canEditNewStandardNumber: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   data () {