From fe877c343b258a2dea05b366488c15c040a1f0ed Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 10 Jul 2024 15:36:21 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E5=8F=8A=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E6=B5=81=E7=A8=8B=E4=B8=AD=E4=B8=BB=E8=B5=B7=E8=8D=89?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8DesSelectFlag=E4=B8=BA0=E7=9A=84=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E4=B8=8D=E5=8F=AF=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/workCenter/zh.js               |  2 +-
 src/components/customField/AddForm.vue         | 10 ++++++++++
 src/components/jerobiz/JSelectDepart.vue       |  7 +++++++
 .../jerobiz/modal/JSelectDepartModal.vue       | 18 +++++++++++++++++-
 src/components/selection/TreeSelectModal.vue   | 14 +++++++++++++-
 .../modules/EnterpriseStandardModal.vue        |  1 +
 .../modules/ContactEnterSendTaskModal.vue      |  1 +
 .../modules/BaseInfoTableModal.vue             |  1 +
 .../modules/BaseInfoForm.vue                   |  1 +
 .../modules/ApprovalBaseInfo.vue               |  1 +
 .../modules/DutyDepartChangeBaseInfo.vue       |  1 +
 .../modules/FinishTimeChangeBaseInfoDrawer.vue |  1 +
 .../modules/MergeBaseInfo.vue                  |  1 +
 .../modules/ContactInitBaseInfo.vue            |  1 +
 14 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js
index 56baf0aa..b991531c 100644
--- a/src/common/lang/workCenter/zh.js
+++ b/src/common/lang/workCenter/zh.js
@@ -158,7 +158,7 @@ module.exports = {
     releaseDate: '发布日期',
     implementationDate: '实施日期',
     esPlan: '企标计划',
-    deadlineNeedGreaterThan: '征求意见截止日期需要比征求意见稿计划完成日期早',
+    deadlineNeedGreaterThan: '征求意见截止日期需要比标准化设置的征求意见截止日期早',
     noStandardTextLook: '暂无标准文本可查看',
     summaryOfOpinions: '意见汇总',
     confirmIsInsertSignature: '确认是否已插入签章',
diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue
index eb8648ff..33fa1e09 100644
--- a/src/components/customField/AddForm.vue
+++ b/src/components/customField/AddForm.vue
@@ -36,6 +36,7 @@
                 <!--   3, 单选组织机构  -->
                 <j-select-depart v-else-if="item.fieldShowType === FieldType.ORGAN_SINGLE.value"
                                  v-model="formInline[item.dbFieldName]"
+                                 :isSomeDisabled="departSomeDisabledField.includes(item.dbFieldName)"
                                  :backDepart="true" />
                 <!--   4, 日期多选  -->
                 <j-multiple-date-picker v-else-if="item.fieldShowType === FieldType.DATE_MORE.value"
@@ -60,6 +61,7 @@
                 <!--   7, 多选组织机构  -->
                 <j-select-depart v-else-if="item.fieldShowType === FieldType.ORGAN_MORE.value"
                                  v-model="formInline[item.dbFieldName]"
+                                 :isSomeDisabled="departSomeDisabledField.includes(item.dbFieldName)"
                                  :disabled="disabled || disabledFieldList.includes(item.dbFieldName) || innerDisabledField.includes(item.dbFieldName)"
                                  :selectRange="item.dbFieldName === 'auth_dept' ? departSelectRange : []"
                                  :multi="true"
@@ -312,6 +314,14 @@ export default {
       type: Boolean,
       required: false,
       default: true
+    },
+    // 企标选部门字段esSelectFlag为0不能选的字段
+    departSomeDisabledField: {
+      type: Array,
+      required: false,
+      default: () => {
+        return []
+      }
     }
   },
   mounted () {
diff --git a/src/components/jerobiz/JSelectDepart.vue b/src/components/jerobiz/JSelectDepart.vue
index 6d38e014..4f96f194 100644
--- a/src/components/jerobiz/JSelectDepart.vue
+++ b/src/components/jerobiz/JSelectDepart.vue
@@ -16,6 +16,7 @@
       :text="textField"
       :treeOpera="treeOpera"
       :selectRange="selectRange"
+      :isSomeDisabled="isSomeDisabled"
       @ok="handleOK"
       @initComp="initComp"/>
   </div>
@@ -88,6 +89,12 @@ export default {
         return []
       },
       required: false
+    },
+    // 企标选部门字段esSelectFlag为0的是否不能选
+    isSomeDisabled: {
+      type: Boolean,
+      required: false,
+      default: false
     }
 
   },
diff --git a/src/components/jerobiz/modal/JSelectDepartModal.vue b/src/components/jerobiz/modal/JSelectDepartModal.vue
index 4a4bec0c..b0b08770 100644
--- a/src/components/jerobiz/modal/JSelectDepartModal.vue
+++ b/src/components/jerobiz/modal/JSelectDepartModal.vue
@@ -58,7 +58,7 @@
 import { queryDepartTreeList } from '@/api/api'
 export default {
   name: 'JSelectDepartModal',
-  props: ['modalWidth', 'multi', 'rootOpened', 'departId', 'store', 'text', 'treeOpera', 'selectRange'],
+  props: ['modalWidth', 'multi', 'rootOpened', 'departId', 'store', 'text', 'treeOpera', 'selectRange', 'isSomeDisabled'],
   data () {
     return {
       visible: false,
@@ -128,12 +128,28 @@ export default {
           this.reWriterWithSlot(arr)
           this.treeData = arr
           this.initDepartComponent()
+          // 有不可选的选项,处理数据
+          if (this.isSomeDisabled) {
+            this.handleTreeDisabled(this.treeData)
+            console.log('--------treeData', this.treeData)
+          }
           if (this.rootOpened) {
             this.initExpandedKeys(res.result)
           }
         }
       })
     },
+    // 有不可选的选项，需要处理成disabled为true
+    handleTreeDisabled (treeData) {
+      for (const item of treeData) {
+        if (item.esSelectFlag === '0') {
+          item.disabled = true
+        }
+        if (item.children && item.children.length > 0) {
+          this.handleTreeDisabled(item.children)
+        }
+      }
+    },
     // 筛选出只有在选择范围里的数据
     filterTreeDataOnlySelectRange (arr) {
       if (this.selectRange && this.selectRange.length > 0) {
diff --git a/src/components/selection/TreeSelectModal.vue b/src/components/selection/TreeSelectModal.vue
index 6ce6bda6..0de18ee7 100644
--- a/src/components/selection/TreeSelectModal.vue
+++ b/src/components/selection/TreeSelectModal.vue
@@ -39,6 +39,8 @@
         :row-selection="rowSelection"
         :loading="confirmLoading"
         :childrenColumnName="childrenFieldName"
+        :expandedRowKeys="expandedRowKeys"
+        @expandedRowsChange="expandedRowsChange"
         @change="handleTableChange">
         <template slot="text" slot-scope="text">
           <a-tooltip overlay-class-name="tooltip-style">
@@ -156,7 +158,8 @@ export default {
       dataSource: [],
       selectedRowKeys: [],
       childrenFieldName: 'childPartNameList',
-      searchField: 'nodeName'
+      searchField: 'nodeName',
+      expandedRowKeys: [] // 展开的key
     }
   },
   methods: {
@@ -251,6 +254,15 @@ export default {
       this.ipagination = pagination
       this.loadData()
     },
+    // 展开改变
+    expandedRowsChange (value) {
+      console.log('----value', value)
+      if (value.length > this.expandedRowKeys.length) {
+        // 增加了展开,找到刚展开的行，如果没有下级，调接口获取下级数据
+
+      }
+      this.expandedRowKeys = value
+    },
     // 名字列表的删除
     handleDelete (record, index) {
       this.dataSourceRight.splice(index, 1)
diff --git a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
index f381f4f0..dcb6aa02 100644
--- a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
+++ b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
@@ -24,6 +24,7 @@
                   :get-document-info-func="getDocumentInfoFunc"
                   :exclude-standard-fields="['substitute_standard_number', 'reference_standard']"
                   :process-is-allow-upload-doc="false"
+                  :departSomeDisabledField="['main_drafting_unit']"
                   @submitFormData="submitFormData" />
         <div class="header-text-btn">
           <!--  稽查内容  -->
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
index f88014dc..005da362 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
@@ -458,6 +458,7 @@
                 <j-select-depart v-model="formInline.mainDraftingUnit"
                                  :disabled="disabled"
                                  @back="mainDraftingUnitBack"
+                                 :isSomeDisabled="true"
                                  :backDepart="true" />
               </a-form-model-item>
             </div>
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
index 3ecba262..858baeaf 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
@@ -436,6 +436,7 @@
                 <j-select-depart v-model="formInline.mainDraftingUnit"
                                  :disabled="disabled"
                                  @back="mainDraftingUnitBack"
+                                 :isSomeDisabled="true"
                                  :backDepart="true" />
               </a-form-model-item>
             </div>
diff --git a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue
index f1cd9248..7f5324f3 100644
--- a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue
+++ b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue
@@ -236,6 +236,7 @@
           <a-form-model-item class="item-model" prop="mainDraftingUnit">
             <j-select-depart v-model="formInline.mainDraftingUnit"
                              :disabled="disabled"
+                             :isSomeDisabled="true"
                              :backDepart="true" />
           </a-form-model-item>
         </div>
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
index d4aea810..0b899312 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
@@ -404,6 +404,7 @@
             <a-form-model-item class="item-model" prop="mainDraftingUnit">
               <j-select-depart v-model="formInline.mainDraftingUnit"
                                :disabled="disabled"
+                               :isSomeDisabled="true"
                                :backDepart="true" />
             </a-form-model-item>
           </div>
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue
index ce17d31b..68dba135 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/DutyDepartChangeBaseInfo.vue
@@ -112,6 +112,7 @@
         <a-form-model-item class="item-model" prop="newMainDraftingUnit">
           <j-select-depart v-model="formInline.newMainDraftingUnit"
                            :disabled="disabled && !newMainDrafterCanUpdate"
+                           :isSomeDisabled="true"
                            :backDepart="true" />
         </a-form-model-item>
       </div>
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue
index 5a949af3..f4ef3129 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfoDrawer.vue
@@ -72,6 +72,7 @@
               </div>
               <a-form-model-item class="item-model" prop="mainDraftingUnit">
                 <j-select-depart v-model="formInline.mainDraftingUnit"
+                                 :isSomeDisabled="true"
                                  :backDepart="true" />
               </a-form-model-item>
             </div>
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
index c7c09b8c..32114116 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
@@ -390,6 +390,7 @@
           <a-form-model-item class="item-model" prop="mainDraftingUnit">
             <j-select-depart v-model="formInline.mainDraftingUnit"
                              :disabled="disabled"
+                             :isSomeDisabled="true"
                              :backDepart="true" />
           </a-form-model-item>
         </div>
diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
index 3736cfc1..299c45ce 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
@@ -62,6 +62,7 @@
           <a-form-model-item class="item-model" prop="mainDraftingUnit">
             <j-select-depart v-model="formInline.mainDraftingUnit"
                              :disabled="disabled"
+                             :isSomeDisabled="true"
                              :backDepart="true" />
           </a-form-model-item>
         </div>