From 7e3456579c94fed09021bd767451d6906d627549 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Tue, 19 Dec 2023 14:56:34 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8C=96=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B=E4=B8=BB=E8=B5=B7?=
 =?UTF-8?q?=E8=8D=89=E4=BA=BA=E5=A1=AB=E5=86=99=E4=BF=A1=E6=81=AF=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=92=8C=E9=83=A8=E6=89=80=E8=81=94=E7=BB=9C=E4=BA=BA?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E8=8A=82=E7=82=B9=E6=8F=90=E4=BA=A4=E6=97=B6?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=9A=84=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/workCenter/zh.js              |  3 +-
 .../RevisionPlanStandardizationInitFlow.vue   |  1 +
 .../modules/BaseInfoTableModal.vue            | 28 +++++++++-----
 .../modules/TableBaseInfo.vue                 | 37 ++++++++++++++++++-
 4 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js
index f353c221..bf62a917 100644
--- a/src/common/lang/workCenter/zh.js
+++ b/src/common/lang/workCenter/zh.js
@@ -108,7 +108,8 @@ module.exports = {
     pleaseSelectContact: '请选择联络人',
     pleaseSelectApprover: '请选择审批人',
     pleaseSelectDrafter: '请选择主起草人',
-    pleaseSelectSameApprover: '请选择相同的审批人'
+    pleaseSelectSameApprover: '请选择相同的审批人',
+    standizationEnterDataNotUpdate: '标准化填写的数据不可更改'
   },
   // 企标制修订流程
   enStandardRevision: {
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
index 39b4e8ac..9aaf6345 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
@@ -472,6 +472,7 @@ export default {
       // 流程审批信息校验
       this.approvalInfoForm.validateFields((approvalErr, approvalValues) => {
         const data = this.$refs.baseInfoRef.getDataValidate()
+        console.log(data)
         if (!approvalErr && data) {
           // 只有表格
           const param = {}
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
index 15f4cd2e..7aeb7fea 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
@@ -163,6 +163,7 @@
               <!--  企标编号  原企标编号  -->
               <div class="box-title-text form-flex-item-half">
                 <div class="title-text">
+                  <span v-if="rules.originEnStandardNo[0].required" class="required">*</span>
                   <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')">
                   {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}
                 </span>
@@ -378,7 +379,7 @@
             <!--  零部件名称  -->
             <div class="box-title-text form-flex-item-half">
               <div class="title-text">
-                <span class="required">*</span>
+                <span v-if="rules.componentName[0].required" class="required">*</span>
                 <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.partName')">
                   {{ $t('workCenter.enterpriseInitChangePlan.partName') }}
                 </span>
@@ -481,7 +482,6 @@
             <!--  配合单位  -->
             <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.suitUnit')">
                   {{ $t('workCenter.enterpriseInitChangePlan.suitUnit') }}
                 </span>
@@ -572,13 +572,13 @@ export default {
           }
         ],
         // 企标编号-新企标编号（制定-企标编号，修订-新企标编号）
-        newEnStandardNo: [
-          {
-            required: false,
-            message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + this.$t('cannotEmpty'),
-            trigger: 'change'
-          }
-        ],
+        // newEnStandardNo: [
+        //   {
+        //     required: false,
+        //     message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + this.$t('cannotEmpty'),
+        //     trigger: 'change'
+        //   }
+        // ],
         // 企业标准代号
         enStandardCode: [
           {
@@ -611,6 +611,14 @@ export default {
             trigger: 'change'
           }
         ],
+        // 原企标编号
+        originEnStandardNo: [
+          {
+            required: false,
+            message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
         // 企标名称-新企标名称（制定-企标名称，修订-新企标名称）
         newEnStandardName: [
           {
@@ -624,7 +632,7 @@ export default {
           {
             required: false,
             message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') + this.$t('cannotEmpty'),
-            trigger: 'blur'
+            trigger: 'change'
           }
         ],
         // 标准类型
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
index 2ab9dc68..f58b302f 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
@@ -47,6 +47,7 @@
 <script>
 import JTable from '@/components/jero/JTable'
 import BaseInfoTableModal from './BaseInfoTableModal'
+import { ProjectType } from '@/enums/commonEnums'
 
 export default {
   name: 'TableBaseInfo',
@@ -224,9 +225,43 @@ export default {
     // 外层获取数据要过校验,返回false表示没有通过校验
     getDataValidate () {
       // 校验表格是否每行都有数据，每行的联络人是否都有
+      let hasErr = false
+      const rules = Object.assign({}, this.$refs.baseInfoTableModal.rules)
+      console.log(rules)
+      for (const dItem of this.dataSource) {
+        let rule = {}
+        if (dItem.projectType === ProjectType.ENACT.value) {
+          // 是制定,不需要校验原企标编号和原企标名称
+          rule = rules
+          delete rule.originEnStandardName
+          delete rule.originEnStandardNo
+        } else {
+          // 是修订，不需要校验企业标准代号，企业名称代号，标准类别代号和年代号
+          rule = rules
+          delete rule.enStandardCode
+          delete rule.standardCategoryCode
+          delete rule.enNameCode
+          delete rule.decadeCode
+        }
+        // 校验是否所有必填项都填了
+        for (const key in dItem) {
+          if (rule[key] && rule[key][0].required === true && (!dItem[key] || dItem[key].length <= 0)) {
+            console.log(key)
+            // 该字段必填，但没有数据
+            hasErr = true
+            break
+          }
+        }
+        if (hasErr) {
+          break
+        }
+      }
       let data = {}
-      if (this.dataSource && this.dataSource.length > 0) {
+      if (this.dataSource && this.dataSource.length > 0 && !hasErr) {
         data.dataSource = this.dataSource
+      } else if (hasErr) {
+        this.$message.warning(this.$t('pleaseCompleteTableInfo'))
+        data = false
       } else {
         this.$message.warning(this.$t('addAtLeastOneRowOfData'))
         data = false