fix: 修复新增租户报错

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

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(() => {})
 }

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"

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'
       }
     }
   },

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>