From f699f6f3ba30ddc330f92e75d6fbcf5eced943c4 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Thu, 13 Jun 2024 15:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts       |  1 +
 src/i18n/locales/zh-CN.ts       |  1 +
 src/views/system/user/index.vue | 95 +++++++++++++--------------------
 3 files changed, 40 insertions(+), 57 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 5ef4fbf0..14f9d289 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -1597,6 +1597,7 @@ export default {
         userName: 'Nick Name',
         permission: 'Role',
         className: 'Department',
+        tenntName:'Tenant Name', 
         loginIp: 'Login Address',
         loginTime: 'Login Time',
         status: 'Status',
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 4dde7cc9..98a3c504 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -1597,6 +1597,7 @@ export default {
         userName: '用户昵称',
         permission: '用户权限',
         className: '部门名称',
+        tenntName:'租户名称',
         loginIp: '登录地址',
         loginTime: '登录时间',
         status: '用户状态',
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index eac4fdc9..5c1f6ddb 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -18,7 +18,8 @@ import {
   updateUser,
   addUser,
 } from '@/api/system/user';
-import { deptTreeSelect } from '@/api/system/dept';
+import { deptTreeSelect } from '@/api/system/tenant';
+
 import { saveAs } from 'file-saver';
 import useI18n from '@/hooks/useI18n';
 import { parseDateToStr } from '@/utils/date-utils';
@@ -59,6 +60,8 @@ let queryParams = reactive({
   phonenumber: '',
   /**部门ID */
   deptId: undefined,
+  /**租户ID */
+  tenantId: undefined,
   /**用户状态 */
   status: undefined,
   /**记录开始时间 */
@@ -77,6 +80,7 @@ function fnQueryReset() {
     userName: '',
     phonenumber: '',
     deptId: undefined,
+    tenantId: undefined,
     status: undefined,
     beginTime: '',
     endTime: '',
@@ -139,9 +143,9 @@ let tableColumns: ColumnsType = [
     width: 200,
   },
   {
-    title: t('views.system.user.className'),
-    dataIndex: 'deptId',
-    key: 'deptId',
+    title: t('views.system.user.tenntName'),
+    dataIndex: 'tenantId',
+    key: 'tenantId',
     align: 'left',
     width: 200,
   },
@@ -802,11 +806,11 @@ onMounted(() => {
         <a-row :gutter="16">
           <a-col :lg="18" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.system.user.className')"
-              name="deptId"
+              :label="t('views.system.user.tenntName')"
+              name="tenantId"
             >
               <a-tree-select
-                v-model:value="queryParams.deptId"
+                v-model:value="queryParams.tenantId"
                 show-search
                 tree-default-expand-all
                 :tree-data="deptTreeData"
@@ -1005,8 +1009,8 @@ onMounted(() => {
               {{ r.roleName }}
             </a-tag>
           </template>
-          <template v-if="column.key === 'deptId'">
-            {{ record.dept?.deptName }}
+          <template v-if="column.key === 'tenantId'">
+            {{ record.tenant?.tenantName }}
           </template>
           <template v-if="column.key === 'status'">
             <DictTag
@@ -1184,29 +1188,6 @@ onMounted(() => {
           </a-col>
         </a-row>
 
-        <a-form-item
-          :label="t('views.system.user.fromClass')"
-          name="deptId"
-          :label-col="{ span: 3 }"
-          :label-wrap="true"
-        >
-          <a-tree-select
-            :value="modalState.from.deptId"
-            disabled
-            :tree-data="deptTreeData"
-            :field-names="{
-              children: 'children',
-              label: 'label',
-              value: 'id',
-            }"
-            tree-node-label-prop="label"
-            style="width: 100%"
-            :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-          >
-            <template #suffixIcon></template>
-          </a-tree-select>
-        </a-form-item>
-
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
@@ -1243,6 +1224,30 @@ onMounted(() => {
           </a-col>
         </a-row>
 
+        <a-form-item
+          :label="t('views.system.user.fromTenant')"
+          name="tenantId"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
+        >
+          <a-tree-select
+            v-model:value="modalState.from.tenantId"
+            disabled
+            :tree-data="deptTreeData"
+            :field-names="{
+              children: 'children',
+              label: 'label',
+              value: 'id',
+            }"
+            tree-node-label-prop="label"
+            style="width: 100%"
+            :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+            :placeholder="t('common.selectPlease')"
+          >
+            <template #suffixIcon></template>
+          </a-tree-select>
+        </a-form-item>
+
         <a-form-item
           :label="t('views.system.user.userTip')"
           name="remark"
@@ -1426,33 +1431,9 @@ onMounted(() => {
           </a-select>
         </a-form-item>
 
-        <a-form-item
-          :label="t('views.system.user.fromClass')"
-          name="deptId"
-          :label-col="{ span: 3 }"
-        >
-          <a-tree-select
-            v-model:value="modalState.from.deptId"
-            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.fromTenant')"
-          name="deptId"
+          name="tenantId"
           :label-col="{ span: 3 }"
         >
           <a-tree-select