From 0508cb18feec5ae9229a8ed982abcef394387a40 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 21 Dec 2023 18:57:31 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=BA=9F=E6=AD=A2=E3=80=81=E5=B0=81=E5=AD=98=E3=80=81=E5=B7=B2?=
 =?UTF-8?q?=E5=B0=81=E5=AD=98=E5=90=AF=E7=94=A8=E6=B5=81=E7=A8=8B=EF=BC=8C?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E8=8A=82=E7=82=B9=E4=BA=BA=E5=91=98=E4=B8=8D?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PersonnelInfo.vue               | 18 +++++++++++++++---
 .../EnterpriseStandardAnnulFlow.vue            |  2 +-
 .../EnterpriseStandardSealSaveFlow.vue         |  2 +-
 .../EnterpriseStandardStartUseFlow.vue         |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/components/PersonnelInfo.vue b/src/components/PersonnelInfo.vue
index 5847ff09..e4ec4f7b 100644
--- a/src/components/PersonnelInfo.vue
+++ b/src/components/PersonnelInfo.vue
@@ -93,6 +93,14 @@ export default {
       type: String,
       required: false,
       default: null
+    },
+    // 不需要做必填校验的字段,用于应对第一个节点选没选人决定节点跳不跳过的问题
+    notPermissField: {
+      type: Array,
+      required: false,
+      default: () => {
+        return []
+      }
     }
   },
   data () {
@@ -160,9 +168,13 @@ export default {
       //   }
       // }
       console.log(personnelObj)
-      if (!Object.values(personnelObj).every(v => !!v)) {
-        this.$message.warning(this.$t('pleaseEnterPersonnelInfo'))
-        personnelObj = false
+      for (const item in personnelObj) {
+        if (!this.notPermissField.includes(item) && !personnelObj[item]) {
+          // 不在不需要做必填校验的字段里，说明是必填并且没有数据
+          this.$message.warning(this.$t('pleaseEnterPersonnelInfo'))
+          personnelObj = false
+          break
+        }
       }
       return personnelObj
     },
diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
index 2481c40e..6663cc8e 100644
--- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
+++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue
@@ -78,7 +78,7 @@
     <!--  人员信息  -->
     <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
       <process-detail-list :processKey="ProcessKey.ES_ABOLISH.value">
-        <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName"></personnel-info>
+        <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName" :notPermissField="['relatedUserList']"></personnel-info>
       </process-detail-list>
     </div>
     <!--  操作按钮  -->
diff --git a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue
index 944ee09b..236aeaef 100644
--- a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue
+++ b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue
@@ -78,7 +78,7 @@
     <!--  人员信息  -->
     <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
       <process-detail-list :processKey="ProcessKey.ES_ARCHIVE.value">
-        <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName"></personnel-info>
+        <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName" :notPermissField="['relatedUserList']"></personnel-info>
       </process-detail-list>
     </div>
     <!--  操作按钮  -->
diff --git a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
index 08a70e7c..a0dce9b0 100644
--- a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
+++ b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue
@@ -78,7 +78,7 @@
     <!--  人员信息  -->
     <div v-show="switchValue === 'user'" class="detail-page-scroll-content p-0">
       <process-detail-list :processKey="ProcessKey.ES_ENABLE.value">
-        <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName"></personnel-info>
+        <personnel-info slot="personnelInfo" ref="personnelInfo" :data="personnelInfoData" :currentNode="currentNodeName" :notPermissField="['relatedUserList']"></personnel-info>
       </process-detail-list>
     </div>
     <!--  操作按钮  -->