From eee652bd1fc520fa231a4409537f45417b057766 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Thu, 6 Jun 2024 14:38:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=80=E5=B1=9E=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 36 +++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d5872c61..eac4fdc9 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -51,7 +51,6 @@ let dict: {
 /**开始结束时间 */
 let queryRangePicker = ref<[string, string]>(['', '']);
 
-//test
 /**查询参数 */
 let queryParams = reactive({
   /**登录账号 */
@@ -252,6 +251,7 @@ let modalState: ModalStateType = reactive({
     userName: '',
     password: '',
     deptId: '100',
+    tenantId: '100',
     email: '',
     loginDate: 0,
     loginIp: '',
@@ -435,7 +435,7 @@ function fnModalOk() {
   let validateName = ['nickName', 'email', 'phonenumber'];
   if (!modalState.from.userId) {
     validateName.push('userName', 'password');
-  } 
+  }
   modalStateFrom
     .validate(validateName)
     .then(() => {
@@ -744,6 +744,14 @@ function fnGetList(pageNum?: number) {
       }
       tablePagination.total = res.total;
       tableState.data = res.rows;
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
+        tableState.loading = false;
+        fnGetList(queryParams.pageNum - 1);
+      }
     }
     tableState.loading = false;
   });
@@ -1442,6 +1450,30 @@ onMounted(() => {
           </a-tree-select>
         </a-form-item>
 
+        <a-form-item
+          :label="t('views.system.user.fromTenant')"
+          name="deptId"
+          :label-col="{ span: 3 }"
+        >
+          <a-tree-select
+            v-model:value="modalState.from.tenantId"
+            show-search
+            tree-default-expand-all
+            :tree-data="deptTreeData"
+            :field-names="{
+              children: 'children',
+              label: 'label',
+              value: 'id',
+            }"
+            tree-node-label-prop="label"
+            tree-node-filter-prop="label"
+            style="width: 100%"
+            :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+            :placeholder="t('common.selectPlease')"
+          >
+          </a-tree-select>
+        </a-form-item>
+
         <a-form-item
           :label="t('views.system.user.userTip')"
           name="remark"