diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index 71f69f4..055b8f5 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -62,10 +62,11 @@ export const resetUserPwd = (id: number, password: string) => { } // 用户状态修改 -export const updateUserStatus = (id: number, status: number) => { +export const updateUserStatus = (id: number, status: number, retireDate: string) => { const data = { id, - status + status, + retireDate } return request.put({ url: '/admin-api/system/user/update-status', data: data }) } diff --git a/src/views/Basic/User/UserForm.vue b/src/views/Basic/User/UserForm.vue index 967652d..0da1b62 100644 --- a/src/views/Basic/User/UserForm.vue +++ b/src/views/Basic/User/UserForm.vue @@ -85,6 +85,11 @@ + + + + + ({ username: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }], @@ -228,7 +234,8 @@ const resetForm = () => { status: CommonStatusEnum.ENABLE, roleIds: [], hireDate: formatDate(new Date(), 'YYYY-MM-DD'), - isNewUserConfirm: false + isNewUserConfirm: false, + wxAlias: '' } formRef.value?.resetFields() } diff --git a/src/views/Basic/User/index.vue b/src/views/Basic/User/index.vue index ad1753a..3ff35f9 100644 --- a/src/views/Basic/User/index.vue +++ b/src/views/Basic/User/index.vue @@ -50,6 +50,7 @@ + - + +