From f6e647a3ae717086b68bc6227ae0598369b7ec24 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 2 Aug 2024 15:16:29 +0800
Subject: [PATCH 1/8] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E6=A0=91?=
 =?UTF-8?q?=E5=BD=A2=E5=BC=B9=E6=A1=86=E6=94=B9=E6=88=90=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/customField/AddForm.vue        |  40 +--
 .../selection/TreeDataSelectModal.vue         | 320 ++++++++++++++++++
 .../selection/TreeDataSelection.vue           | 151 +++++++++
 3 files changed, 491 insertions(+), 20 deletions(-)
 create mode 100644 src/components/selection/TreeDataSelectModal.vue
 create mode 100644 src/components/selection/TreeDataSelection.vue

diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue
index 5ea1d9d..d143133 100644
--- a/src/components/customField/AddForm.vue
+++ b/src/components/customField/AddForm.vue
@@ -133,24 +133,24 @@
                                :label-in-value="false"
                                :placeholder="$t('pleaseSelect')+item.dbFieldTxt" />
                 <!--16、树形弹框选择-->
-                <tree-selection v-else-if="item.fieldShowType === FieldType.TREE_MODAL_SELECT.value || item.fieldShowType === FieldType.TREE_MODAL_SELECT_SEARCH_DIFF.value"
-                                :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
-                                v-model="formInline[item.dbFieldName]"
-                                @nameChange="treeSelectNameChange"
-                                :filedName="item.dbFieldName"
-                                type="checkbox"
-                                :options-href="item.fieldHref"
-                                :nameStr="formInline[item.dbFieldName + '_dictText']"
-                                :dict-id="item.dictId"
-                                :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />
-<!--                <tree-data-selection v-else-if="item.fieldShowType === FieldType.TREE_MODAL_SELECT.value || item.fieldShowType === FieldType.TREE_MODAL_SELECT_SEARCH_DIFF.value"-->
-<!--                                     :placeholder="$t('pleaseSelect')+item.dbFieldTxt"-->
-<!--                                     v-model="formInline[item.dbFieldName]"-->
-<!--                                     :fieldName="item.dbFieldName"-->
-<!--                                     :nameStr="formInline[item.dbFieldName + '_dictText']"-->
-<!--                                     @nameChange="treeDataSelectNameChange"-->
-<!--                                     :optionsHref="item.fieldHref"-->
-<!--                                     :dict-id="item.dictId"/>-->
+<!--                <tree-selection v-else-if="item.fieldShowType === FieldType.TREE_MODAL_SELECT.value || item.fieldShowType === FieldType.TREE_MODAL_SELECT_SEARCH_DIFF.value"-->
+<!--                                :placeholder="$t('pleaseSelect')+item.dbFieldTxt"-->
+<!--                                v-model="formInline[item.dbFieldName]"-->
+<!--                                @nameChange="treeSelectNameChange"-->
+<!--                                :filedName="item.dbFieldName"-->
+<!--                                type="checkbox"-->
+<!--                                :options-href="item.fieldHref"-->
+<!--                                :nameStr="formInline[item.dbFieldName + '_dictText']"-->
+<!--                                :dict-id="item.dictId"-->
+<!--                                :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />-->
+                <tree-data-selection v-else-if="item.fieldShowType === FieldType.TREE_MODAL_SELECT.value || item.fieldShowType === FieldType.TREE_MODAL_SELECT_SEARCH_DIFF.value"
+                                     :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+                                     v-model="formInline[item.dbFieldName]"
+                                     :fieldName="item.dbFieldName"
+                                     :nameStr="formInline[item.dbFieldName + '_dictText']"
+                                     @nameChange="treeDataSelectNameChange"
+                                     :optionsHref="item.fieldHref"
+                                     :dict-id="item.dictId"/>
               </a-form-model-item>
             </div>
           </template>
@@ -182,12 +182,12 @@ import TreeSelection from '../selection/TreeSelection'
 import STreeSelect from '../STreeSelect'
 import { isHasPermission } from '../../utils/hasPermission'
 import { mapGetters } from 'vuex'
-// import TreeDataSelection from '../selection/TreeDataSelection'
+import TreeDataSelection from '../selection/TreeDataSelection'
 
 export default {
   name: 'AddForm',
   components: {
-    // TreeDataSelection,
+    TreeDataSelection,
     UserSelection,
     JMultipleDatePicker,
     StandardSelection,
diff --git a/src/components/selection/TreeDataSelectModal.vue b/src/components/selection/TreeDataSelectModal.vue
new file mode 100644
index 0000000..1686455
--- /dev/null
+++ b/src/components/selection/TreeDataSelectModal.vue
@@ -0,0 +1,320 @@
+<template>
+  <j-modal
+    :title="$t('userSelect.select')"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    :maskClosable="false"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel">
+
+    <a-spin :spinning="confirmLoading">
+      <a-input-search style="margin-bottom: 1px" :placeholder="$t('pleaseEnter') + $t('treeSelection.primaryNodeName')" @search="onSearch" />
+      <a-tree
+        ref="tree"
+        :checkStrictly="checkStrictly"
+        :checkable="checkable"
+        :replaceFields="replaceFields"
+        :loadedKeys="loadedKeys"
+        :class="treeScreenClass"
+        :treeData="treeData"
+        :autoExpandParent="autoExpandParent"
+        @check="onCheck"
+        @select="onSelect"
+        @expand="onExpand"
+        @loadData="loadData"
+        :expandedKeys="expandedKeys"
+        :checkedKeys="checkedKeys">
+
+        <template slot="title" slot-scope="{name}">
+          <span v-if="searchValue && name.indexOf(searchValue) > -1">
+            <span style="color: #f50">{{ name }}</span>
+          </span>
+          <span v-else>{{name}}</span>
+        </template>
+      </a-tree>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+import { getAction, postAction } from '../../api/manage'
+
+export default {
+  name: 'TreeDataSelectModal',
+  props: {
+    value: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    checkable: { // 是否多选
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    // 是否校验必选
+    checkRequired: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    // 获取数据的接口
+    optionsHref: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    // 自定义取值字段
+    replaceFields: {
+      type: Object,
+      required: false,
+      default: () => {
+        return { children: 'childPartNameList', title: 'name', key: 'id' }
+      }
+    },
+    // 标签库的限制，只能选第三级
+    isTagLibraryRestriction: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    // 查询传的字段名
+    searchFieldName: {
+      type: String,
+      required: false,
+      default: 'name'
+    },
+    // 存储字段 [key field]
+    storeField: {
+      type: String,
+      default: 'id',
+      required: false
+    },
+    // 显示字段 [label field]
+    textField: {
+      type: String,
+      default: 'name',
+      required: false
+    }
+  },
+  computed: {
+    treeScreenClass () {
+      return {
+        'my-dept-select-tree': true,
+        fullscreen: this.fullscreen
+      }
+    }
+  },
+  watch: {
+    // 是否只能选第三级
+    isTagLibraryRestriction (val) {
+      if (val) {
+        this.setOnlySelectThreeLevel(this.treeData)
+      }
+    },
+    value (val) {
+      if (val) {
+        this.checkedKeys = val.split(',')
+      }
+    }
+  },
+  data () {
+    return {
+      width: 800,
+      visible: false,
+      confirmLoading: false,
+      checkStrictly: true,
+      autoExpandParent: false, // 是否自动展开父节点
+      treeData: [],
+      expandedKeys: [],
+      checkedKeys: [],
+      checkedRows: [],
+      loadedKeys: [], // 已经加载的节点
+      searchValue: '' // 查询框内容
+    }
+  },
+  methods: {
+    show () {
+      this.visible = true
+      this.checkedRows = []
+      this.checkedKeys = []
+      this.searchValue = ''
+      this.getTreeData()
+    },
+    onCheck (checkedKeys, info) {
+      console.log('----------onCheck', checkedKeys, info)
+      if (!this.checkable) {
+        // // 不是多选
+        // const arr = checkedKeys.checked.filter(item => !this.checkedKeys.includes(item))
+        // this.checkedKeys = [...arr]
+        // this.checkedRows = (this.checkedKeys.length === 0) ? [] : [info.node.dataRef]
+      } else {
+        if (this.checkStrictly) {
+          this.checkedKeys = checkedKeys.checked
+        } else {
+          this.checkedKeys = checkedKeys
+        }
+        this.checkedRows = this.getCheckedRows(this.checkedKeys)
+      }
+    },
+    onSelect (selectedKeys, info) {
+      // 取消关联的情况下才走onSelect的逻辑
+      if (this.checkStrictly) {
+        const keys = []
+        keys.push(selectedKeys[0])
+        if (!this.checkedKeys || this.checkedKeys.length === 0 || !this.checkable) {
+          this.checkedKeys = [...keys]
+          this.checkedRows = [info.node.dataRef]
+        } else {
+          const currKey = info.node.dataRef.key
+          if (this.checkedKeys.indexOf(currKey) >= 0) {
+            this.checkedKeys = this.checkedKeys.filter(item => item !== currKey)
+          } else {
+            this.checkedKeys.push(...keys)
+          }
+        }
+        this.checkedRows = this.getCheckedRows(this.checkedKeys)
+      }
+    },
+    onExpand (expandedKeys) {
+      this.expandedKeys = expandedKeys
+    },
+    // 异步加载
+    loadData (node) {
+      if (node.dataRef.children) {
+        return
+      }
+      this.confirmLoading = true
+      const params = {}
+      // 查询条件的名称
+      params[this.searchFieldName] = this.searchValue
+      // 父节点id
+      params.pid = node.dataRef.id
+      getAction(this.optionsHref, params).then(res => {
+        if (res.success) {
+          node.childPartNameList = res.result.record
+          this.loadedKeys.push(node.id)
+        }
+      }).finally(() => {
+        this.confirmLoading = false
+      })
+    },
+    handleCancel () {
+      this.visible = false
+    },
+    close () {
+      this.visible = false
+      this.checkedKeys = []
+      this.expandedKeys = []
+      this.treeData = []
+      this.searchValue = ''
+    },
+    onSearch (value) {
+      this.searchValue = value
+      this.autoExpandParent = true
+      this.getTreeData()
+    },
+    // 设置树只能选第三级
+    setOnlySelectThreeLevel (treeData) {
+      for (const item of treeData) {
+        item.disabled = item.level + '' !== '3'
+        item.disableCheckbox = item.level + '' !== '3'
+        if (item.childPartNameList && item.childPartNameList.length > 0) {
+          this.setOnlySelectThreeLevel(item.childPartNameList)
+        }
+      }
+    },
+    getTreeData () {
+      this.confirmLoading = true
+      const params = {}
+      // 查询条件的名称
+      params[this.searchFieldName] = this.searchValue
+      // 展开的节点
+      // params.expandedKeys = this.expandedKeys.join(',')
+      getAction(this.optionsHref, params).then(res => {
+        if (res.success) {
+          this.treeData = res.result.records || res.result
+        }
+      }).finally(() => {
+        this.confirmLoading = false
+      })
+    },
+    handleOk () {
+      if (this.checkRequired && (!this.checkedKeys || this.checkedKeys.length === 0)) {
+        this.$message.warning(this.$t('selectLeastOne'))
+        return
+      }
+      if (!this.checkedKeys || this.checkedKeys.length === 0) {
+        this.$emit('ok', '')
+      } else {
+        const checkRow = this.getCheckedRows(this.checkedKeys)
+        const keyStr = this.checkedKeys.join(',')
+        this.$emit('ok', checkRow, keyStr)
+      }
+      this.close()
+    },
+    // 根据 checkedKeys 获取 rows
+    getCheckedRows (checkedKeys) {
+      const forChildren = (list, key) => {
+        for (const item of list) {
+          if (item[this.storeField] === key) {
+            return item
+          }
+          if (item[this.replaceFields.children] instanceof Array) {
+            const value = forChildren(item[this.replaceFields.children], key)
+            if (value != null) {
+              return value
+            }
+          }
+        }
+        return null
+      }
+
+      const rows = []
+      for (const key of checkedKeys) {
+        const row = forChildren(this.treeData, key)
+        if (row != null) {
+          rows.push(row)
+        }
+      }
+      return rows
+    },
+    getSelectedList (codes) {
+      const params = {
+        selectNodeCodes: codes
+      }
+      let url
+      // 涉及系统/部件
+      if (this.optionsHref === '/laws/standard/partName/') {
+        url = '/laws/standard/partName/echo'
+      } else if (this.optionsHref === '/laws/lawsLabelDatabase/queryTreeList') { // 标签库
+        url = '/laws/lawsLabelDatabase/queryByCodes'
+      }
+      if (!url) {
+        return
+      }
+      postAction(url, params).then(res => {
+        if (res.success) {
+          const nameArr = (res.result || []).map(item => item[this.text])
+          // 抛出名称
+          this.$emit('initComp', nameArr.join(','))
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.my-dept-select-tree{
+  height:350px;
+
+  &.fullscreen{
+    height: calc(100vh - 250px);
+  }
+  overflow-y: scroll;
+}
+
+</style>
diff --git a/src/components/selection/TreeDataSelection.vue b/src/components/selection/TreeDataSelection.vue
new file mode 100644
index 0000000..47e0cc7
--- /dev/null
+++ b/src/components/selection/TreeDataSelection.vue
@@ -0,0 +1,151 @@
+<template>
+  <div class="components-input-demo-presuffix">
+    <a-input @click="openModal" :placeholder="$t('pleaseSelect')" v-model="nameStr" readOnly :disabled="disabled">
+      <a-icon v-if="storeVals" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
+    </a-input>
+
+    <tree-data-select-modal
+      ref="selectModal"
+      :checkable="checkable"
+      :value="value"
+      :storeField="storeField"
+      :textField="textField"
+      :options-href="optionsHref"
+      @ok="handleOK"/>
+  </div>
+</template>
+
+<script>
+import TreeDataSelectModal from './TreeDataSelectModal'
+import { underLinetoHump } from '@/components/_util/StringUtil'
+
+export default {
+  name: 'TreeDataSelection',
+  components: { TreeDataSelectModal },
+  props: {
+    checkable: { // 是否多选
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    value: {
+      type: String,
+      required: false
+    },
+    disabled: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    // 自定义返回字段，默认返回 id
+    customReturnField: {
+      type: String,
+      default: ''
+    },
+    // 获取数据的接口
+    optionsHref: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    // 是否返回选中的对象
+    backObj: {
+      type: Boolean,
+      default: false,
+      required: false
+    },
+    // 存储字段 [key field]
+    storeField: {
+      type: String,
+      default: 'id',
+      required: false
+    },
+    // 显示字段 [label field]
+    textField: {
+      type: String,
+      default: 'name',
+      required: false
+    },
+    nameStr: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    fieldName: {
+      type: String,
+      required: false,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      visible: false,
+      confirmLoading: false,
+      storeVals: '', // [key values]
+      textVals: '' // [label values]
+    }
+  },
+  mounted () {
+    this.storeVals = this.value
+  },
+  watch: {
+    value (val) {
+      this.storeVals = val
+    }
+  },
+  methods: {
+    // 返回选中的部门信息
+    backObjInfo () {
+      if (this.backObj === true) {
+        if (this.storeVals && this.storeVals.length > 0) {
+          const arr1 = this.storeVals.split(',')
+          const arr2 = this.textVals.split(',')
+          const info = []
+          for (let i = 0; i < arr1.length; i++) {
+            info.push({
+              value: arr1[i],
+              text: arr2[i]
+            })
+          }
+          this.$emit('back', info)
+        }
+      }
+    },
+    openModal () {
+      this.$refs.selectModal.show()
+    },
+    handleOK (rows) {
+      if (!rows && rows.length <= 0) {
+        this.textVals = ''
+        this.storeVals = ''
+      } else {
+        const arr1 = []
+        const arr2 = []
+        for (const dep of rows) {
+          arr1.push(dep[this.storeField])
+          arr2.push(dep[this.textField])
+        }
+        this.storeVals = arr1.join(',')
+        this.textVals = arr2.join(',')
+      }
+      this.$emit('change', this.storeVals)
+      this.$emit('nameChange', this.textVals, this.fieldName)
+      this.backObjInfo()
+    },
+    handleEmpty () {
+      if (this.disabled) {
+        return
+      }
+      this.handleOK('')
+    }
+  },
+  model: {
+    prop: 'value',
+    event: 'change'
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

From cbd18a1244bb11b7d43a195a3d9e79ab75835985 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Tue, 6 Aug 2024 18:19:39 +0800
Subject: [PATCH 2/8] =?UTF-8?q?[update]=20=E6=A0=91=E5=BD=A2=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../selection/TreeDataSelectModal.vue         | 29 +++++++++++++++----
 .../selection/TreeDataSelection.vue           |  6 ++++
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/components/selection/TreeDataSelectModal.vue b/src/components/selection/TreeDataSelectModal.vue
index 1686455..34114de 100644
--- a/src/components/selection/TreeDataSelectModal.vue
+++ b/src/components/selection/TreeDataSelectModal.vue
@@ -9,7 +9,7 @@
     @ok="handleOk"
     @cancel="handleCancel">
 
-    <a-spin :spinning="confirmLoading">
+    <div class="modal-content">
       <a-input-search style="margin-bottom: 1px" :placeholder="$t('pleaseEnter') + $t('treeSelection.primaryNodeName')" @search="onSearch" />
       <a-tree
         ref="tree"
@@ -34,7 +34,16 @@
           <span v-else>{{name}}</span>
         </template>
       </a-tree>
-    </a-spin>
+    </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.code" class="name-div">
+        {{ item.name }}
+        <a-icon type="close" @click="handleDelete(item, index)" />
+      </div>
+    </div>
+    <a-empty v-else />
   </j-modal>
 </template>
 
@@ -97,6 +106,17 @@ export default {
       type: String,
       default: 'name',
       required: false
+    },
+    dictId: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    // 懒加载接口,默认是涉及系统/部件的懒加载接口
+    lazyLoadHref: {
+      type: String,
+      required: false,
+      default: '/laws/dictTree/getChild'
     }
   },
   computed: {
@@ -229,10 +249,7 @@ export default {
     getTreeData () {
       this.confirmLoading = true
       const params = {}
-      // 查询条件的名称
-      params[this.searchFieldName] = this.searchValue
-      // 展开的节点
-      // params.expandedKeys = this.expandedKeys.join(',')
+      params.dictId = this.dictId
       getAction(this.optionsHref, params).then(res => {
         if (res.success) {
           this.treeData = res.result.records || res.result
diff --git a/src/components/selection/TreeDataSelection.vue b/src/components/selection/TreeDataSelection.vue
index 47e0cc7..33aeb5f 100644
--- a/src/components/selection/TreeDataSelection.vue
+++ b/src/components/selection/TreeDataSelection.vue
@@ -10,6 +10,7 @@
       :value="value"
       :storeField="storeField"
       :textField="textField"
+      :dict-id="dictId"
       :options-href="optionsHref"
       @ok="handleOK"/>
   </div>
@@ -75,6 +76,11 @@ export default {
       type: String,
       required: false,
       default: ''
+    },
+    dictId: {
+      type: String,
+      required: false,
+      default: ''
     }
   },
   data () {

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

---
 .../selection/TreeDataSelectModal.vue          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/selection/TreeDataSelectModal.vue b/src/components/selection/TreeDataSelectModal.vue
index 34114de..bc60c9b 100644
--- a/src/components/selection/TreeDataSelectModal.vue
+++ b/src/components/selection/TreeDataSelectModal.vue
@@ -75,14 +75,6 @@ export default {
       required: false,
       default: ''
     },
-    // 自定义取值字段
-    replaceFields: {
-      type: Object,
-      required: false,
-      default: () => {
-        return { children: 'childPartNameList', title: 'name', key: 'id' }
-      }
-    },
     // 标签库的限制，只能选第三级
     isTagLibraryRestriction: {
       type: Boolean,
@@ -140,6 +132,13 @@ export default {
       }
     }
   },
+  mounted () {
+    if (this.optionsHref === '/laws/standard/partName/') {
+      this.replaceFields = { children: 'childPartNameList', title: 'name', key: 'id' }
+    } else { // 标签库
+      this.replaceFields = { children: 'childrenList', title: 'itemText', key: 'id' }
+    }
+  },
   data () {
     return {
       width: 800,
@@ -152,7 +151,8 @@ export default {
       checkedKeys: [],
       checkedRows: [],
       loadedKeys: [], // 已经加载的节点
-      searchValue: '' // 查询框内容
+      searchValue: '', // 查询框内容
+      replaceFields: {}
     }
   },
   methods: {

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

---
 .../selection/TreeDataSelectModal.vue         | 72 +++++++++++--------
 1 file changed, 43 insertions(+), 29 deletions(-)

diff --git a/src/components/selection/TreeDataSelectModal.vue b/src/components/selection/TreeDataSelectModal.vue
index bc60c9b..6fe763a 100644
--- a/src/components/selection/TreeDataSelectModal.vue
+++ b/src/components/selection/TreeDataSelectModal.vue
@@ -23,15 +23,15 @@
         @check="onCheck"
         @select="onSelect"
         @expand="onExpand"
-        @loadData="loadData"
+        :loadData="loadData"
         :expandedKeys="expandedKeys"
         :checkedKeys="checkedKeys">
 
-        <template slot="title" slot-scope="{name}">
-          <span v-if="searchValue && name.indexOf(searchValue) > -1">
-            <span style="color: #f50">{{ name }}</span>
+        <template slot="title" slot-scope="{dataRef}">
+          <span v-if="searchValue && dataRef[replaceFields.title].indexOf(searchValue) > -1">
+            <span style="color: #f50">{{ dataRef[replaceFields.title] }}</span>
           </span>
-          <span v-else>{{name}}</span>
+          <span v-else>{{ dataRef[replaceFields.title] }}</span>
         </template>
       </a-tree>
     </div>
@@ -81,12 +81,6 @@ export default {
       required: false,
       default: false
     },
-    // 查询传的字段名
-    searchFieldName: {
-      type: String,
-      required: false,
-      default: 'name'
-    },
     // 存储字段 [key field]
     storeField: {
       type: String,
@@ -103,12 +97,6 @@ export default {
       type: String,
       required: false,
       default: ''
-    },
-    // 懒加载接口,默认是涉及系统/部件的懒加载接口
-    lazyLoadHref: {
-      type: String,
-      required: false,
-      default: '/laws/dictTree/getChild'
     }
   },
   computed: {
@@ -130,13 +118,24 @@ export default {
       if (val) {
         this.checkedKeys = val.split(',')
       }
-    }
-  },
-  mounted () {
-    if (this.optionsHref === '/laws/standard/partName/') {
-      this.replaceFields = { children: 'childPartNameList', title: 'name', key: 'id' }
-    } else { // 标签库
-      this.replaceFields = { children: 'childrenList', title: 'itemText', key: 'id' }
+    },
+    optionsHref: {
+      immediate: true,
+      handler (val) {
+        console.log('-------------optionsHref', val)
+        if (val === '/laws/standard/partName/') {
+          // 是涉及系统/部件
+          this.replaceFields = { children: 'childPartNameList', title: 'name', key: 'id' }
+          this.lazyLoadHref = ''
+          this.searchFieldName = 'name'
+          this.lazyLoadPidFieldName = ''
+        } else { // 标签库
+          this.replaceFields = { children: 'childrenList', title: 'itemText', key: 'id' }
+          this.lazyLoadHref = '/laws/dictTree/getChild'
+          this.searchFieldName = 'nodeName'
+          this.lazyLoadPidFieldName = 'dictItemId'
+        }
+      }
     }
   },
   data () {
@@ -152,7 +151,11 @@ export default {
       checkedRows: [],
       loadedKeys: [], // 已经加载的节点
       searchValue: '', // 查询框内容
-      replaceFields: {}
+      replaceFields: {},
+      dataSourceRight: [],
+      lazyLoadHref: '', // 懒加载接口
+      searchFieldName: '', // 查询传的字段名
+      lazyLoadPidFieldName: '' // 懒加载传父级的字段名
     }
   },
   methods: {
@@ -203,18 +206,22 @@ export default {
     },
     // 异步加载
     loadData (node) {
+      console.log('-------node', node)
       if (node.dataRef.children) {
         return
       }
       this.confirmLoading = true
       const params = {}
+      params.dictId = this.dictId
       // 查询条件的名称
-      params[this.searchFieldName] = this.searchValue
+      if (this.searchValue) {
+        params[this.searchFieldName] = this.searchValue
+      }
       // 父节点id
-      params.pid = node.dataRef.id
-      getAction(this.optionsHref, params).then(res => {
+      params.dictItemId = node.dataRef.id
+      getAction(this.lazyLoadHref, params).then(res => {
         if (res.success) {
-          node.childPartNameList = res.result.record
+          node[this.replaceFields.children] = res.result.record
           this.loadedKeys.push(node.id)
         }
       }).finally(() => {
@@ -228,6 +235,7 @@ export default {
       this.visible = false
       this.checkedKeys = []
       this.expandedKeys = []
+      this.dataSourceRight = []
       this.treeData = []
       this.searchValue = ''
     },
@@ -334,4 +342,10 @@ export default {
   overflow-y: scroll;
 }
 
+.modal-content-title {
+  color: #1D2129;
+  font-weight: 500;
+  margin-right: 12px;
+  margin-bottom: 0;
+}
 </style>

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

---
 src/components/customField/AddForm.vue        |   2 +-
 .../selection/TreeDataSelectModal.vue         | 322 +++++++++++++-----
 .../selection/TreeDataSelection.vue           | 101 ++----
 3 files changed, 259 insertions(+), 166 deletions(-)

diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue
index d143133..025a698 100644
--- a/src/components/customField/AddForm.vue
+++ b/src/components/customField/AddForm.vue
@@ -149,7 +149,7 @@
                                      :fieldName="item.dbFieldName"
                                      :nameStr="formInline[item.dbFieldName + '_dictText']"
                                      @nameChange="treeDataSelectNameChange"
-                                     :optionsHref="item.fieldHref"
+                                     :optionsHref="item.treeFirstHref"
                                      :dict-id="item.dictId"/>
               </a-form-model-item>
             </div>
diff --git a/src/components/selection/TreeDataSelectModal.vue b/src/components/selection/TreeDataSelectModal.vue
index 6fe763a..34abbdd 100644
--- a/src/components/selection/TreeDataSelectModal.vue
+++ b/src/components/selection/TreeDataSelectModal.vue
@@ -13,10 +13,9 @@
       <a-input-search style="margin-bottom: 1px" :placeholder="$t('pleaseEnter') + $t('treeSelection.primaryNodeName')" @search="onSearch" />
       <a-tree
         ref="tree"
-        :checkStrictly="checkStrictly"
         :checkable="checkable"
+        :checkStrictly="true"
         :replaceFields="replaceFields"
-        :loadedKeys="loadedKeys"
         :class="treeScreenClass"
         :treeData="treeData"
         :autoExpandParent="autoExpandParent"
@@ -25,7 +24,8 @@
         @expand="onExpand"
         :loadData="loadData"
         :expandedKeys="expandedKeys"
-        :checkedKeys="checkedKeys">
+        :checkedKeys="checkedKeys"
+        :selectedKeys.sync="selectedKeys">
 
         <template slot="title" slot-scope="{dataRef}">
           <span v-if="searchValue && dataRef[replaceFields.title].indexOf(searchValue) > -1">
@@ -38,12 +38,29 @@
 
     <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.code" class="name-div">
-        {{ item.name }}
+      <div v-for="(item, index) in dataSourceRight" :key="item[replaceFields.key]" class="name-div">
+        {{ item[replaceFields.title] }}
         <a-icon type="close" @click="handleDelete(item, index)" />
       </div>
     </div>
     <a-empty v-else />
+
+    <!--底部父子关联操作和确认取消按钮-->
+    <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-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>
+    </template>
   </j-modal>
 </template>
 
@@ -61,7 +78,7 @@ export default {
     checkable: { // 是否多选
       type: Boolean,
       required: false,
-      default: true
+      default: false
     },
     // 是否校验必选
     checkRequired: {
@@ -81,22 +98,15 @@ export default {
       required: false,
       default: false
     },
-    // 存储字段 [key field]
-    storeField: {
-      type: String,
-      default: 'id',
-      required: false
-    },
-    // 显示字段 [label field]
-    textField: {
-      type: String,
-      default: 'name',
-      required: false
-    },
     dictId: {
       type: String,
       required: false,
       default: ''
+    },
+    treeOpera: { // 是否可以切换父子关联
+      type: Boolean,
+      required: false,
+      default: true
     }
   },
   computed: {
@@ -105,6 +115,9 @@ export default {
         'my-dept-select-tree': true,
         fullscreen: this.fullscreen
       }
+    },
+    treeOperationText () {
+      return this.parentChildRelate ? this.$t('parentChildConnection') : this.$t('cancelConnection')
     }
   },
   watch: {
@@ -126,9 +139,9 @@ export default {
         if (val === '/laws/standard/partName/') {
           // 是涉及系统/部件
           this.replaceFields = { children: 'childPartNameList', title: 'name', key: 'id' }
-          this.lazyLoadHref = ''
-          this.searchFieldName = 'name'
-          this.lazyLoadPidFieldName = ''
+          this.lazyLoadHref = '/laws/standard/partName/getChild'
+          this.searchFieldName = 'nodeName'
+          this.lazyLoadPidFieldName = 'dictItemId'
         } else { // 标签库
           this.replaceFields = { children: 'childrenList', title: 'itemText', key: 'id' }
           this.lazyLoadHref = '/laws/dictTree/getChild'
@@ -138,18 +151,23 @@ export default {
       }
     }
   },
+  created () {
+    // if (this.treeOpera) {
+    //   this.switchCheckStrictly(1)
+    // }
+  },
   data () {
     return {
       width: 800,
       visible: false,
       confirmLoading: false,
-      checkStrictly: true,
+      parentChildRelate: false, // 父子节点是否关联
       autoExpandParent: false, // 是否自动展开父节点
       treeData: [],
       expandedKeys: [],
       checkedKeys: [],
       checkedRows: [],
-      loadedKeys: [], // 已经加载的节点
+      selectedKeys: [],
       searchValue: '', // 查询框内容
       replaceFields: {},
       dataSourceRight: [],
@@ -163,50 +181,145 @@ export default {
       this.visible = true
       this.checkedRows = []
       this.checkedKeys = []
+      this.selectedKeys = []
       this.searchValue = ''
       this.getTreeData()
+      if (this.value) {
+        if (this.checkable) {
+          this.checkedKeys = this.value.split(',')
+        } else {
+          this.selectedKeys = this.value.split(',')
+        }
+        // 初始化选中数据列表
+        this.getSelectedList(this.value)
+      }
     },
     onCheck (checkedKeys, info) {
-      console.log('----------onCheck', checkedKeys, info)
-      if (!this.checkable) {
-        // // 不是多选
-        // const arr = checkedKeys.checked.filter(item => !this.checkedKeys.includes(item))
-        // this.checkedKeys = [...arr]
-        // this.checkedRows = (this.checkedKeys.length === 0) ? [] : [info.node.dataRef]
-      } else {
-        if (this.checkStrictly) {
-          this.checkedKeys = checkedKeys.checked
+      console.log('----------onCheck', checkedKeys)
+      console.log('----------info.checked', info.checked)
+      console.log('----------info.node', info.node.dataRef)
+      if (this.checkable) {
+        // 是多选
+        if (this.parentChildRelate) {
+          // 是父子关联
+          if (info.checked) {
+            // 是选中数据了
+            let childrenList = []
+            if (info.node.dataRef[this.replaceFields.children]) {
+              // 有子节点获取子节点数据
+              childrenList = info.node.dataRef[this.replaceFields.children].map(item => item[this.replaceFields.key])
+            }
+            this.checkedKeys = [...this.checkedKeys, ...checkedKeys.checked, ...childrenList]
+          } else {
+            // 是取消选中了，把当前和子节点都取消选中
+            let currAndChildNode = []
+            if (info.node.dataRef[this.replaceFields.children]) {
+              // 有子节点获取子节点数据
+              const childrenNode = info.node.dataRef[this.replaceFields.children].map(item => item[this.replaceFields.key])
+              currAndChildNode = [...childrenNode, info.node.dataRef[this.replaceFields.key]]
+            } else {
+              currAndChildNode = [info.node.dataRef[this.replaceFields.key]]
+            }
+            this.checkedKeys = this.checkedKeys.filter(item => !currAndChildNode.includes(item))
+          }
+          // 处理下方显示已选数据
+          if (info.checked) {
+            console.log('------------增加了数据')
+            // 说明是增加了数据,把点击的数据和子数据追加进去
+            for (const key of checkedKeys.checked) {
+              // 当前选中没在选中列表中的加进去
+              if (!this.dataSourceRight.find(item => item[this.replaceFields.key] === key)) {
+                // 右侧不存在，追加到右侧表格
+                this.dataSourceRight.push(info.node.dataRef)
+              }
+            }
+            if (info.node.dataRef[this.replaceFields.children]) {
+              // 有子集追加
+              for (const keyItem of info.node.dataRef[this.replaceFields.children]) {
+                // 当前选中的子集没在列表中的加进去
+                if (!this.dataSourceRight.find(item => item[this.replaceFields.key] === keyItem[this.replaceFields.key])) {
+                  // 右侧不存在，追加到右侧表格
+                  this.dataSourceRight.push(keyItem)
+                }
+              }
+            }
+          } else {
+            console.log('----------删除了数据')
+            // 说明是删除了数据
+            if (this.checkedKeys && this.checkedKeys.length > 0) {
+              // 还有选中数据，从dataSourceRight里面找到点击的数据和他的子数据清空
+              for (let i = 0; i < this.dataSourceRight.length; i++) {
+                if (!this.checkedKeys.find(item => item === this.dataSourceRight[i][this.replaceFields.key])) {
+                  // 表格选中中没有找到这一条数据，说明已经被删了
+                  this.dataSourceRight.splice(i, 1)
+                  i--
+                }
+              }
+            } else {
+              // 已经没有选中数据了，直接清空展示数据
+              this.dataSourceRight = []
+            }
+          }
         } else {
-          this.checkedKeys = checkedKeys
+          // 不是父子关联
+          console.log('-----------checkedKeys', this.checkedKeys, checkedKeys)
+          if (info.checked) {
+            // 是选中数据了
+            this.checkedKeys = [...this.checkedKeys, ...checkedKeys.checked]
+          } else {
+            // 是取消选中了
+            this.checkedKeys = this.checkedKeys.filter(item => item !== info.node.dataRef[this.replaceFields.key])
+          }
+          // 处理下方显示已选数据
+          if (info.checked) {
+            console.log('------------不父子关联增加了数据')
+            // 说明是增加了数据,把点击的数据追加进去
+            for (const key of checkedKeys.checked) {
+              // 当前选中没在选中列表中的加进去
+              if (!this.dataSourceRight.find(item => item[this.replaceFields.key] === key)) {
+                // 右侧不存在，追加到右侧表格
+                this.dataSourceRight.push(info.node.dataRef)
+              }
+            }
+          } else {
+            console.log('----------不父子关联删除了数据')
+            // 说明是删除了数据
+            if (this.checkedKeys && this.checkedKeys.length > 0) {
+              // 还有选中数据，从dataSourceRight里面找到点击的数据和他的子数据清空
+              for (let i = 0; i < this.dataSourceRight.length; i++) {
+                if (!this.checkedKeys.find(item => item === this.dataSourceRight[i][this.replaceFields.key])) {
+                  // 表格选中中没有找到这一条数据，说明已经被删了
+                  this.dataSourceRight.splice(i, 1)
+                  i--
+                }
+              }
+            } else {
+              // 已经没有选中数据了，直接清空展示数据
+              this.dataSourceRight = []
+            }
+          }
         }
-        this.checkedRows = this.getCheckedRows(this.checkedKeys)
       }
     },
     onSelect (selectedKeys, info) {
       // 取消关联的情况下才走onSelect的逻辑
-      if (this.checkStrictly) {
-        const keys = []
-        keys.push(selectedKeys[0])
-        if (!this.checkedKeys || this.checkedKeys.length === 0 || !this.checkable) {
-          this.checkedKeys = [...keys]
-          this.checkedRows = [info.node.dataRef]
+      if (!this.parentChildRelate) {
+        if (selectedKeys && selectedKeys.length > 0) {
+          // 说明是选中了数据
+          this.selectedKeys = [...selectedKeys]
+          this.dataSourceRight = [info.node.dataRef]
         } else {
-          const currKey = info.node.dataRef.key
-          if (this.checkedKeys.indexOf(currKey) >= 0) {
-            this.checkedKeys = this.checkedKeys.filter(item => item !== currKey)
-          } else {
-            this.checkedKeys.push(...keys)
-          }
+          // 没有数据，直接清空
+          this.selectedKeys = []
+          this.dataSourceRight = []
         }
-        this.checkedRows = this.getCheckedRows(this.checkedKeys)
       }
     },
     onExpand (expandedKeys) {
       this.expandedKeys = expandedKeys
     },
     // 异步加载
-    loadData (node) {
-      console.log('-------node', node)
+    async loadData (node) {
       if (node.dataRef.children) {
         return
       }
@@ -219,10 +332,9 @@ export default {
       }
       // 父节点id
       params.dictItemId = node.dataRef.id
-      getAction(this.lazyLoadHref, params).then(res => {
+      await getAction(this.lazyLoadHref, params).then(res => {
         if (res.success) {
-          node[this.replaceFields.children] = res.result.record
-          this.loadedKeys.push(node.id)
+          node.dataRef[this.replaceFields.children] = res.result.record || res.result
         }
       }).finally(() => {
         this.confirmLoading = false
@@ -254,6 +366,16 @@ export default {
         }
       }
     },
+    // 切换父子关联
+    switchCheckStrictly (v) {
+      if (v === 1) {
+        // 取消父子关联
+        this.parentChildRelate = false
+      } else if (v === 2) {
+        // 增加父子关联
+        this.parentChildRelate = true
+      }
+    },
     getTreeData () {
       this.confirmLoading = true
       const params = {}
@@ -266,65 +388,46 @@ export default {
         this.confirmLoading = false
       })
     },
+    // 已选数据列表的删除
+    handleDelete (record, index) {
+      this.dataSourceRight.splice(index, 1)
+      if (this.checkable) {
+        // 多选从checkedKeys里面筛选出去
+        this.checkedKeys = this.checkedKeys.filter(item => item !== record[this.replaceFields.key])
+      } else {
+        // 单选从selectedKeys里面筛选出去
+        this.selectedKeys = this.selectedKeys.filter(item => item !== record[this.replaceFields.key])
+      }
+    },
     handleOk () {
       if (this.checkRequired && (!this.checkedKeys || this.checkedKeys.length === 0)) {
         this.$message.warning(this.$t('selectLeastOne'))
         return
       }
-      if (!this.checkedKeys || this.checkedKeys.length === 0) {
-        this.$emit('ok', '')
-      } else {
-        const checkRow = this.getCheckedRows(this.checkedKeys)
-        const keyStr = this.checkedKeys.join(',')
-        this.$emit('ok', checkRow, keyStr)
-      }
+      this.$emit('nameChange', this.dataSourceRight.map(item => item[this.replaceFields.title]).join(','))
+      this.$emit('change', this.dataSourceRight.map(item => item[this.replaceFields.key]).join(','))
+      this.$emit('listChange', this.dataSourceRight)
       this.close()
     },
-    // 根据 checkedKeys 获取 rows
-    getCheckedRows (checkedKeys) {
-      const forChildren = (list, key) => {
-        for (const item of list) {
-          if (item[this.storeField] === key) {
-            return item
-          }
-          if (item[this.replaceFields.children] instanceof Array) {
-            const value = forChildren(item[this.replaceFields.children], key)
-            if (value != null) {
-              return value
-            }
-          }
-        }
-        return null
-      }
-
-      const rows = []
-      for (const key of checkedKeys) {
-        const row = forChildren(this.treeData, key)
-        if (row != null) {
-          rows.push(row)
-        }
-      }
-      return rows
-    },
     getSelectedList (codes) {
       const params = {
-        selectNodeCodes: codes
+        selectNodeCodes: codes,
+        dictId: this.dictId
       }
       let url
       // 涉及系统/部件
       if (this.optionsHref === '/laws/standard/partName/') {
         url = '/laws/standard/partName/echo'
-      } else if (this.optionsHref === '/laws/lawsLabelDatabase/queryTreeList') { // 标签库
-        url = '/laws/lawsLabelDatabase/queryByCodes'
+      } else { // 标签库
+        // url = '/laws/lawsLabelDatabase/queryByCodes'
+        url = '/laws/standard/partName/echo'
       }
       if (!url) {
         return
       }
       postAction(url, params).then(res => {
         if (res.success) {
-          const nameArr = (res.result || []).map(item => item[this.text])
-          // 抛出名称
-          this.$emit('initComp', nameArr.join(','))
+          this.dataSourceRight = JSON.parse(JSON.stringify(res.result))
         }
       })
     }
@@ -333,6 +436,9 @@ export default {
 </script>
 
 <style scoped lang="less">
+/deep/ .ant-modal-content {
+  padding-bottom: 18px;
+}
 .my-dept-select-tree{
   height:350px;
 
@@ -347,5 +453,39 @@ export default {
   font-weight: 500;
   margin-right: 12px;
   margin-bottom: 0;
+  margin-top: 16px;
+}
+
+.drawer-bootom-button {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  border-top: 1px solid #e8e8e8;
+  padding: 10px 16px;
+  text-align: right;
+  left: 0;
+  background: #fff;
+  border-radius: 0 0 2px 2px;
+}
+
+.name-content {
+  display: flex;
+  flex-wrap: wrap;
+  max-height: 200px;
+  overflow-y: auto;
+  .name-div {
+    width: auto;
+    padding: 5px 16px;
+    margin-right: 12px;
+    margin-top: 8px;
+    background: rgba(0, 100, 250, 0.08);
+    border-radius: 4px 4px 4px 4px;
+    opacity: 1;
+    color: @primary-color;
+    white-space: nowrap;
+    /deep/ .anticon {
+      margin-left: 4px;
+    }
+  }
 }
 </style>
diff --git a/src/components/selection/TreeDataSelection.vue b/src/components/selection/TreeDataSelection.vue
index 33aeb5f..d0bdd22 100644
--- a/src/components/selection/TreeDataSelection.vue
+++ b/src/components/selection/TreeDataSelection.vue
@@ -1,18 +1,19 @@
 <template>
   <div class="components-input-demo-presuffix">
-    <a-input @click="openModal" :placeholder="$t('pleaseSelect')" v-model="nameStr" readOnly :disabled="disabled">
-      <a-icon v-if="storeVals" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
+    <a-input @click="openModal" :placeholder="$t('pleaseSelect')" v-model="nameStr" :title="nameStr" readOnly>
+      <a-icon v-if="nameStr" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
     </a-input>
 
     <tree-data-select-modal
       ref="selectModal"
       :checkable="checkable"
       :value="value"
-      :storeField="storeField"
-      :textField="textField"
       :dict-id="dictId"
+      v-bind="$attrs"
       :options-href="optionsHref"
-      @ok="handleOK"/>
+      @change="handleChange"
+      @nameChange="nameChange"
+      @listChange="listChange"/>
   </div>
 </template>
 
@@ -38,35 +39,13 @@ export default {
       required: false,
       default: false
     },
-    // 自定义返回字段，默认返回 id
-    customReturnField: {
-      type: String,
-      default: ''
-    },
     // 获取数据的接口
     optionsHref: {
       type: String,
       required: false,
       default: ''
     },
-    // 是否返回选中的对象
-    backObj: {
-      type: Boolean,
-      default: false,
-      required: false
-    },
-    // 存储字段 [key field]
-    storeField: {
-      type: String,
-      default: 'id',
-      required: false
-    },
-    // 显示字段 [label field]
-    textField: {
-      type: String,
-      default: 'name',
-      required: false
-    },
+    // 名称字符串
     nameStr: {
       type: String,
       required: false,
@@ -83,66 +62,40 @@ export default {
       default: ''
     }
   },
+  watch: {
+    nameStr: {
+      immediate: true,
+      handler (val) {
+        console.log('----------nameStr', val)
+      }
+    }
+  },
   data () {
     return {
       visible: false,
-      confirmLoading: false,
-      storeVals: '', // [key values]
-      textVals: '' // [label values]
-    }
-  },
-  mounted () {
-    this.storeVals = this.value
-  },
-  watch: {
-    value (val) {
-      this.storeVals = val
+      confirmLoading: false
     }
   },
   methods: {
-    // 返回选中的部门信息
-    backObjInfo () {
-      if (this.backObj === true) {
-        if (this.storeVals && this.storeVals.length > 0) {
-          const arr1 = this.storeVals.split(',')
-          const arr2 = this.textVals.split(',')
-          const info = []
-          for (let i = 0; i < arr1.length; i++) {
-            info.push({
-              value: arr1[i],
-              text: arr2[i]
-            })
-          }
-          this.$emit('back', info)
-        }
-      }
-    },
     openModal () {
       this.$refs.selectModal.show()
     },
-    handleOK (rows) {
-      if (!rows && rows.length <= 0) {
-        this.textVals = ''
-        this.storeVals = ''
-      } else {
-        const arr1 = []
-        const arr2 = []
-        for (const dep of rows) {
-          arr1.push(dep[this.storeField])
-          arr2.push(dep[this.textField])
-        }
-        this.storeVals = arr1.join(',')
-        this.textVals = arr2.join(',')
-      }
-      this.$emit('change', this.storeVals)
-      this.$emit('nameChange', this.textVals, this.fieldName)
-      this.backObjInfo()
+    handleChange (value) {
+      this.$emit('change', value, this.fieldName)
+    },
+    nameChange (value) {
+      this.$emit('nameChange', value, this.fieldName)
+    },
+    listChange (value) {
+      this.$emit('listChange', value, this.fieldName)
     },
     handleEmpty () {
       if (this.disabled) {
         return
       }
-      this.handleOK('')
+      this.handleChange('')
+      this.nameChange('')
+      this.listChange([])
     }
   },
   model: {

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

---
 src/components/selection/TreeDataSelectModal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/selection/TreeDataSelectModal.vue b/src/components/selection/TreeDataSelectModal.vue
index 34abbdd..ae1a996 100644
--- a/src/components/selection/TreeDataSelectModal.vue
+++ b/src/components/selection/TreeDataSelectModal.vue
@@ -136,7 +136,7 @@ export default {
       immediate: true,
       handler (val) {
         console.log('-------------optionsHref', val)
-        if (val === '/laws/standard/partName/') {
+        if (val === '/laws/standard/partName/queryFirstList') {
           // 是涉及系统/部件
           this.replaceFields = { children: 'childPartNameList', title: 'name', key: 'id' }
           this.lazyLoadHref = '/laws/standard/partName/getChild'
@@ -416,7 +416,7 @@ export default {
       }
       let url
       // 涉及系统/部件
-      if (this.optionsHref === '/laws/standard/partName/') {
+      if (this.optionsHref === '/laws/standard/partName/queryFirstList') {
         url = '/laws/standard/partName/echo'
       } else { // 标签库
         // url = '/laws/lawsLabelDatabase/queryByCodes'

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 7/8] =?UTF-8?q?[update]=20=E6=A0=91=E5=BD=A2=E5=BC=B9?=
 =?UTF-8?q?=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',

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

---
 .../selection/TreeDataSelection.vue           | 44 +++++++++++++++++--
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/components/selection/TreeDataSelection.vue b/src/components/selection/TreeDataSelection.vue
index b83d381..bca415a 100644
--- a/src/components/selection/TreeDataSelection.vue
+++ b/src/components/selection/TreeDataSelection.vue
@@ -1,8 +1,13 @@
 <template>
   <div class="components-input-demo-presuffix">
-    <a-input @click="openModal" :placeholder="$t('pleaseSelect')" v-model="nameStr" :title="nameStr" readOnly>
-      <a-icon v-if="nameStr" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
-    </a-input>
+    <div class="user-organ-wrap">
+      <a-input class="user-input" @click="openModal" :placeholder="placeholder" v-model="nameStr" :title="nameStr" readOnly>
+        <a-icon v-if="nameStr" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
+      </a-input>
+      <a-button type="primary" class="button-box" @click="openModal" :disabled="disabled" v-if="showBtn && !disabled">
+        {{ $t('select') }}
+      </a-button>
+    </div>
 
     <tree-data-select-modal
       ref="selectModal"
@@ -59,6 +64,15 @@ export default {
       type: String,
       required: false,
       default: ''
+    },
+    showBtn: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    placeholder: {
+      type: String,
+      default: ''
     }
   },
   watch: {
@@ -104,6 +118,28 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
+.user-organ-wrap {
+  width: 100%;
+  position: relative;
+  display: flex;
+  align-items: center;
+  //height: 39.98px;
 
+  .user-input {
+    resize: none;
+    width: calc(100% - 70px);
+  }
+
+  // 因为需要加title，所以不能把鼠标事件去掉
+  /deep/ .ant-input-disabled {
+    background: #fff;
+    color: rgba(0, 0, 0, 0.65);
+    cursor: default;
+  }
+
+  .button-box {
+    margin-left: 5px;
+  }
+}
 </style>