Pre Merge pull request !28 from 1023byte/ts

src/views/system/tenant/index.vue

@@ -207,7 +207,8 @@ const data = reactive<PageData<TenantForm, TenantQuery>>({
     password: [
       { required: true, message: "密码不能为空", trigger: "blur" },
       { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
-    ]
+    ],
+    packageId: [{ required: true, message: "租户套餐不能为空", trigger: "blur" }],
   }
 });
 

src/views/system/user/index.vue

@@ -231,7 +231,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="角色">
+            <el-form-item label="角色" prop="roleIds">
               <el-select v-model="form.roleIds" multiple placeholder="请选择">
                 <el-option
                   v-for="item in roleOptions"
@@ -388,6 +388,7 @@ const data = reactive<PageData<UserForm, UserQuery>>({
     userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
     nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
     password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
+    roleIds: [{ required: true, message: "用户角色不能为空", trigger: "blur", }],
     email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
     phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
   }
@@ -423,6 +424,12 @@ const getList = async () => {
   total.value = res.total;
 }
 
+/** 查询账号初始密码 */
+const getInitPassword = async () => {
+  const res = await proxy?.getConfigKey('sys.user.initPassword');
+  initPassword.value = res?.msg === undefined ? '123456' : res.msg;
+}
+
 /** 节点单击事件 */
 const handleNodeClick = (data: DeptVO) => {
   queryParams.value.deptId = data.id;
@@ -617,6 +624,7 @@ const resetForm = () => {
 onMounted(() => {
   getTreeSelect() // 初始化部门数据
   getList() // 初始化列表数据
+  getInitPassword() // 获取初始化密码
 });
 </script>