From 0c362b64c2ab5bc2a86810543dc24ac7b0555930 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 11 Oct 2022 17:10:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/tenant/types.ts            |  2 ++
 .../src/components/UserInfo/src/UserInfo.vue  |  2 +-
 .../src/views/system/tenant/index.vue         |  2 +-
 .../src/views/system/tenant/tenant.data.ts    | 25 ++++++++++++++++++-
 .../src/views/system/user/index.vue           |  6 ++---
 5 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/api/system/tenant/types.ts b/yudao-ui-admin-vue3/src/api/system/tenant/types.ts
index 1fc58bd71..dc19b8e2c 100644
--- a/yudao-ui-admin-vue3/src/api/system/tenant/types.ts
+++ b/yudao-ui-admin-vue3/src/api/system/tenant/types.ts
@@ -4,6 +4,8 @@ export type TenantVO = {
   packageId: number
   contactName: string
   contactMobile: string
+  username: string
+  password: string
   accountCount: number
   expireTime: string
   domain: string
diff --git a/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue b/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue
index 5bccbe429..41650ae2c 100644
--- a/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue
+++ b/yudao-ui-admin-vue3/src/components/UserInfo/src/UserInfo.vue
@@ -37,7 +37,7 @@ const loginOut = () => {
     .then(async () => {
       userStore.loginOut()
       tagsViewStore.delAllViews
-      replace('/login')
+      replace('/login?redirect=/index')
     })
     .catch(() => {})
 }
diff --git a/yudao-ui-admin-vue3/src/views/system/tenant/index.vue b/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
index 76bdf9b9f..e432fbca4 100644
--- a/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/tenant/index.vue
@@ -199,7 +199,7 @@ onMounted(async () => {
       ref="formRef"
     >
       <template #packageId>
-        <el-select v-model="tenantPackageId" placeholder="Select">
+        <el-select v-model="tenantPackageId">
           <el-option
             v-for="item in tenantPackageOptions"
             :key="item.id"
diff --git a/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts b/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts
index 73ef3cf10..64eb63d0c 100644
--- a/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts
@@ -55,6 +55,29 @@ const crudSchemas = reactive<CrudSchema[]>([
       show: true
     }
   },
+  {
+    label: '用户名称',
+    field: 'username',
+    table: {
+      show: false
+    },
+    detail: {
+      show: false
+    }
+  },
+  {
+    label: '用户密码',
+    field: 'password',
+    table: {
+      show: false
+    },
+    detail: {
+      show: false
+    },
+    form: {
+      component: 'InputPassword'
+    }
+  },
   {
     label: '账号额度',
     field: 'accountCount',
@@ -71,7 +94,7 @@ const crudSchemas = reactive<CrudSchema[]>([
       component: 'DatePicker',
       componentProps: {
         type: 'datetime',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss'
+        valueFormat: 'x'
       }
     }
   },
diff --git a/yudao-ui-admin-vue3/src/views/system/user/index.vue b/yudao-ui-admin-vue3/src/views/system/user/index.vue
index d6b4101c0..40357adff 100644
--- a/yudao-ui-admin-vue3/src/views/system/user/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/user/index.vue
@@ -112,20 +112,20 @@ const setDialogTile = async (type: string) => {
 
 // 新增操作
 const handleAdd = () => {
-  setDialogTile('create')
   // 重置表单
   deptId.value = 0
   unref(formRef)?.getElFormRef()?.resetFields()
+  setDialogTile('create')
 }
 
 // 修改操作
 const handleUpdate = async (row: UserVO) => {
-  await setDialogTile('update')
   // 设置数据
   const res = await UserApi.getUserApi(row.id)
   deptId.value = res.deptId
   postIds.value = res.postIds
   unref(formRef)?.setValues(res)
+  await setDialogTile('update')
 }
 
 // 提交按钮
@@ -281,9 +281,9 @@ const excelUploadError = (): void => {
 }
 // ========== 初始化 ==========
 onMounted(async () => {
-  await getTree()
   await getPostOptions()
   await getList()
+  await getTree()
 })
 </script>