From d2a044ac3e1265f49a6b16238afd370345acabdf Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 20 Dec 2023 18:43:23 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ProcessDetailList.vue          |   2 +-
 .../selection/UserSelectByContactModal.vue    |   2 +-
 .../selection/UserSelectByWorkGroupModal.vue  | 202 ++++++++++++------
 src/components/selection/UserSelectModal.vue  |   2 +-
 .../modules/BaseInfoTableModal.vue            |  15 +-
 5 files changed, 148 insertions(+), 75 deletions(-)

diff --git a/src/components/ProcessDetailList.vue b/src/components/ProcessDetailList.vue
index 64d86475..68879976 100644
--- a/src/components/ProcessDetailList.vue
+++ b/src/components/ProcessDetailList.vue
@@ -57,7 +57,7 @@
           <!--审批意见-->
           <template v-slot:approvalOpinion="{text, record}">
             <a-tooltip overlay-class-name="tooltip-style">
-              <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
+              <template slot="title">{{ text || text === 0 ? record.commitFlag_dictText : global.emptyLine }}</template>
               <div class="table-text" :class="{'agree-color': record.commitFlag + '' === '1', 'reject-color': record.commitFlag + '' === '2'}">
                 {{ text || text === 0 ? record.commitFlag_dictText : global.emptyLine }}
               </div>
diff --git a/src/components/selection/UserSelectByContactModal.vue b/src/components/selection/UserSelectByContactModal.vue
index f8b09b29..6bd66ff5 100644
--- a/src/components/selection/UserSelectByContactModal.vue
+++ b/src/components/selection/UserSelectByContactModal.vue
@@ -28,7 +28,7 @@
         :columns="columns"
         rowKey="contactId"
         bordered
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%', y: '280px'}"
         :data-source="dataSource"
         :pagination="ipagination"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: type }"
diff --git a/src/components/selection/UserSelectByWorkGroupModal.vue b/src/components/selection/UserSelectByWorkGroupModal.vue
index f0fb2238..bb4eb91d 100644
--- a/src/components/selection/UserSelectByWorkGroupModal.vue
+++ b/src/components/selection/UserSelectByWorkGroupModal.vue
@@ -2,74 +2,102 @@
   <j-modal
     :title="$t('userSelect.selectUser')"
     :maskClosable="false"
-    :width="1000"
+    :width="1200"
     :closable="true"
     @ok="handleOk"
     @cancel="handleCancel"
     switchFullscreen
     :visible="visible">
-    <div class="modal-search-wrapper table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item :label="$t('system.internalWorkGroup.name')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('system.internalWorkGroup.name')" v-model="queryParam.realname"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item :label="$t('system.internalWorkGroup.workNo')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('system.internalWorkGroup.workNo')" v-model="queryParam.username"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item :label="$t('system.internalWorkGroup.role')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('system.internalWorkGroup.role')" v-model="queryParam.userRoleName"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item :label="$t('system.internalWorkGroup.post')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')+$t('system.internalWorkGroup.post')" v-model="queryParam.userPostName"></a-input>
-            </a-form-item>
-          </a-col>
-          <!--<a-col :span="6">-->
-          <!--  <a-form-item :label="$t('userSelect.workGroup')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-          <!--    <a-tree-select-->
-          <!--      tree-node-filter-prop="title"-->
-          <!--      v-model="queryParam.workingGroupId"-->
-          <!--      :maxTagCount="1"-->
-          <!--      :show-search="true"-->
-          <!--      :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
-          <!--      style="width: 100%"-->
-          <!--      :tree-data="workingGroupTreeList"-->
-          <!--      :placeholder="$t('pleaseSelect')"-->
-          <!--    />-->
-          <!--  </a-form-item>-->
-          <!--</a-col>-->
-          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+    <div class="modal-top-wrapper">
+      <div class="modal-left-wrapper">
+        <a-spin :spinning="treeLoading">
+          <a-tree
+            :show-line="true"
+            :show-icon="true"
+            :tree-data="treeData"
+            :selectedKeys="currentTreeNode"
+            :replaceFields="{children: 'subset', title: 'name', key: 'id'}"
+            :default-expand-all="defaultExpandAll"
+            @select="treeSelect">
+            <template #custom="record">
+              <div class="tree-operate-node">
+                <a-icon class="parent-node-icon" type="folder" v-if="record.subset && record.subset.length > 0" />
+                <a-tooltip>
+                  <template #title>
+                    {{ record.name }}
+                  </template>
+                  <span class="tree-node-custom-title">{{ record.name }}</span>
+                </a-tooltip>
+              </div>
+            </template>
+          </a-tree>
+        </a-spin>
+      </div>
+      <div class="modal-right-wrapper">
+        <div class="modal-search-wrapper table-page-search-wrapper">
+          <a-form layout="inline" @keyup.enter.native="searchQuery">
+            <a-row :gutter="24">
+              <a-col :span="6">
+                <a-form-item :label="$t('system.internalWorkGroup.name')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-input :placeholder="$t('pleaseEnter')+$t('system.internalWorkGroup.name')" v-model="queryParam.realname"></j-input>
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :label="$t('system.internalWorkGroup.workNo')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-input :placeholder="$t('pleaseEnter')+$t('system.internalWorkGroup.workNo')" v-model="queryParam.username"></j-input>
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :label="$t('system.internalWorkGroup.role')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input :placeholder="$t('pleaseEnter')+$t('system.internalWorkGroup.role')" v-model="queryParam.userRoleName"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item :label="$t('system.internalWorkGroup.post')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-input :placeholder="$t('pleaseEnter')+$t('system.internalWorkGroup.post')" v-model="queryParam.post"></j-input>
+                </a-form-item>
+              </a-col>
+              <!--<a-col :span="6">-->
+              <!--  <a-form-item :label="$t('userSelect.workGroup')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+              <!--    <a-tree-select-->
+              <!--      tree-node-filter-prop="title"-->
+              <!--      v-model="queryParam.workingGroupId"-->
+              <!--      :maxTagCount="1"-->
+              <!--      :show-search="true"-->
+              <!--      :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+              <!--      style="width: 100%"-->
+              <!--      :tree-data="workingGroupTreeList"-->
+              <!--      :placeholder="$t('pleaseSelect')"-->
+              <!--    />-->
+              <!--  </a-form-item>-->
+              <!--</a-col>-->
+              <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
             <a-button style="margin-left: 8px" type="primary" icon="search" @click="searchQuery">{{$t('query')}}</a-button>
             <a-button style="margin-left: 8px" type="primary" ghost icon="reload" @click="searchReset">{{$t('reset')}}</a-button>
           </span>
-        </a-row>
-      </a-form>
-    </div>
-    <div class="modal-content">
-      <a-table
-        :columns="columns"
-        rowKey="id"
-        bordered
-        :scroll="{x: '100%'}"
-        :data-source="dataSource"
-        :pagination="ipagination"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: type }"
-        :loading="loadingLeft"
-        @change="leftTableChange">
-        <template slot="text" slot-scope="text">
-          <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
-            <div class="table-text">{{ text || text === 0 ? text : global.emptyLine }}</div>
-          </a-tooltip>
-        </template>
-      </a-table>
+            </a-row>
+          </a-form>
+        </div>
+        <div class="modal-content">
+          <a-table
+            :columns="columns"
+            rowKey="id"
+            bordered
+            :scroll="{x: '100%', y: '280px'}"
+            :data-source="dataSource"
+            :pagination="ipagination"
+            :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: type }"
+            :loading="loadingLeft"
+            @change="leftTableChange">
+            <template slot="text" slot-scope="text">
+              <a-tooltip overlay-class-name="tooltip-style">
+                <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
+                <div class="table-text">{{ text || text === 0 ? text : global.emptyLine }}</div>
+              </a-tooltip>
+            </template>
+          </a-table>
+        </div>
+      </div>
     </div>
     <p class="modal-content-title">{{ $t('userSelect.selectedPersonnel') }}</p>
     <div v-if="dataSourceRight && dataSourceRight.length > 0" class="name-content">
@@ -122,6 +150,10 @@ export default {
       wrapperCol: {
         span: 18
       },
+      treeLoading: false,
+      currentTreeNode: null, // 当前选中的树节点
+      defaultExpandAll: false, // 左侧树默认展开所有
+      treeData: [],
       columns: [
         {
           title: this.$t('user.workNo'),
@@ -137,13 +169,13 @@ export default {
         },
         {
           title: this.$t('role'),
-          dataIndex: 'userRoleName',
+          dataIndex: 'roleTxt',
           align: 'center',
           scopedSlots: { customRender: 'text' }
         },
         {
           title: this.$t('userSelect.post'),
-          dataIndex: 'userPostName',
+          dataIndex: 'post',
           align: 'center',
           scopedSlots: { customRender: 'text' }
         }
@@ -171,16 +203,17 @@ export default {
     }
   },
   mounted () {
+    this.initTreeData()
     this.getWorkGroupTree()
     this.loadData()
   },
   methods: {
     open (value) {
       this.visible = true
+      this.loadData()
       if (value) {
         this.selectedRowKeys = value.split(',')
         this.getUserListByIds(value)
-        this.loadData()
       }
     },
     // 获取内部工作组树
@@ -193,6 +226,30 @@ export default {
         }
       })
     },
+    // 左侧树点击选中
+    treeSelect (selectedKeys) {
+      console.log(selectedKeys)
+      this.currentTreeNode = selectedKeys
+      this.queryParam.workingGroupId = selectedKeys[0]
+      this.loadData()
+    },
+    // 获取左侧树数据
+    initTreeData (params) {
+      this.treeLoading = true
+      getWorkGroupTreeList(params).then(res => {
+        if (res.success) {
+          this.treeData = this.dealTreeData(res.result)
+          this.treeData[0].scopedSlots = { title: 'oneCustom' }
+        } else {
+          this.treeData = []
+        }
+      }).finally(() => {
+        this.$nextTick(() => {
+          this.defaultExpandAll = true
+        })
+        this.treeLoading = false
+      })
+    },
     // 处理左侧树数据结构
     dealTreeData (treeData) {
       return treeData.map(item => {
@@ -318,6 +375,21 @@ export default {
 </script>
 
 <style scoped lang="less">
+@import '~@assets/less/common.less';
+.modal-top-wrapper {
+  display: flex;
+  height: 480px;
+  margin-bottom: 20px;
+}
+.modal-left-wrapper {
+  width: 200px;
+  margin-right: 20px;
+  height: 100%;
+  overflow-y: scroll;
+}
+.modal-right-wrapper {
+  flex: 1;
+}
 .modal-content {
   width: 100%;
   display: flex;
@@ -360,6 +432,10 @@ export default {
   }
 }
 
+/deep/ .ant-table-body{
+  overflow: scroll;
+}
+
 /deep/ .ant-form-item-label{
   min-width: 70px !important;
 }
diff --git a/src/components/selection/UserSelectModal.vue b/src/components/selection/UserSelectModal.vue
index f13c074a..4a5545b6 100644
--- a/src/components/selection/UserSelectModal.vue
+++ b/src/components/selection/UserSelectModal.vue
@@ -58,7 +58,7 @@
         :columns="columns"
         rowKey="id"
         bordered
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%', y: '280px'}"
         :data-source="dataSource"
         :pagination="ipagination"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: type }"
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
index 859e0ccf..3a7751ef 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
@@ -785,23 +785,20 @@ export default {
       this.model = Object.assign({}, record)
       this.formInline = Object.assign({}, record)
       // 三个日期，如果标准化填写了，主起草人不能修改，标准化未填写，联络人必填
-      // 找出最初的这条表格数据
-      const dItem = this.initDataSource.find(item => item.id === this.formInline.id)
-      console.log(dItem)
       if ([6].includes(this.currentNode)) {
         // 是主起草人的编辑
         // 草稿计划完成日期的处理
-        if (dItem.draftPlannedCompleteDate) {
+        if (this.formInline.draftPlannedCompleteDateEditFlag === '0') {
           // 草稿计划完成日期已经填写了, 主起草人不能修改
           this.draftPlanFinishDateDisabled = true
         }
         // 征求意见稿计划完成日期
-        if (dItem.solicitationDraftPlanCompleteDate) {
+        if (this.formInline.solicitationDraftPlanCompleteDateEditFlag === '0') {
           // 征求意见稿计划完成日期已经填写了, 主起草人不能修改
           this.exposureDraftPlanFinishDateDisabled = true
         }
         // 计划报批日期
-        if (dItem.planApprovalDate) {
+        if (this.formInline.planApprovalDateEditFlag === '0') {
           // 计划报批日期已经填写了, 主起草人不能修改
           this.planSubmissionDateDisabled = true
         }
@@ -813,7 +810,7 @@ export default {
         // 是联络人的编辑,只能编辑3个日期，如果标准化填过了不能修改，未填的话必填
         this.disabled = true
         // 草稿计划完成日期的处理
-        if (!dItem.draftPlannedCompleteDate) {
+        if (this.formInline.draftPlannedCompleteDateEditFlag !== '0') {
           // 草稿计划完成日期没有填写, 联络人必填
           this.rules.draftPlannedCompleteDate[0].required = true
         } else {
@@ -821,7 +818,7 @@ export default {
           this.draftPlanFinishDateDisabled = true
         }
         // 征求意见稿计划完成日期
-        if (!dItem.solicitationDraftPlanCompleteDate) {
+        if (this.formInline.solicitationDraftPlanCompleteDateEditFlag !== '0') {
           // 征求意见稿计划完成日期没有填写, 联络人必填
           this.rules.solicitationDraftPlanCompleteDate[0].required = true
         } else {
@@ -829,7 +826,7 @@ export default {
           this.exposureDraftPlanFinishDateDisabled = true
         }
         // 计划报批日期
-        if (!dItem.planApprovalDate) {
+        if (this.formInline.planApprovalDateEditFlag !== '0') {
           // 计划报批日期没有填写, 联络人必填
           this.rules.planApprovalDate[0].required = true
         } else {