From b27d9987a2cf89134c1a4fb42ea17b64f7f20d01 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 8 Aug 2024 09:48:47 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=A0=91=E5=BD=A2=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../selection/TreeDataSelectModal.vue         | 28 +++++++++----------
 .../selection/TreeDataSelection.vue           |  1 -
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/components/selection/TreeDataSelectModal.vue b/src/components/selection/TreeDataSelectModal.vue
index ae1a996..8101047 100644
--- a/src/components/selection/TreeDataSelectModal.vue
+++ b/src/components/selection/TreeDataSelectModal.vue
@@ -48,15 +48,16 @@
     <!--底部父子关联操作和确认取消按钮-->
     <template slot="footer" v-if="treeOpera && checkable">
       <div class="drawer-bootom-button">
-        <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
-          <a-menu slot="overlay">
-            <a-menu-item key="1" @click="switchCheckStrictly(1)">{{ $t('parentChildConnection') }}</a-menu-item>
-            <a-menu-item key="2" @click="switchCheckStrictly(2)">{{ $t('cancelConnection') }}</a-menu-item>
-          </a-menu>
-          <a-button>
-            {{ treeOperationText }} <a-icon type="up" />
-          </a-button>
-        </a-dropdown>
+<!--        <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
+<!--          <a-menu slot="overlay">-->
+<!--            <a-menu-item key="1" @click="switchCheckStrictly(1)">{{ $t('parentChildConnection') }}</a-menu-item>-->
+<!--            <a-menu-item key="2" @click="switchCheckStrictly(2)">{{ $t('cancelConnection') }}</a-menu-item>-->
+<!--          </a-menu>-->
+<!--          <a-button>-->
+<!--            {{ treeOperationText }} <a-icon type="up" />-->
+<!--          </a-button>-->
+<!--        </a-dropdown>-->
+        <a-button style="float: left" @click="switchCheckStrictly(parentChildRelate ? 1 : 2)">{{ treeOperationText }}</a-button>
         <a-button @click="handleCancel" type="primary" style="margin-right: 0.8rem">{{ $t('close') }}</a-button>
         <a-button @click="handleOk" type="primary" >{{ $t('confirm') }}</a-button>
       </div>
@@ -117,7 +118,7 @@ export default {
       }
     },
     treeOperationText () {
-      return this.parentChildRelate ? this.$t('parentChildConnection') : this.$t('cancelConnection')
+      return this.parentChildRelate ? this.$t('cancelConnection') : this.$t('parentChildConnection')
     }
   },
   watch: {
@@ -143,7 +144,7 @@ export default {
           this.searchFieldName = 'nodeName'
           this.lazyLoadPidFieldName = 'dictItemId'
         } else { // 标签库
-          this.replaceFields = { children: 'childrenList', title: 'itemText', key: 'id' }
+          this.replaceFields = { children: 'childrenList', title: 'itemText', key: 'itemValue' }
           this.lazyLoadHref = '/laws/dictTree/getChild'
           this.searchFieldName = 'nodeName'
           this.lazyLoadPidFieldName = 'dictItemId'
@@ -161,7 +162,7 @@ export default {
       width: 800,
       visible: false,
       confirmLoading: false,
-      parentChildRelate: false, // 父子节点是否关联
+      parentChildRelate: true, // 父子节点是否关联
       autoExpandParent: false, // 是否自动展开父节点
       treeData: [],
       expandedKeys: [],
@@ -419,8 +420,7 @@ export default {
       if (this.optionsHref === '/laws/standard/partName/queryFirstList') {
         url = '/laws/standard/partName/echo'
       } else { // 标签库
-        // url = '/laws/lawsLabelDatabase/queryByCodes'
-        url = '/laws/standard/partName/echo'
+        url = '/laws/dictTree/echo'
       }
       if (!url) {
         return
diff --git a/src/components/selection/TreeDataSelection.vue b/src/components/selection/TreeDataSelection.vue
index d0bdd22..b83d381 100644
--- a/src/components/selection/TreeDataSelection.vue
+++ b/src/components/selection/TreeDataSelection.vue
@@ -19,7 +19,6 @@
 
 <script>
 import TreeDataSelectModal from './TreeDataSelectModal'
-import { underLinetoHump } from '@/components/_util/StringUtil'
 
 export default {
   name: 'TreeDataSelection',