Merge branch 'feat-user-reset' into 'develop'

Feat user reset See merge request !2

Merge branch 'feat-user-reset' into 'develop'
Feat user reset See merge request !2
zhusen
2 parents 7311d332 5298311d
Showing 8 changed files with 98 additions and 22 deletions
src/api/project/account.ts
src/api/sys/user.ts
src/views/demo/system/password/index.vue
src/views/project/account/AccountModal.vue
src/views/project/account/account.data.ts → src/views/project/account/account.data.tsx
src/views/project/account/index.vue
src/views/project/order/tableData.tsx
tsconfig.json
@@ -6,6 +6,8 @@ enum Api {
   USER_ADD = '/order/erp/users/add',
   USER_EDIT = '/order/erp/users/edit',
   USER_DELETE = '/order/erp/users/delete',
+  USER_OPT = '/order/erp/users/opt',
+  USER_RESET_PASSWORD = '/order/erp/users/reset', // 管理员重置密码
 }
  
 export const getRoleList = async (params: any) => {
@@ -61,3 +63,23 @@ export const userDelete = async (params: any) =&gt; {
     params,
   });
 };
+
+export const userOpt = async (params: any) => {
+  return defHttp.post<any>(
+    {
+      url: Api.USER_OPT,
+      params,
+    },
+    { message: '操作成功' },
+  );
+};
+
+export const userResetPassword = async (params: any) => {
+  return defHttp.post<any>(
+    {
+      url: Api.USER_RESET_PASSWORD,
+      params,
+    },
+    { message: '重置密码成功' },
+  );
+};
@@ -10,7 +10,7 @@ enum Api {
   GetUserInfo = '/getUserInfo',
   GetPermCode = '/getPermCode',
   TestRetry = '/testRetry',
-  MODIFY_PASSWORD = '/order/erp/users/update_pass',
+  MODIFY_PASSWORD = '/order/erp/users/update_pass', // 用户修改自己的密码，不需要验证码
   FORGET_PASSWORD = '/order/erp/auth/password_modify',
   RESET = '/order/erp/users/reset',
   CAPTCHA = '/order/erp/captcha/get_img_captcha_code',
@@ -32,7 +32,7 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = &#39;modal&#39;) 
   );
 }
  
-export function MODIFY_PASSWORD(params: LoginParams, mode: ErrorMessageMode = 'modal') {
+export function modifyPassword(params: LoginParams, mode: ErrorMessageMode = 'modal') {
   return defHttp.post<LoginResultModel>(
     {
       url: Api.MODIFY_PASSWORD,
@@ -16,7 +16,7 @@
   import { useUserStoreWithOut } from '/@/store/modules/user';
  
   import { formSchema } from './pwd.data';
-  import { forgetPassword } from '/@/api/sys/user';
+  import { modifyPassword } from '/@/api/sys/user';
  
   export default defineComponent({
     name: 'ChangePassword',
@@ -38,7 +38,7 @@
  
           const userInfo = userStore.getUserInfo;
  
-          await forgetPassword({ ...values, userId: userInfo.id });
+          await modifyPassword({ ...values, userId: userInfo.id });
         } catch (error) {}
       }
  
@@ -62,3 +62,4 @@
     },
   });
 </script>
+./account.data.tsx4
 import { getRoleList } from '/@/api/project/account';
+import { Tag } from 'ant-design-vue';
  
 export const columns: BasicColumn[] = [
   {
@@ -27,6 +28,15 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
+    title: '状态',
+    dataIndex: 'status',
+    width: 200,
+    customRender: (column) => {
+      const { record } = column || {};
+      return record.status === 10 ? <Tag color="green">正常</Tag> : <Tag color="red">离职</Tag>;
+    },
+  },
+  {
     title: '备注',
     dataIndex: 'remark',
   },
@@ -19,16 +19,38 @@
                 // tooltip: '编辑用户资料',
                 onClick: handleEdit.bind(null, record),
               },
-              // {
-              //   icon: 'ant-design:delete-outlined',
-              //   color: 'error',
-              //   tooltip: '删除此账号',
-              //   popConfirm: {
-              //     title: '是否确认删除',
-              //     placement: 'left',
-              //     confirm: handleDelete.bind(null, record),
-              //   },
-              // },
+              {
+                label: '重置密码',
+                // tooltip: '编辑用户资料',
+                popConfirm: {
+                  title: '是否确认重置密码',
+                  placement: 'left',
+                  confirm: handleResetPassword.bind(null, record),
+                },
+              },
+              {
+                // icon: 'ant-design:delete-outlined',
+                color: 'error',
+                label: record.status === 10 ? '离职' : '启用',
+                popConfirm: {
+                  title:
+                    record.status === 10
+                      ? '是否确认离职该用户，离职用户无法通过忘记密码进行手机验证码修改密码。请管理员重置其账号密码并修改。'
+                      : '是否确认启用',
+                  placement: 'left',
+                  confirm: handleForbid.bind(null, record),
+                },
+              },
+              {
+                // icon: 'ant-design:delete-outlined',
+                color: 'error',
+                label: '删除',
+                popConfirm: {
+                  title: '是否确认删除',
+                  placement: 'left',
+                  confirm: handleDelete.bind(null, record),
+                },
+              },
             ]"
           />
         </template>
@@ -41,7 +63,13 @@
   import { defineComponent, reactive } from 'vue';
  
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { getUserList, userAdd, userEdit } from '/@/api/project/account';
+  import {
+    getUserList,
+    userAdd,
+    userEdit,
+    userOpt,
+    userResetPassword,
+  } from '/@/api/project/account';
   import { PageWrapper } from '/@/components/Page';
   import DeptTree from './DeptTree.vue';
  
@@ -58,7 +86,7 @@
       const go = useGo();
       const [registerModal, { openModal }] = useModal();
       const searchInfo = reactive({});
-      const [registerTable, { reload, updateTableDataRecord }] = useTable({
+      const [registerTable, { reload }] = useTable({
         title: '账号列表',
         api: getUserList,
         rowKey: 'id',
@@ -79,7 +107,7 @@
           return info;
         },
         actionColumn: {
-          width: 120,
+          width: 280,
           title: '操作',
           dataIndex: 'action',
           // slots: { customRender: 'action' },
@@ -92,7 +120,7 @@
         });
       }
  
-      function handleEdit(record: Recordable) {
+      function handleEdit(record) {
         console.log(record);
         openModal(true, {
           record,
@@ -100,8 +128,9 @@
         });
       }
  
-      function handleDelete(record: Recordable) {
-        console.log(record);
+      async function handleDelete(record) {
+        await userOpt({ ids: [record.id], optType: 20 });
+        reload();
       }
  
       async function handleSuccess({ isUpdate, values }) {
@@ -114,12 +143,22 @@
         reload();
       }
  
+      async function handleForbid(record) {
+        await userOpt({ ids: [record.id], optType: record.status === 10 ? 30 : 10 });
+        reload();
+      }
+
+      async function handleResetPassword(record) {
+        await userResetPassword({ userId: record.id });
+        // reload();
+      }
+
       function handleSelect(deptId = '') {
         searchInfo.deptId = deptId;
         reload();
       }
  
-      function handleView(record: Recordable) {
+      function handleView(record) {
         go('/system/account_detail/' + record.id);
       }
  
@@ -132,6 +171,8 @@
         handleSuccess,
         handleSelect,
         handleView,
+        handleForbid,
+        handleResetPassword,
         searchInfo,
       };
     },
@@ -1135,6 +1135,7 @@ export const FIELDS_INSPECTION_INFO = [
     component: 'Select',
     optionField: 'midCheckResult',
     label: '中期验货结果PASS / FAIL',
+    labelWidth: 400,
     // rules: [{ required: true }],
   },
   {
@@ -22,7 +22,8 @@
     "build/**/*.ts",
     "build/**/*.d.ts",
     "mock/**/*.ts",
-    "vite.config.ts"
+    "vite.config.ts",
+    "src/views/project/account/account.data.tsx4"
   ],
   "exclude": ["node_modules", "tests/server/**/*.ts", "dist", "**/*.js"]
 }