From 28c8ad2c0d6e54a65382d5fb8a0eb5191f58cec5 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 7 Aug 2024 11:17:08 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20Search=E7=BB=84=E4=BB=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=91=E5=BD=A2=E5=BC=B9=E6=A1=86=EF=BC=88=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=B8=A6=E5=87=BA=E6=89=80=E6=9C=89=E5=AD=90=E7=BA=A7?=
 =?UTF-8?q?=EF=BC=89=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/customField/Search.vue | 33 ++++++++++++++++++++++++++-
 src/enums/commonEnums.js              |  3 ++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/components/customField/Search.vue b/src/components/customField/Search.vue
index 971b659..04962af 100644
--- a/src/components/customField/Search.vue
+++ b/src/components/customField/Search.vue
@@ -141,6 +141,22 @@
               :getPopupContainer="triggerNode=> triggerNode.parentNode"
               :tree-data="optionsData[item.dbFieldName]"
               :replaceFields="{key: 'id', value: 'id', title: 'name', children: 'childPartNameList'}"
+              show-search
+              allowClear
+              :filterTreeNode="filterTreeOption"
+              :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+            />
+          </a-form-item>
+        </template>
+        <!-- 树形弹框(带出所有子级) -->
+        <template v-if="item.fieldShowType === FieldType.TREE_MODAL_SELECT_SEARCH_CHILD.value">
+          <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-tree-select
+              tree-node-filter-prop="title"
+              v-model="queryParam[item.dbFieldName]"
+              :maxTagCount="1"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              :tree-data="optionsData[item.dbFieldName]"
               tree-checkable
               treeCheckStrictly
               show-search
@@ -281,10 +297,25 @@
               <a-tree-select
                 tree-node-filter-prop="title"
                 v-model="queryParam[item.dbFieldName]"
-                :maxTagCount="1"
                 :getPopupContainer="triggerNode=> triggerNode.parentNode"
                 :tree-data="optionsData[item.dbFieldName]"
                 :replaceFields="{key: 'id', value: 'id', title: 'name', children: 'childPartNameList'}"
+                show-search
+                allowClear
+                :filterTreeNode="filterTreeOption"
+                :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
+              />
+            </a-form-item>
+          </template>
+          <!-- 树形弹框(带出所有子级) -->
+          <template v-if="item.fieldShowType === FieldType.TREE_MODAL_SELECT_SEARCH_CHILD.value">
+            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-tree-select
+                tree-node-filter-prop="title"
+                v-model="queryParam[item.dbFieldName]"
+                :maxTagCount="1"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                :tree-data="optionsData[item.dbFieldName]"
                 tree-checkable
                 treeCheckStrictly
                 show-search
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index e112017..c599f61 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -29,7 +29,8 @@ export const FieldType = {
   YEAR_PICKER: { text: '年份选择', value: '14' },
   TREE_SINGLE: { text: '树形结构（单选）', value: '15' },
   TREE_MODAL_SELECT: { text: '树形弹框', value: '16' },
-  TREE_MODAL_SELECT_SEARCH_DIFF: { text: '树形弹框（带出子集和单线父级）', value: '17' }
+  TREE_MODAL_SELECT_SEARCH_DIFF: { text: '树形弹框（查询带出子集和单线父级）', value: '17' },
+  TREE_MODAL_SELECT_SEARCH_CHILD: { text: '树形弹框（查询带出所有子级）', value: '18' }
 }
 
 export const TagsTypeEnums = new EsEnums({