release-v1.0 #1

Merged
panchichun merged 57 commits from release-v1.0 into main 2024-09-13 17:04:18 +08:00
Showing only changes of commit 4193ac4717 - Show all commits

View File

@ -101,6 +101,7 @@
@click="handleDelete"
v-hasPermi="['system:user:remove']"
>删除</el-button>
<!--
<el-button
plain
icon="el-icon-upload2"
@ -114,7 +115,7 @@
size="mini"
@click="handleExport"
v-hasPermi="['system:user:export']"
>导出</el-button>
>导出</el-button>-->
</div>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
@ -261,7 +262,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"
@ -411,6 +412,9 @@ export default {
nickName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
],
deptId: [
{ required: true, message: "归属部门不能为空", trigger: "blur" }
],
password: [
{ required: true, message: "用户密码不能为空", trigger: "blur" },
{ min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
@ -429,7 +433,10 @@ export default {
message: "请输入正确的手机号码",
trigger: "blur"
}
]
],
roleIds: [
{ required: true, message: "角色不能为空", trigger: "blur" }
],
}
};
},