From ecee848592427d5b51043a4efa04ce44c746e83c Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Tue, 19 Dec 2023 11:07:57 +0800
Subject: [PATCH] fix 79317

---
 .../selection/WorkGroupSelection.vue          |  4 ++--
 .../selection/WorkGroupSelectionModal.vue     | 17 ++++++++++++---
 .../EnterpriseStandardInspectionPlanFlow.vue  | 21 ++++++++++++-------
 .../EnterpriseStandardInspectionProcess.vue   |  2 +-
 ...erpriseStandardInspectionRectification.vue |  2 +-
 .../InspectionExtensionRequestProcess.vue     |  2 +-
 .../PermissionApplicationProcess.vue          |  2 +-
 .../PostMeetingManageProcess.vue              |  2 +-
 8 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/components/selection/WorkGroupSelection.vue b/src/components/selection/WorkGroupSelection.vue
index 045682e6..1c134494 100644
--- a/src/components/selection/WorkGroupSelection.vue
+++ b/src/components/selection/WorkGroupSelection.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="selection-wrapper">
     <div class="box-title-text">
-      <a-input class="box-input" v-model="textVals" :title="textVals"
+      <a-input class="box-input" :value="value" :title="value" @input="indexClick"
                :disabled="disabledInput" :placeholder="placeholder">
-        <a-icon v-if="storeVals" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
+        <a-icon v-show="value" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
       </a-input>
       <a-button v-if="!disabled" type="primary" class="button-box" @click="workGroupClick">
         {{this.$t('workGroupSelect.select')}}
diff --git a/src/components/selection/WorkGroupSelectionModal.vue b/src/components/selection/WorkGroupSelectionModal.vue
index 7376c2d9..413c3769 100644
--- a/src/components/selection/WorkGroupSelectionModal.vue
+++ b/src/components/selection/WorkGroupSelectionModal.vue
@@ -23,6 +23,7 @@
         @expand="onExpand"
         :autoExpandParent="autoExpandParent"
         :expandedKeys="expandedKeys"
+        :selectedKeys.sync="selectedKeys"
         :checkedKeys="checkedKeys">
 
         <template slot="title" slot-scope="{title}">
@@ -72,7 +73,8 @@ export default {
       checkedRows: [],
       searchValue: '',
       checkStrictly: true,
-      fullscreen: false
+      fullscreen: false,
+      selectedKeys: []
     }
   },
   created () {
@@ -104,15 +106,22 @@ export default {
       this.checkedKeys = []
       if (textVals) {
         this.$nextTick(() => {
-          const nodes = this.findKeysByNodes(textVals.split(','))
+          // 如果是多选就以逗号分开查找，否则就直接查找
+          const nodes = this.findKeysByNodes(this.multi ? textVals.split(',') : textVals)
           this.checkedRows = nodes
           this.checkedKeys = nodes.map(item => item.key)
+          this.selectedKeys = [...this.checkedKeys]
         })
       }
     },
     findKeysByNodes (titles) {
+      const _this = this
       const nodes = []
       function searchTree (node) {
+        // 如果是单选模式已经找到一个，就不继续查找了
+        if (!_this.multi && nodes.length) {
+          return
+        }
         if (titles.includes(node.title)) {
           nodes.push(node)
         }
@@ -353,7 +362,9 @@ export default {
 // 单选不显示选择框
 .select-work-group-tree.radio-tree {
   /deep/.ant-tree-checkbox {
-    display: none;
+    //display: none;
+    opacity: 0;
+    position: absolute;
   }
 }
 
diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
index 2be90748..cf3566e8 100644
--- a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue
@@ -65,7 +65,7 @@
                                  type="radio"
                                  dictCode="yn"
                                  @change="changeIsCountersign"
-                                  v-decorator="['pass', validatorRules.isCountersign]" />
+                                  v-decorator="['countersignTag', validatorRules.isCountersign]" />
             </a-form-item>
           </div>
           <div class="form-flex-item custom-flex-form-item">
@@ -290,7 +290,7 @@ export default {
           // 回显会签表单
           this.$nextTick(() => {
             this.countersignForm && this.countersignForm.setFieldsValue({
-              pass: data.countersignTag,
+              countersignTag: data.countersignTag,
               involveList: data.countersign || ''
             })
           })
@@ -359,9 +359,9 @@ export default {
       // 处理其他参数
       params.map = Object.assign({}, formDataList[1], getPersonInfo)
       // 节点三：会签表单放到对象最外层单独存储业务信息，params.map里是流程用的
-      if (this.currentNode === EsInspectionPlan.liaisonCollect.value && Object.hasOwnProperty.call(params.map, 'pass')) {
-        params.countersignTag = params.map.pass
-        params.map.pass = this.convertPass(params.map.pass)
+      if (this.currentNode === EsInspectionPlan.liaisonCollect.value && Object.hasOwnProperty.call(params.map, 'countersignTag')) {
+        params.countersignTag = params.map.countersignTag
+        // params.map.pass = this.convertPass(params.map.pass)
       }
       if (params.map.involveList && typeof params.map.involveList === 'string') {
         params.countersign = params.map.involveList
@@ -482,10 +482,15 @@ export default {
       if (this.loading) return
       this.loading = true
       this.getPageParams().then(res => {
-        // 同意和提交一直传true
-        res.map.pass = true
+        // 节点三，pass决定是否跳过会签
+        if (this.currentNode === EsInspectionPlan.liaisonCollect.value) {
+          res.map.pass = this.convertPass(res.map.countersignTag)
+        } else {
+          // 其他情况一直传true
+          res.map.pass = true
+        }
         // 不是提交按钮
-        if (!isSubmitBtn) {
+        if (isSubmitBtn !== true) {
           // 没有填写注释，就默认同意
           if (!res.processApprovalRecord.commitText) {
             res.processApprovalRecord.commitText = '同意'
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
index e7804aaf..e11db8e4 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
@@ -413,7 +413,7 @@ export default {
         // 同意和提交一直传true
         res.map.pass = true
         // 不是提交按钮
-        if (!isSubmitBtn) {
+        if (isSubmitBtn !== true) {
           // 没有填写注释，就默认同意
           if (!res.processApprovalRecord.commitText) {
             res.processApprovalRecord.commitText = '同意'
diff --git a/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue b/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue
index c4fed04e..0ce2d31d 100644
--- a/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue
@@ -410,7 +410,7 @@ export default {
         // 同意和提交一直传true
         res.map.pass = true
         // 不是提交按钮
-        if (!isSubmitBtn) {
+        if (isSubmitBtn !== true) {
           // 没有填写注释，就默认同意
           if (!res.processApprovalRecord.commitText) {
             res.processApprovalRecord.commitText = '同意'
diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
index 087c30fd..1bdb9526 100644
--- a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
+++ b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
@@ -418,7 +418,7 @@ export default {
         // 同意和提交一直传true
         res.map.pass = true
         // 不是提交按钮
-        if (!isSubmitBtn) {
+        if (isSubmitBtn !== true) {
           // 没有填写注释，就默认同意
           if (!res.processApprovalRecord.commitText) {
             res.processApprovalRecord.commitText = '同意'
diff --git a/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue b/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue
index a5f6df81..54d75708 100644
--- a/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue
+++ b/src/views/workCenter/permissionApplicationProcess/PermissionApplicationProcess.vue
@@ -502,7 +502,7 @@ export default {
         // 同意和提交一直传true
         res.map.pass = true
         // 不是提交按钮
-        if (!isSubmitBtn) {
+        if (isSubmitBtn !== true) {
           // 没有填写注释，就默认同意
           if (!res.processApprovalRecord.commitText) {
             res.processApprovalRecord.commitText = '同意'
diff --git a/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue b/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue
index 5a574ba0..3e07d424 100644
--- a/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue
+++ b/src/views/workCenter/postMeetingManageProcess/PostMeetingManageProcess.vue
@@ -440,7 +440,7 @@ export default {
         res.map.pass = true
         res.notAttend = false
         // 不是提交按钮
-        if (!isSubmitBtn) {
+        if (isSubmitBtn !== true) {
           // 没有填写注释，就默认同意
           if (!res.processApprovalRecord.commitText) {
             res.processApprovalRecord.commitText = '同意'