diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 05c9bd34..85e4fcfe 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -20,7 +20,7 @@ const queryFormRef = ref(ElForm); const deptFormRef = ref(ElForm); const loading = ref(false); -let ids = reactive([]); +const ids = ref([]); const dialog = reactive({ visible: false }); @@ -65,7 +65,7 @@ function resetQuery() { * 行复选框选中记录选中ID集合 */ function handleSelectionChange(selection: any) { - ids = selection.map((item: any) => item.id); + ids.value = selection.map((item: any) => item.id); } /** @@ -133,10 +133,11 @@ function handleSubmit() { } /** - * 删除 + * 删除部门 */ -function handleDelete(row: any) { - const deptIds = [row.id || ids].join(','); +function handleDelete(deptId?: number) { + const deptIds = [deptId || ids.value].join(','); + if (!deptIds) { ElMessage.warning('请勾选删除项'); return; @@ -146,18 +147,12 @@ function handleDelete(row: any) { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' - }) - .then(() => { - deleteDept(deptIds) - .then(() => { - handleQuery(); - ElMessage.success('删除成功'); - }) - .catch(() => { - ElMessage.error('删除失败'); - }); - }) - .catch(() => ElMessage.warning('已取消删除')); + }).then(() => { + deleteDept(deptIds).then(() => { + ElMessage.success('删除成功'); + resetQuery(); + }); + }); } /** @@ -218,14 +213,13 @@ onMounted(() => { - diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index d30d84dc..b00b9247 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -71,8 +71,6 @@ function resetQuery() { /** * 行checkbox change事件 - * - * @param selection */ function handleSelectionChange(selection: any) { ids.value = selection.map((item: any) => item.id); @@ -146,13 +144,18 @@ function resetForm() { /** * 删除字典类型 */ -function handleDelete(dictTypeId: number) { +function handleDelete(dictTypeId?: number) { + const dictTypeIds = [dictTypeId || ids.value].join(','); + if (!dictTypeIds) { + ElMessage.warning('请勾选删除项'); + return; + } + ElMessageBox.confirm('确认删除已选中的数据项?', '警告', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - const dictTypeIds = [dictTypeId || ids.value].join(','); deleteDictTypes(dictTypeIds).then(() => { ElMessage.success('删除成功'); resetQuery(); @@ -219,7 +222,7 @@ onMounted(() => { 删除 diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 8d2170dd..f7ab58c6 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -104,7 +104,6 @@ function openDialog(parentId?: number, menuId?: number) { .then(() => { dialog.visible = true; if (menuId) { - // 编辑 dialog.title = '编辑菜单'; getMenuForm(menuId).then(({ data }) => { Object.assign(formData, data); @@ -112,7 +111,6 @@ function openDialog(parentId?: number, menuId?: number) { menuCacheData.path = data.path ?? ''; }); } else { - // 新增 dialog.title = '新增菜单'; formData.parentId = parentId; } @@ -160,6 +158,7 @@ function submitForm() { */ function handleDelete(menuId: number) { if (!menuId) { + ElMessage.warning('请勾选删除项'); return false; } diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 91e52b90..a0c70d99 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -160,13 +160,18 @@ function resetForm() { /** * 删除 */ -function handleDelete(roleId: number) { +function handleDelete(roleId?: number) { + const roleIds = [roleId || ids.value].join(','); + if (!roleIds) { + ElMessage.warning('请勾选删除项'); + return; + } + ElMessageBox.confirm('确认删除已选中的数据项?', '警告', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - const roleIds = [roleId || ids.value].join(','); loading.value = true; deleteRoles(roleIds) .then(() => { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 81a6ff74..e67d50ea 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -258,8 +258,8 @@ function handleSubmit() { /** * 删除用户 */ -function handleDelete(id: number) { - const userIds = ([id] || ids.value).join(','); +function handleDelete(id?: number) { + const userIds = [id || ids.value].join(','); if (!userIds) { ElMessage.warning('请勾选删除项'); return; @@ -459,7 +459,7 @@ onMounted(() => { 删除