diff --git a/src/views/pms/role/index.vue b/src/views/pms/role/index.vue index 25d55b0..8fafaee 100644 --- a/src/views/pms/role/index.vue +++ b/src/views/pms/role/index.vue @@ -202,41 +202,15 @@ async function handleEnable(row) { } } -const { - modalRef, - modalFormRef, - modalAction, - modalForm, - okLoading, - handleAdd, - handleDelete, - handleOpen, -} = useCrud({ - name: '角色', - doCreate: api.create, - doDelete: api.delete, - doUpdate: api.update, - initForm: { enable: true }, - refresh: () => $table.value?.handleSearch(), -}) - -function handleEdit(row) { - handleOpen({ action: 'edit', title: '修改角色', row, onSave }) -} - -async function onSave() { - await modalFormRef.value?.validate() - okLoading.value = true - try { - await api.update(modalForm.value) - okLoading.value = false - $message.success('保存成功') - $table.value?.handleSearch() - } catch (error) { - okLoading.value = false - return false - } -} +const { modalRef, modalFormRef, modalAction, modalForm, handleAdd, handleDelete, handleEdit } = + useCrud({ + name: '角色', + doCreate: api.create, + doDelete: api.delete, + doUpdate: api.update, + initForm: { enable: true }, + refresh: () => $table.value?.handleSearch(), + }) const permissionTree = ref([]) api.getAllPermissionTree().then(({ data = [] }) => (permissionTree.value = data)) diff --git a/src/views/pms/user/index.vue b/src/views/pms/user/index.vue index 1a428ff..edacf24 100644 --- a/src/views/pms/user/index.vue +++ b/src/views/pms/user/index.vue @@ -223,7 +223,7 @@ const columns = [ size: 'small', type: 'primary', style: 'margin-left: 12px;', - onClick: () => handleOpen({ action: 'reset', title: '重置密码', row, onSave }), + onClick: () => handleOpen({ action: 'reset', title: '重置密码', row, onOk: onSave }), }, { default: () => '重置密码', @@ -267,7 +267,7 @@ function handleOpenRolesSet(row) { action: 'setRole', title: '分配角色', row: { id: row.id, username: row.username, roleIds }, - onSave, + onOk: onSave, }) }