|
|
@@ -123,12 +123,18 @@
|
|
|
@ok="editHandleOk"
|
|
|
width="48%"
|
|
|
>
|
|
|
- <a-form ref="formRef" :model="editform">
|
|
|
+ <a-form ref="formRefPaw" :model="editform">
|
|
|
<a-row :gutter="20">
|
|
|
<a-col :span="10">
|
|
|
- <a-form-item field="loginName" label="用户名" :rules="[{required:true,message:'用户名必填'},{maxLength:50,message:'长度不超过50'}]"
|
|
|
- >
|
|
|
- <a-input v-model="editform.loginName" />
|
|
|
+ <a-form-item
|
|
|
+ field="loginName"
|
|
|
+ label="用户名"
|
|
|
+ :rules="[
|
|
|
+ { required: true, message: '用户名必填' },
|
|
|
+ { maxLength: 50, message: '长度不超过50' },
|
|
|
+ ]"
|
|
|
+ >
|
|
|
+ <a-input v-model="editform.loginName" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="10">
|
|
|
@@ -144,7 +150,15 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="10">
|
|
|
- <a-form-item required field="email" label="邮箱" :rules="[{required:true,message:'邮箱必填'},{maxLength:50,message:'长度不超过50'}]" >
|
|
|
+ <a-form-item
|
|
|
+ required
|
|
|
+ field="email"
|
|
|
+ label="邮箱"
|
|
|
+ :rules="[
|
|
|
+ { required: true, message: '邮箱必填' },
|
|
|
+ { maxLength: 50, message: '长度不超过50' },
|
|
|
+ ]"
|
|
|
+ >
|
|
|
<a-input v-model="editform.email" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
@@ -156,7 +170,12 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="10">
|
|
|
- <a-form-item required field="role" label="角色" :rules="[{required:true,message:'角色必选'}]" >
|
|
|
+ <a-form-item
|
|
|
+ required
|
|
|
+ field="role"
|
|
|
+ label="角色"
|
|
|
+ :rules="[{ required: true, message: '角色必选' }]"
|
|
|
+ >
|
|
|
<a-select
|
|
|
v-model="editform.role"
|
|
|
:options="roles"
|
|
|
@@ -234,10 +253,7 @@
|
|
|
>
|
|
|
<a-space wrap>
|
|
|
菜单功能:
|
|
|
- <a-tag
|
|
|
- v-for="(tag, index) of checkStrictlyMenu"
|
|
|
- :key="tag.menuId"
|
|
|
- >
|
|
|
+ <a-tag v-for="(tag, index) of checkStrictlyMenu" :key="tag.menuId">
|
|
|
{{ tag.menuName }}
|
|
|
</a-tag>
|
|
|
</a-space>
|
|
|
@@ -283,19 +299,21 @@
|
|
|
DialogList,
|
|
|
KnowledgeList,
|
|
|
OrganizationList,
|
|
|
- ResourceList, Role, RoleList,
|
|
|
+ ResourceList,
|
|
|
+ Role,
|
|
|
+ RoleList,
|
|
|
User,
|
|
|
UserAdd,
|
|
|
UserChangePwd,
|
|
|
UserDelete,
|
|
|
UserEdit,
|
|
|
UserList,
|
|
|
- Userstatus
|
|
|
- } from "@/api/authority";
|
|
|
+ Userstatus,
|
|
|
+ } from '@/api/authority';
|
|
|
import { Modal } from '@arco-design/web-vue';
|
|
|
import Authheader from '@/views/authority/components/authheader.vue';
|
|
|
import { create } from 'lodash';
|
|
|
- import { queryCanvasList } from "@/api/Agent";
|
|
|
+ import { queryCanvasList } from '@/api/Agent';
|
|
|
|
|
|
const fieldNames = { value: 'roleId', label: 'roleName' };
|
|
|
const roles = ref([]);
|
|
|
@@ -309,6 +327,7 @@
|
|
|
let checkStrictlyDialog = ref([]);
|
|
|
let checkStrictlyAgent = ref([]);
|
|
|
let formRef = ref();
|
|
|
+ const formRefPaw = ref();
|
|
|
|
|
|
let menuTips = ref(['权限管理', '账号']);
|
|
|
type SizeProps = 'mini' | 'small' | 'medium' | 'large';
|
|
|
@@ -333,10 +352,10 @@
|
|
|
phoneNumber: '',
|
|
|
status: '',
|
|
|
userId: '',
|
|
|
- loginName:'',
|
|
|
+ loginName: '',
|
|
|
userName: '',
|
|
|
- psw:'',
|
|
|
- role:'',
|
|
|
+ psw: '',
|
|
|
+ role: '',
|
|
|
});
|
|
|
|
|
|
let size = ref<SizeProps>('medium');
|
|
|
@@ -345,11 +364,11 @@
|
|
|
let resourcevisible = ref(false);
|
|
|
let selectUser = ref({});
|
|
|
|
|
|
- const loadRole=async () => {
|
|
|
- await RoleList(null).then((res) => {
|
|
|
- roles.value = res.rows;
|
|
|
- });
|
|
|
- }
|
|
|
+ const loadRole = async () => {
|
|
|
+ await RoleList(null).then((res) => {
|
|
|
+ roles.value = res.rows;
|
|
|
+ });
|
|
|
+ };
|
|
|
|
|
|
const roleChange = (val) => {
|
|
|
editform.value.role = val;
|
|
|
@@ -452,26 +471,24 @@
|
|
|
});
|
|
|
};
|
|
|
|
|
|
-
|
|
|
const cb = async (err) => {
|
|
|
if (err) {
|
|
|
visible.value = true;
|
|
|
} else {
|
|
|
if (editform.value.userId.length > 0) {
|
|
|
await UserEdit({
|
|
|
- ...editform.value
|
|
|
+ ...editform.value,
|
|
|
} as unknown as User).then((res) => {
|
|
|
fetchData();
|
|
|
});
|
|
|
} else {
|
|
|
await UserAdd({
|
|
|
- ...editform.value
|
|
|
+ ...editform.value,
|
|
|
} as unknown as User).then((res) => {
|
|
|
fetchData();
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
};
|
|
|
const editHandleOk = () => {
|
|
|
formRef.value.validate(cb);
|
|
|
@@ -507,13 +524,14 @@
|
|
|
//编辑
|
|
|
if (t == 2) {
|
|
|
visible.value = true;
|
|
|
+ formRefPaw.value?.resetFields();
|
|
|
save.value = '编辑';
|
|
|
editform.value.userId = record.userId;
|
|
|
editform.value.userName = record.userName;
|
|
|
editform.value.loginName = record.loginName;
|
|
|
editform.value.email = record.email;
|
|
|
editform.value.phoneNumber = record.phoneNumber;
|
|
|
- if (record.roles?.length>0) {
|
|
|
+ if (record.roles?.length > 0) {
|
|
|
editform.value.role = record.roles[0].roleId;
|
|
|
}
|
|
|
}
|
|
|
@@ -535,9 +553,9 @@
|
|
|
selectUser.value = record;
|
|
|
|
|
|
let agents;
|
|
|
- if (record.agents){
|
|
|
- agents=record.agents
|
|
|
- }else{
|
|
|
+ if (record.agents) {
|
|
|
+ agents = record.agents;
|
|
|
+ } else {
|
|
|
agents = record.roles ? record.roles[0].agents : null;
|
|
|
}
|
|
|
if (agents) {
|
|
|
@@ -546,13 +564,12 @@
|
|
|
agentId: val.id,
|
|
|
agentName: val.title,
|
|
|
});
|
|
|
-
|
|
|
});
|
|
|
}
|
|
|
let resources;
|
|
|
- if (record.resources){
|
|
|
- resources=record.resources
|
|
|
- }else{
|
|
|
+ if (record.resources) {
|
|
|
+ resources = record.resources;
|
|
|
+ } else {
|
|
|
resources = record.roles ? record.roles[0].resources : null;
|
|
|
}
|
|
|
if (resources) {
|
|
|
@@ -561,7 +578,6 @@
|
|
|
menuId: val.menuId,
|
|
|
menuName: val.menuName,
|
|
|
});
|
|
|
-
|
|
|
});
|
|
|
}
|
|
|
let knowledges;
|
|
|
@@ -628,9 +644,9 @@
|
|
|
if (user.roles) {
|
|
|
for (const r of user.roles) {
|
|
|
if (user.roleName) {
|
|
|
- user.roleName += r.roleName + ",";
|
|
|
+ user.roleName += r.roleName + ',';
|
|
|
} else {
|
|
|
- user.roleName = r.roleName + ",";
|
|
|
+ user.roleName = r.roleName + ',';
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -664,10 +680,9 @@
|
|
|
});
|
|
|
};
|
|
|
|
|
|
-
|
|
|
fetchData();
|
|
|
OrganizationData('');
|
|
|
- loadRole()
|
|
|
+ loadRole();
|
|
|
|
|
|
const reset = () => {
|
|
|
formModel.value = generateFormModel();
|