From eddbaa02aecccc10d583e42d4f2f89b1a05b1e26 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 19 Jan 2024 16:34:06 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E9=9B=B6=E9=83=A8=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/selection/TreeSelectModal.vue        | 13 +++++++------
 .../modules/ContactEnterSendTaskModal.vue           |  2 +-
 .../modules/BaseInfoTableModal.vue                  |  2 +-
 .../modules/BaseInfoForm.vue                        |  2 +-
 .../modules/ApprovalBaseInfo.vue                    |  2 +-
 .../modules/MergeBaseInfo.vue                       |  2 +-
 .../modules/BaseInfoForm.vue                        |  2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/selection/TreeSelectModal.vue b/src/components/selection/TreeSelectModal.vue
index 66941b89..ce234d32 100644
--- a/src/components/selection/TreeSelectModal.vue
+++ b/src/components/selection/TreeSelectModal.vue
@@ -31,13 +31,14 @@
     <div class="modal-content">
       <a-table
         :columns="columns"
-        rowKey="itemValue"
+        rowKey="code"
         bordered
         :scroll="{x: '100%'}"
         :data-source="dataSource"
         :pagination="ipagination"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: type }"
         :loading="confirmLoading"
+        :childrenColumnName="['childPartNameList']"
         @change="handleTableChange">
         <template slot="text" slot-scope="text">
           <a-tooltip overlay-class-name="tooltip-style">
@@ -49,7 +50,7 @@
     </div>
     <p class="modal-content-title">{{ $t('treeSelection.selectedData') }}</p>
     <div v-if="dataSourceRight && dataSourceRight.length > 0" class="name-content">
-      <div v-for="(item, index) in dataSourceRight" :key="item.itemValue" class="name-div">
+      <div v-for="(item, index) in dataSourceRight" :key="item.code" class="name-div">
         {{ item.itemText }}
         <a-icon type="close" @click="handleDelete(item, index)" />
       </div>
@@ -117,7 +118,7 @@ export default {
       columns: [
         {
           title: this.$t('system.tag.name'),
-          dataIndex: 'title'
+          dataIndex: 'name'
         }
       ],
       dataSource: [],
@@ -186,7 +187,7 @@ export default {
         if (selectedRowKeys.length > this.dataSourceRight.length) {
           // 说明是增加了数据
           for (const rowIndex in selectedRows) {
-            if (!this.dataSourceRight.find(item => item.itemValue === selectedRows[rowIndex].itemValue)) {
+            if (!this.dataSourceRight.find(item => item.code === selectedRows[rowIndex].code)) {
               // 右侧不存在，追加到右侧表格
               this.dataSourceRight.push(selectedRows[rowIndex])
             }
@@ -196,7 +197,7 @@ export default {
           if (selectedRowKeys && selectedRowKeys.length > 0) {
             // 没有选中数据，说明这一页没有选中数据了
             for (let i = 0; i < this.dataSourceRight.length; i++) {
-              if (!selectedRowKeys.find(item => item === this.dataSourceRight[i].itemValue)) {
+              if (!selectedRowKeys.find(item => item === this.dataSourceRight[i].code)) {
                 // 表格选中中没有找到这一条数据，说明已经被删了
                 this.dataSourceRight.splice(i, 1)
                 i--
@@ -217,7 +218,7 @@ export default {
     // 名字列表的删除
     handleDelete (record, index) {
       this.dataSourceRight.splice(index, 1)
-      this.selectedRowKeys = this.selectedRowKeys.filter(item => item !== record.itemValue)
+      this.selectedRowKeys = this.selectedRowKeys.filter(item => item !== record.code)
     },
     handleOk () {
       if (this.checkRequired && (!this.selectedRowKeys || this.selectedRowKeys.length === 0)) {
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
index 150fd97b..91c60b76 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
@@ -412,7 +412,7 @@
                                 filedName="componentName"
                                 type="checkbox"
                                 :nameStr="formInline.componentName_dictText"
-                                dict-id="1696007957666533377"
+                                options-href="/laws/standard/partName/"
                                 :disabled="disabled" />
                 </a-form-model-item>
             </div>
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
index 630db8d6..71741a9d 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
@@ -391,7 +391,7 @@
                                 filedName="componentName"
                                 type="checkbox"
                                 :nameStr="formInline.componentName_dictText"
-                                dict-id="1696007957666533377"
+                                options-href="/laws/standard/partName/"
                                 :disabled="disabled" />
               </a-form-model-item>
             </div>
diff --git a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue
index 151925eb..b59c39d7 100644
--- a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue
+++ b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue
@@ -207,7 +207,7 @@
                             filedName="partName"
                             type="checkbox"
                             :nameStr="formInline.partName_dictText"
-                            dict-id="1696007957666533377"
+                            options-href="/laws/standard/partName/"
                             :disabled="disabled" />
           </a-form-model-item>
         </div>
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
index 892158a4..a6a5d252 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
@@ -362,7 +362,7 @@
                               filedName="componentName"
                               type="checkbox"
                               :nameStr="formInline.componentName_dictText"
-                              dict-id="1696007957666533377"
+                              options-href="/laws/standard/partName/"
                               :disabled="disabled" />
             </a-form-model-item>
           </div>
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
index d6a62996..672c9899 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/MergeBaseInfo.vue
@@ -366,7 +366,7 @@
                             filedName="componentName"
                             type="checkbox"
                             :nameStr="formInline.componentName_dictText"
-                            dict-id="1696007957666533377"
+                            options-href="/laws/standard/partName/"
                             :disabled="disabled" />
           </a-form-model-item>
         </div>
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue
index 29b20765..cac95523 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/BaseInfoForm.vue
@@ -175,7 +175,7 @@
                               :filedName="item.dbFieldName"
                               type="checkbox"
                               :nameStr="formInline[item.dbFieldName + '_dictText']"
-                              :dict-id="item.dictId"
+                              :options-href="item.fieldHref"
                               :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />
             </a-form-model-item>
           </div>