xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-11-07 11:13:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化：1、角色员工列表的添加员工弹窗中禁止添加选择已存在该角色的员工；2、禁止删除已存在员工的角色

Browse Source
This commit is contained in:
zhoumingfa
2024-08-04 14:32:23 +08:00
parent 949f7a209c
commit 8fd02fc519
8 changed files with 54 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
smart-admin-web/javascript-ant-design-vue3/src/components/system/employee-table-select-modal/index.vue
View File

@@ -40,7 +40,7 @@
</a-row>
</a-form>
<a-table
:row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
:row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange, getCheckboxProps: getCheckboxProps }"
:loading="tableLoading"
size="small"
:columns="columns"
@@ -95,6 +95,7 @@
const visible = ref(false);
async function showModal(selectEmployeeId) {
originalRowKeyList.value = selectEmployeeId || [];
selectedRowKeyList.value = selectEmployeeId || [];
visible.value = true;
onSearch();
@@ -144,8 +145,9 @@
}
// ----------------------- 员工表格选择 ---------------------
const originalRowKeyList = ref([]);
let selectedRowKeyList = ref([]);
const hasSelected = computed(() => selectedRowKeyList.value.length > 0);
const hasSelected = computed(() => selectedRowKeyList.value.length !== originalRowKeyList.value.length);
function onSelectChange(selectedRowKeys) {
selectedRowKeyList.value = selectedRowKeys;
@@ -156,10 +158,19 @@
message.warning('请选择角色人员');
return;
}
emits('selectData', selectedRowKeyList.value);
// 过滤出新选择的人员id
const newEmployeeIdList = selectedRowKeyList.value.filter((id) => !originalRowKeyList.value.includes(id));
emits('selectData', newEmployeeIdList);
closeModal();
}
function getCheckboxProps(record) {
return {
// 角色员工列表的添加员工弹窗中 禁止添加选择已存在该角色的员工
disabled: originalRowKeyList.value.includes(record.employeeId),
};
}
// ----------------------- 员工表格渲染 ---------------------
const tableData = ref([]);
//字段

2
smart-admin-web/javascript-ant-design-vue3/src/views/system/role/components/role-employee-list/index.vue
View File

@@ -168,7 +168,7 @@
async function addRoleEmployee() {
let res = await roleApi.getRoleAllEmployee(selectRoleId.value);
let selectedIdList = res.data.map((e) => e.roleId) || [];
let selectedIdList = res.data.map((e) => e.employeeId) || [];
selectEmployeeModal.value.showModal(selectedIdList);
}