From e2a4399f8288ccf45cbdc782275ef1ca0b5a9e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Wed, 20 Dec 2023 17:35:42 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=81=E7=A8=8B=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectComplianceEvaluationProcess.vue         |  7 ++++++-
 .../StandardConsultationProcess.vue                | 14 ++++++++++++--
 .../StandardEntryOrChangeProcess.vue               |  8 ++++++++
 .../StandardProcurementProcess.vue                 |  7 +++++++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
index e37f7fba..8c5246f1 100644
--- a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
+++ b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
@@ -270,7 +270,7 @@
     <div class="detail-page-scroll-content p-0" v-show="switchValue === 'user'">
       <process-detail-list :process-key="ProcessKey.PROJECT_COMPLIANCE_EVALUATION.value">
         <template #personnelInfo>
-          <personnel-info ref="personnelInfo" :data="personnelInfoData" :current-node="currentNode" />
+          <personnel-info ref="personnelInfo" :data="personnelInfoData" :current-node="personnelInfoCurrentNode" />
         </template>
       </process-detail-list>
     </div>
@@ -813,6 +813,10 @@ export default {
         return this.$t('workCenter.standardCompliance.projectAppraisal')
       }
       return this.$t('basicServiceInformation')
+    },
+    // 人员信息的当前节点，如果是模块负责人修改，在人员信息需要显示当前节点是模块负责人审批
+    personnelInfoCurrentNode () {
+      return this.currentNode === ProjectComplianceEvaluationProcessNode.moduleOwnerModification.value ? ProjectComplianceEvaluationProcessNode.moduleOwnerApproval.value : this.currentNode
     }
   },
   created () {
@@ -1145,6 +1149,7 @@ export default {
           basicTaskInfoDTO.taskId = basicTaskInfoDTO.taskId || this.$route.query.taskId
         } else {
           flag = false
+          this.$message.warning(this.$t('pleaseEnterRemarks'))
         }
       })
       // 抄送人员校验
diff --git a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
index 784f697a..521cd231 100644
--- a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
+++ b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
@@ -253,7 +253,10 @@
     <div class="detail-page-scroll-content p-0" v-show="switchValue === 'user'">
       <process-detail-list :process-key="processKey">
         <template #personnelInfo>
-          <personnel-info ref="personnelInfo" :data="personnelInfoData" :current-node="currentNode" :special-process-node-prefix="currentNodePrefix"/>
+          <personnel-info ref="personnelInfo"
+                          :data="personnelInfoData"
+                          :current-node="currentNode"
+                          :special-process-node-prefix="currentNodePrefix" />
         </template>
       </process-detail-list>
     </div>
@@ -950,7 +953,7 @@ export default {
     dealFormData (isSave) {
       // 提交的表单数据，流程信息，流程审批信息，征求意见列表，业务分派信息，业务基本信息
       let formData = {}, processInfo = {}, approvalInfo = {}, consultationListData = [], dispatchInfo = {}, basicServiceInfo = {},
-        userInfoMap = {}, flag = true
+        userInfoMap = {}, flag = true, baseFlag
       // 保存，只需要有填写内容即可
       if (isSave) {
         // 流程信息
@@ -1005,6 +1008,7 @@ export default {
               dispatchInfo = Object.assign(this.dispatchInfo, values)
             } else {
               flag = false
+              this.$message.warning(this.$t('pleaseEnterRemarks'))
             }
           })
         } else {
@@ -1014,6 +1018,7 @@ export default {
         if (this.showConsultationList && (this.currentNode.indexOf(ConsultationProcess.moduleOwnerSummary.value) !== -1 || this.currentNode.indexOf(ConsultationProcess.leaderSummary.value) !== -1) && !this.$refs.expandTable.submit()) {
           flag = false
         }
+        baseFlag = flag
         // 用户信息
         const userInfo = this.$refs.personnelInfo.getDataObjVerify()
         if (!userInfo) {
@@ -1021,6 +1026,11 @@ export default {
         } else {
           userInfoMap = userInfo
         }
+        if (!flag && !baseFlag) {
+          this.switchValue = 'base'
+        } else if (!flag && !userInfo) {
+          this.switchValue = 'user'
+        }
         consultationListData = this.dataSource || []
       }
       if (!flag) {
diff --git a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
index 7dab3525..b4c71e2e 100644
--- a/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
+++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
@@ -798,8 +798,10 @@ export default {
           formData.basicTaskInfoDTO.taskId = this.$route.query.taskId
         } else {
           flag = false
+          this.$message.warning(this.$t('pleaseEnterRemarks'))
         }
       })
+      const baseFlag = flag
       // 处理人员信息
       const userInfo = this.$refs.personnelInfo.getDataObjVerify()
       if (!userInfo) {
@@ -807,6 +809,12 @@ export default {
       } else {
         formData.userInfoMap = userInfo
       }
+      if (!flag && !baseFlag) {
+        this.switchValue = 'base'
+      }
+      if (!flag && !userInfo) {
+        this.switchValue = 'user'
+      }
       if (flag) {
         return formData
       }
diff --git a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue
index d819d854..34fcfa98 100644
--- a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue
+++ b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue
@@ -372,11 +372,18 @@ export default {
             approvalInfo.taskId = approvalInfo.taskId || this.$route.query.taskId
           } else {
             flag = false
+            this.$message.warning(this.$t('pleaseEnterRemarks'))
           }
         })
+        const baseFlag = flag
         // 人员信息
         const userInfo = this.$refs.personnelInfo.getDataObjVerify()
         userInfoMap = userInfo ? userInfo : flag = false
+        if (!flag && !baseFlag) {
+          this.switchValue = 'base'
+        } else if (!flag && !userInfo) {
+          this.switchValue = 'user'
+        }
       }
       formData = {
         basicProcessInfoDTO: processInfo,