From b56ff37c2c478c345b138eb9853c34933214af23 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 4 Mar 2022 11:28:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/system/DepartList.vue      | 23 ++++++++++++-------
 .../src/views/system/modules/DeptUserInfo.vue |  6 +++--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/views/system/DepartList.vue b/jero-web/src/views/system/DepartList.vue
index 6b7d26eb2..57ca0b392 100644
--- a/jero-web/src/views/system/DepartList.vue
+++ b/jero-web/src/views/system/DepartList.vue
@@ -68,7 +68,7 @@
       <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
     </a-col>
     <a-col :md="14" :sm="24" style="padding: 24px;">
-      <a-tabs defaultActiveKey="1">
+      <a-tabs defaultActiveKey="1" @change="tabChange">
         <a-tab-pane :tab="$t('essentialInformation')" key="1">
           <a-card :bordered="false" v-if="selectedKeys.length>0">
             <a-form :form="form">
@@ -279,7 +279,8 @@
           exportXlsUrl: 'sys/sysDepart/exportXls',
           importExcelUrl: 'sys/sysDepart/importExcel'
         },
-        orgCategoryDisabled: false
+        orgCategoryDisabled: false,
+        recordTab:{},
       }
     },
     computed: {
@@ -331,7 +332,6 @@
         this.rightClickSelectedOrgCode = node.node.dataRef.orgCode
       },
       onExpand(expandedKeys) {
-        console.log('onExpand', expandedKeys)
         this.iExpandedKeys = expandedKeys
       },
       backFlowList() {
@@ -413,19 +413,26 @@
         }
       },
       onSelect(selectedKeys, e) {
-        console.log('selected', selectedKeys, e)
         this.hiding = false
         let record = e.node.dataRef
-        console.log('onSelect-record', record)
         this.currSelected = Object.assign({}, record)
         this.model = this.currSelected
         this.selectedKeys = [record.key]
         this.model.parentId = record.parentId
         this.setValuesToForm(record)
-        this.$refs.departAuth.show(record.id)
+        this.recordTab = record
+        // this.$refs.departAuth.show(record.id)
         // 传用户信息参数
-        this.$refs.DeptUserInfo.open(record)
-
+        if (this.$refs.DeptUserInfo){
+          this.$refs.DeptUserInfo.open(record)
+        }
+      },
+      tabChange(event){
+        if(event == 3){
+          this.$nextTick(()=>{
+            this.$refs.DeptUserInfo.open(this.recordTab)
+          })
+        }
       },
       // 触发onSelect事件时,为部门树右侧的form表单赋值
       setValuesToForm(record) {
diff --git a/jero-web/src/views/system/modules/DeptUserInfo.vue b/jero-web/src/views/system/modules/DeptUserInfo.vue
index 892a746af..f526ff767 100644
--- a/jero-web/src/views/system/modules/DeptUserInfo.vue
+++ b/jero-web/src/views/system/modules/DeptUserInfo.vue
@@ -151,7 +151,8 @@
           edit: "/sys/user/editSysDepartWithUser",
           delete: "/sys/user/deleteUserInDepart",
           deleteBatch: "/sys/user/deleteUserInDepartBatch",
-        }
+        },
+        loading:false,
       }
     },
     created() {
@@ -167,6 +168,7 @@
           this.$message.error(this.$t('setURLListAttribute'))
           return
         }
+        this.loading = true
         //加载数据 若传入参数1则加载第一页的内容
         if (arg === 1) {
           this.ipagination.current = 1;
@@ -175,6 +177,7 @@
         let params = this.getQueryParams();//查询条件
         params.depId = this.currentDeptId;
         getAction(this.url.list, params).then((res) => {
+          this.loading = false
           if (res.success && res.result) {
             this.dataSource = res.result.records;
             this.ipagination.total = res.result.total;
@@ -248,7 +251,6 @@
         });
       },
       open(record) {
-        //console.log(record);
         this.currentDeptId = record.id;
         this.currentDept = record;
         this.loadData(1);