|
@@ -93,9 +93,14 @@
|
|
|
<span>{{ row.adminMenuName }}</span>
|
|
<span>{{ row.adminMenuName }}</span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="adminName" label="可管理部门" width="230">
|
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="adminName"
|
|
|
|
|
+ label="可管理部门"
|
|
|
|
|
+ width="230"
|
|
|
|
|
+ >
|
|
|
<template #default="{ row }">
|
|
<template #default="{ row }">
|
|
|
- <div class="ul" style="display:flex;flex-wrap:wrap;">
|
|
|
|
|
|
|
+ <div class="ul" style="display: flex; flex-wrap: wrap">
|
|
|
<el-tag
|
|
<el-tag
|
|
|
v-for="i in row.checkOrg"
|
|
v-for="i in row.checkOrg"
|
|
|
style="margin: 5px"
|
|
style="margin: 5px"
|
|
@@ -293,6 +298,10 @@
|
|
|
class="m-2"
|
|
class="m-2"
|
|
|
placeholder="请选择部门"
|
|
placeholder="请选择部门"
|
|
|
multiple
|
|
multiple
|
|
|
|
|
+ filterable
|
|
|
|
|
+ remote
|
|
|
|
|
+ reserve-keyword
|
|
|
|
|
+ remote-show-suffix
|
|
|
:clearable="true"
|
|
:clearable="true"
|
|
|
>
|
|
>
|
|
|
<el-option
|
|
<el-option
|
|
@@ -397,6 +406,7 @@ const ruleForm = reactive({
|
|
|
department: "",
|
|
department: "",
|
|
|
icCard: "",
|
|
icCard: "",
|
|
|
id: "",
|
|
id: "",
|
|
|
|
|
+ usersId:'',
|
|
|
});
|
|
});
|
|
|
var checkUserName = (rule, value, callback) => {
|
|
var checkUserName = (rule, value, callback) => {
|
|
|
if (!value) {
|
|
if (!value) {
|
|
@@ -730,6 +740,7 @@ const addlist = () => {
|
|
|
ruleForm.department = "";
|
|
ruleForm.department = "";
|
|
|
ruleForm.icCard = "";
|
|
ruleForm.icCard = "";
|
|
|
ruleForm.id = "";
|
|
ruleForm.id = "";
|
|
|
|
|
+ ruleForm.usersId = "";
|
|
|
nextTick(() => {
|
|
nextTick(() => {
|
|
|
editMemberTree.value.setCheckedKeys([]);
|
|
editMemberTree.value.setCheckedKeys([]);
|
|
|
});
|
|
});
|
|
@@ -761,6 +772,7 @@ const edit = (row) => {
|
|
|
ruleForm.adminMenuId = row.adminMenu.id;
|
|
ruleForm.adminMenuId = row.adminMenu.id;
|
|
|
ruleForm.password = row.passWord;
|
|
ruleForm.password = row.passWord;
|
|
|
ruleForm.department = row.department;
|
|
ruleForm.department = row.department;
|
|
|
|
|
+ ruleForm.usersId = row.usersId;
|
|
|
if (row.checkOrg) {
|
|
if (row.checkOrg) {
|
|
|
let arr = [];
|
|
let arr = [];
|
|
|
row.checkOrg.forEach((i) => {
|
|
row.checkOrg.forEach((i) => {
|
|
@@ -769,7 +781,7 @@ const edit = (row) => {
|
|
|
ruleForm.icCard = arr;
|
|
ruleForm.icCard = arr;
|
|
|
}
|
|
}
|
|
|
nextTick(() => {
|
|
nextTick(() => {
|
|
|
- if(row.adminMenu){
|
|
|
|
|
|
|
+ if (row.adminMenu) {
|
|
|
editMemberTree.value.setCheckedKeys([row.adminMenu.id]);
|
|
editMemberTree.value.setCheckedKeys([row.adminMenu.id]);
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
@@ -793,6 +805,7 @@ const submitAdd = lodash.debounce(async (formEl) => {
|
|
|
department: ruleForm.department,
|
|
department: ruleForm.department,
|
|
|
checkOrg: ruleForm.icCard.join(","),
|
|
checkOrg: ruleForm.icCard.join(","),
|
|
|
id: ruleForm.id,
|
|
id: ruleForm.id,
|
|
|
|
|
+ usersId:ruleForm.usersId
|
|
|
},
|
|
},
|
|
|
};
|
|
};
|
|
|
let res = await axios({
|
|
let res = await axios({
|