From 5151f0d3367631f66f41d27d6112a9badb9dfb35 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 31 Mar 2022 12:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/libraryPush/index.vue | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/components/libraryPush/index.vue b/jero-web/src/components/libraryPush/index.vue
index 8c530226c..cf9fa5b9c 100644
--- a/jero-web/src/components/libraryPush/index.vue
+++ b/jero-web/src/components/libraryPush/index.vue
@@ -10,7 +10,10 @@
       :visible="visible"
       style="height: 100%;overflow: auto;padding-bottom: 53px;">
       <a-spin :spinning="confirmLoading">
-        <a-input-search style="margin-bottom: 8px" v-model="searchModel" :placeholder="$t('NodeQuickLookup')" @change="onChange"/>
+        <a-input-search style="margin-bottom: 8px" v-model="searchModel"
+                        @search="onSearch"
+                        allowClear
+                        :placeholder="$t('NodeQuickLookup')"/>
         <div class="drawer-content">
           <a-tree
             v-if="visibleTree"
@@ -49,7 +52,7 @@
     data() {
       return {
         gData: [],
-        searchModel:"",
+        searchModel: '',
         autoExpandParent: true,
         expandedKeys: [],
         visible: false,
@@ -81,11 +84,13 @@
         this.selectedKey = selectedKeys
       },
       onExpand(selectedKeys, val) {
-        if (val.expanded) {
-          if (this.departId == val.node.value) {
-          } else {
-            this.departId = val.node.value
-            this.queryDepartUserTreeList()
+        if (this.searchModel != '') {
+          if (val.expanded) {
+            if (this.departId == val.node.value) {
+            } else {
+              this.departId = val.node.value
+              this.queryDepartUserTreeList()
+            }
           }
         }
       },
@@ -93,7 +98,6 @@
         this.visible = false
         this.visibleTree = false
       },
-      //String departIds,String userIds,String documentIds
       handleSubmit() {
         let query = {
           documentIds: this.tableKey.join(','),
@@ -117,8 +121,22 @@
           }
         })
       },
-      onChange(e) {
-        const value = e.target.value
+      onSearch(e) {
+        console.log(e)
+        if (e) {
+          this.getUserAndDepart()
+        } else {
+          this.queryDepartUserTreeList()
+        }
+      },
+      getUserAndDepart() {
+        getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => {
+          if (res.success) {
+            this.gData = res || []
+          } else {
+            this.gData = []
+          }
+        })
       },
       queryDepartUserTreeList() {
         let gData = JSON.parse(JSON.stringify(this.gData))