diff --git a/ui/dasadmin/src/views/backend/InstitutionalManagement/InstitutionalManagement.vue b/ui/dasadmin/src/views/backend/InstitutionalManagement/InstitutionalManagement.vue index ec081312..2cf56d07 100644 --- a/ui/dasadmin/src/views/backend/InstitutionalManagement/InstitutionalManagement.vue +++ b/ui/dasadmin/src/views/backend/InstitutionalManagement/InstitutionalManagement.vue @@ -281,10 +281,8 @@ const dialogTitle = ref('新增机构') const dialogVible = ref(false) const addInstitutional = () => { dialogTitle.value = '新增机构' - formModel.value = defaultFormModel - formRef.value && formRef.value.clearValidate(Object.keys(defaultFormModel)) - console.log(defaultFormModel, 'defaultFormModel') - + formModel.value = JSON.parse(JSON.stringify(defaultFormModel)) + formRef.value && formRef.value.resetFields() dialogVible.value = true } @@ -294,25 +292,35 @@ const submitAddForm = () => { formRef.value.validate((valid) => { if (valid) { if (dialogTitle.value === '新增机构') { - addInstitutionalListReq(formModel.value).then((res) => { - if (res.success) { - ElMessage.success('新增成功') - getInstitutionList() - dialogVible.value = false - refreshTreeData() - } - }) + addInstitutionalListReq(formModel.value) + .then((res) => { + if (res.success) { + ElMessage.success('新增成功') + getInstitutionList() + dialogVible.value = false + refreshTreeData() + } else { + ElMessage.error(res?.msg ?? '新增失败') + } + }) + .catch((err) => { + ElMessage.error(err?.response?.data?.msg ?? '新增失败') + }) } else if (dialogTitle.value === '编辑机构') { - changeInstitutionalListReq(formModel.value as changeDataType).then((res) => { - if (res.success) { - ElMessage.success('编辑成功') - getInstitutionList() - dialogVible.value = false - refreshTreeData() - } else { - ElMessage.error('编辑失败') - } - }) + changeInstitutionalListReq(formModel.value as changeDataType) + .then((res) => { + if (res.success) { + ElMessage.success('编辑成功') + getInstitutionList() + dialogVible.value = false + refreshTreeData() + } else { + ElMessage.error(res?.msg ?? '编辑失败') + } + }) + .catch((err) => { + ElMessage.error(err?.response?.data?.msg ?? '编辑失败') + }) } } }) @@ -399,13 +407,19 @@ const editForm = (column: changeDataType) => { } const delForm = (column: changeDataType) => { - delInstitutionalListReq({ id: column.id }).then((res) => { - if (res.success) { - ElMessage.success('删除成功') - getInstitutionList() - refreshTreeData() - } - }) + delInstitutionalListReq({ id: column.id }) + .then((res) => { + if (res.success) { + ElMessage.success('删除成功') + getInstitutionList() + refreshTreeData() + } else { + ElMessage.error(res?.msg ?? '删除失败') + } + }) + .catch((err) => { + ElMessage.error(err?.response?.data?.msg ?? '删除失败') + }) } const treeRef = ref() const treeData = ref() diff --git a/ui/dasadmin/src/views/backend/RoleManagement/RoleManagement.vue b/ui/dasadmin/src/views/backend/RoleManagement/RoleManagement.vue index be4c1be1..143926ab 100644 --- a/ui/dasadmin/src/views/backend/RoleManagement/RoleManagement.vue +++ b/ui/dasadmin/src/views/backend/RoleManagement/RoleManagement.vue @@ -141,21 +141,24 @@ const submitForm = () => { if (res.success) { getRoleList() ElMessage.success('新增成功') + dialogVisible.value = false + } else { + ElMessage.error(res?.msg ?? '新增失败') } }) .catch((err) => { ElMessage.error(err?.response?.data?.msg ?? '新增失败') }) - dialogVisible.value = false } else if (dialogTitle.value === '编辑角色') { changeRoleListReq(formModel.value) .then((res) => { if (res.success) { getRoleList() ElMessage.success('编辑成功') + dialogVisible.value = false + } else { + ElMessage.error(res?.msg ?? '编辑失败') } - - dialogVisible.value = false }) .catch((err) => { ElMessage.error(err?.response?.data?.msg ?? '编辑失败') @@ -206,8 +209,8 @@ const originData = ref[]>() const addClick = () => { // 新增角色 dialogTitle.value = '新增角色' + formModel.value = JSON.parse(JSON.stringify(defaultFormModel)) formRef.value && formRef.value.clearValidate(Object.keys(defaultFormModel)) - formModel.value = defaultFormModel dialogVisible.value = true } const editForm = (formData: formDataType) => { @@ -222,6 +225,8 @@ const delForm = (formData: formDataType) => { if (res.success) { ElMessage.success('删除成功') getRoleList() + } else { + ElMessage.error(res?.msg ?? '删除失败') } }) .catch((err) => {