root/nl-sso-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

替换opt

Browse Source
This commit is contained in:
zhangzhiqiang
2022-12-16 14:22:34 +08:00
parent 867872fec6
commit 040734cd92
13 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
nladmin-ui/src/views/system/user/index.vue
View File

@@ -72,7 +72,7 @@
<el-input v-model.number="form.phone" style="width: 200px;" />
</el-form-item>
<el-form-item label="姓名" prop="preson_name">
<el-input v-model="form.person_name" style="width: 200px;" />
<el-input v-model="form.personName" style="width: 200px;" />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" style="width: 200px;" />
@@ -124,9 +124,9 @@
<!--:disabled="level !== 1 && item.level <= level"-->
<el-option
v-for="item in roles"
:key="item.role_id"
:key="item.roleId"
:label="item.name"
:value="item.role_id"
:value="item.roleId"
/>
</el-select>
</el-form-item>
@@ -147,11 +147,11 @@
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column prop="username" label="用户名" :min-width="flexWidth('username',crud.data,'用户名')" />
<el-table-column
prop="person_name"
prop="personName"
label="姓名"
:min-width="flexWidth('personName',crud.data,'姓名')"
/>
<el-table-column prop="gender" label="性别" :min-width="flexWidth('person_name',crud.data,'性别')" />
<el-table-column prop="gender" label="性别" :min-width="flexWidth('personName',crud.data,'性别')" />
<el-table-column prop="phone" label="电话" :min-width="flexWidth('phone',crud.data,'电话')" />
<el-table-column prop="email" label="邮箱" :min-width="flexWidth('email',crud.data,'邮箱')" />
<el-table-column show-overflow-tooltip prop="deptnames" label="部门" />
@@ -248,7 +248,7 @@
<el-input v-model="dataDialog.username" disabled style="width: 200px;" />
</el-form-item>
<el-form-item label="姓名" prop="preson_name">
<el-input v-model="dataDialog.person_name" disabled style="width: 200px;" />
<el-input v-model="dataDialog.personName" disabled style="width: 200px;" />
</el-form-item>
<el-table
ref="dialogTable"
@@ -309,7 +309,7 @@
</el-table-column>
<el-table-column prop="permission_name" label="权限范围" min-width="100" show-overflow-tooltip />
<el-table-column prop="dept_name" label="部门名称" min-width="100" show-overflow-tooltip />
<el-table-column prop="person_name" label="用户名称" min-width="100" show-overflow-tooltip />
<el-table-column prop="personName" label="用户名称" min-width="100" show-overflow-tooltip />
</el-table>
</el-dialog>
<relevance-user-dialog :dialog-show.sync="relevanceUser" :is-single="false" :users="userIds" @selectUsers="selectUsers" />
@@ -338,7 +338,7 @@ const defaultForm = {
dept_id: null,
depts: [],
username: null,
person_name: null,
personName: null,
gender: '男',
email: null,
isUsed: '1',
@@ -368,15 +368,15 @@ export default {
del: ['admin', 'user:del']
},
enabledTypeOptions: [
{ key: '1', display_name: '激活' },
{ key: '0', display_name: '锁定' }
{ key: true, display_name: '激活' },
{ key: false, display_name: '锁定' }
],
rules: {
username: [
{ required: true, message: '请输入用户名', trigger: 'blur' },
{ min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
],
person_name: [
personName: [
{ required: true, message: '请输入用户姓名', trigger: 'blur' },
{ min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
]
@@ -573,7 +573,7 @@ export default {
},
normalizer(node) {
return {
id: node.dept_id,
id: node.deptId,
label: node.name,
children: node.children
}
@@ -672,10 +672,10 @@ export default {
// // permissions
// crudDataPermission.getDataPermissionOption().then(res => {
// this.permissions = res
// this.dataDialog.person_name = row.person_name
// this.dataDialog.personName = row.personName
// this.dataDialog.username = row.username
// this.dataDialog.user_id = row.user_id
// this.dataPermissionTitle = '[' + row.person_name + '] 数据权限'
// this.dataPermissionTitle = '[' + row.personName + '] 数据权限'
// this.dataPerm = true
// // 回显数据
// crudDataPermission.getDataShow(row.user_id).then(res => {