From 279985428ccba5f4445f57eae86a1aed1b26de29 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 8 Dec 2023 17:58:07 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E4=B8=BB=E5=8A=A8=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ContactEnterSendTaskModal.vue     | 20 +++++++++++--------
 .../modules/ContactEnterStandardForm.vue      |  8 ++++++--
 .../modules/OnlyTableForm.vue                 |  4 +++-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
index 0ec88af2..adc9b209 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
@@ -54,7 +54,7 @@
               <!--  企标编号-新企标编号  -->
               <div class="box-title-text form-flex-item-half">
                 <div class="title-text">
-                  <span class="required">*</span>
+                  <!--<span class="required">*</span>-->
                   <span class="title-text-text" :title="$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum')">
                   {{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}
                 </span>
@@ -574,13 +574,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: [
           {
@@ -973,4 +973,8 @@ export default {
 .form-flex-item-long {
   width: 100%;
 }
+
+.title-text {
+  width: 200px;
+}
 </style>
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterStandardForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterStandardForm.vue
index 2445613c..4b2d51a7 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterStandardForm.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterStandardForm.vue
@@ -56,7 +56,7 @@ export default {
         collectUserLeader: [
           {
             required: true,
-            message: this.$t('workCenter.enterpriseInitChangePlan.contactsSupervisorLevelLeaders') + this.$t('cannotEmpty'),
+            message: this.$t('workCenter.revisionPlanActivelyReport.contactsSupervisorLevelLeaders') + this.$t('cannotEmpty'),
             trigger: 'change'
           }
         ]
@@ -117,7 +117,11 @@ export default {
 <style scoped lang="less">
 @import '~@assets/less/common.less';
 
+.form-flex-item-long {
+  width: 500px !important;
+}
+
 .title-text-middle {
-  width: 130px !important;
+  width: 180px !important;
 }
 </style>
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue
index 10c533a7..9d8122e6 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue
@@ -280,7 +280,9 @@ export default {
     initData (data) {
       console.log('--------initData---------', data)
       // 给表格赋值
-      this.dataSource = data.dataList
+      if (data && data.dataList) {
+        this.dataSource = data.dataList
+      }
     },
     // 外层要获取数据
     getData () {