From c12aa0538a27745a240e5ae7e68e321827e1b5de Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 24 Mar 2022 12:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E5=BA=93?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=9A=84=E4=BA=BA=E5=91=98=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/libraryPush/index.vue | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/components/libraryPush/index.vue b/jero-web/src/components/libraryPush/index.vue
index 37bcd3bdd..217c3a3b8 100644
--- a/jero-web/src/components/libraryPush/index.vue
+++ b/jero-web/src/components/libraryPush/index.vue
@@ -13,9 +13,10 @@
         <a-input-search style="margin-bottom: 8px" placeholder="Search" @change="onChange"/>
         <div class="drawer-content">
           <a-tree
-            v-if="visible"
+            v-if="visibleTree"
             style="margin-bottom: 60px;height: 600px"
             checkable
+            :autoExpandParent="false"
             :tree-data="gData"
             @select="onSelect"
             @check="checkChange"
@@ -27,7 +28,7 @@
       </a-spin>
       <div class="drawer-bootom-button">
         <a-button @click="handleCancel" type="danger" style="margin-right: 16px">{{$t('cancel')}}</a-button>
-        <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+        <a-button @click="handleSubmit" type="primary" :loading="submitLoading">{{$t('submit')}}</a-button>
       </div>
     </a-drawer>
   </div>
@@ -56,7 +57,9 @@
         tableKey: [],
         userIds: [],
         departId: '',
-        defaultExpandedKeys:[],
+        defaultExpandedKeys: [],
+        submitLoading: false,
+        visibleTree:false,
       }
     },
     mounted() {
@@ -66,6 +69,7 @@
       getPush(data) {
         this.tableKey = data
         this.visible = true
+        this.visibleTree = true
         this.departId = ''
         this.queryDepartUserTreeList()
       },
@@ -83,6 +87,7 @@
       },
       handleCancel() {
         this.visible = false
+        this.visibleTree = false
       },
       //String departIds,String userIds,String documentIds
       handleSubmit() {
@@ -91,13 +96,16 @@
           userIds: this.userIds.join(','),
           departIds: this.userIds.join(',')
         }
+        this.submitLoading = true
         this.confirmLoading = true
         getAction(this.url.pullMessage, query).then((res) => {
           this.confirmLoading = false
+          this.submitLoading = false
           if (res.success) {
             this.$message.success(res.message)
             this.userIds = []
             this.visible = false
+            this.visibleTree = false
             this.$emit('clearSelected')
             eventBUs.$emit('searchReset')
           } else {
@@ -109,13 +117,13 @@
         const value = e.target.value
       },
       queryDepartUserTreeList() {
-        this.confirmLoading = true
         let gData = JSON.parse(JSON.stringify(this.gData))
         if (gData && gData.length > 0) {
           gData = JSON.stringify(gData)
-        }else {
+        } else {
           gData = ''
         }
+        this.confirmLoading = true
         postAction('sys/user/queryDepartUserTreeList', {
           departId: this.departId,
           json: gData