tangning пре 2 година
родитељ
комит
a79ce5fd4a

+ 4 - 4
src/api/staff/list.ts

@@ -8,9 +8,9 @@ enum Api {
   updatePassword = '/manage/service/manage/sysUser/rePassword',
   preDel = '/zfb-api/zfb/shop/sys/user/preDeleteStaff',
   roleList = '/zfb-api/zfb/shop/sys/user/roleList',
-  getRoleListByParam = '/zfb-api/zfb/shop/sys/user/getRoleListByParam',
-  staffSave = '/zfb-api/zfb/shop/sys/user/staffSave',
-  update = '/zfb-api/zfb/shop/sys/user/update',
+  getRoleListByParam = '/manage/service/manage/sysRole/allList',
+  staffSave = '/manage/service/manage/sysUser/add',
+  update = '/manage/service/manage/sysUser/update',
   checkUser = '/zfb-api/zfb/user/checkUserExists',
   deleteStaff = '/zfb-api/zfb/shop/sys/user/deleteStaff',
   getNumByStaff = '/zfb-api/zfb/shop/sys/user/getNumByStaff',
@@ -89,7 +89,7 @@ export const preDelApi = (params: number) =>
     },
   });
 export const getRoleListByParam = (params: roleParams) =>
-  defHttp.post<Result>({
+  defHttp.get<Result>({
     url: Api.getRoleListByParam,
     params,
     headers: {

+ 16 - 15
src/views/staff/detailsModal.vue

@@ -69,20 +69,21 @@
                   /* eslint-disable-next-line */
                   return Promise.reject(t('common.phoneError'));
                 }
-                try {
-                  if (title.value == '编辑') {
-                    return Promise.resolve();
-                  }
-                  let res = await checkUserApi({ phone: value });
-                  console.log('res', res, 'title', title.value);
-                  if (res == true) {
-                    return Promise.resolve();
-                  } else {
-                    return Promise.reject('手机号未在指房宝APP中进行注册');
-                  }
-                } catch (err) {
-                  return Promise.reject(err);
-                }
+                return Promise.resolve();
+                // try {
+                //   if (title.value == '编辑') {
+                //     return Promise.resolve();
+                //   }
+                //   let res = await checkUserApi({ phone: value });
+                //   console.log('res', res, 'title', title.value);
+                //   if (res == true) {
+                //     return Promise.resolve();
+                //   } else {
+                //     return Promise.reject('手机号未在指房宝APP中进行注册');
+                //   }
+                // } catch (err) {
+                //   return Promise.reject(err);
+                // }
               },
               trigger: 'change',
             },
@@ -219,7 +220,7 @@
               disabled: data.roleId == 2 ? false : data.id ? true : false,
               api: getRoleListByParam,
               labelField: 'roleName',
-              valueField: 'roleId',
+              valueField: 'id',
               params: {
                 type: data.roleId ? 1 : 0,
                 roleId: data.roleId,

+ 4 - 1
src/views/staff/list.vue

@@ -240,7 +240,10 @@
         openDetaileModal(true, {});
       }
       function handleEdit(record: Recordable) {
-        openDetaileModal(true, record);
+        openDetaileModal(true, {
+          ...record,
+          phone:record.userName,
+        });
       }
       function getNumByStaffData() {
         getNumByStaff({}).then((res) => {

+ 3 - 5
src/views/system/role/RoleDrawer.vue

@@ -53,16 +53,14 @@
 
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         resetFields();
-        console.log('data',data,roles)
         setDrawerProps({ confirmLoading: false });
         // 需要在setFieldsValue之前先填充treeData,否则Tree组件可能会报key not exist警告
         if (unref(treeData).length === 0) {
           const tData = (await getMenuList({roleId:unref(roles)})) as any as TreeMenuNode[];
-          console.log('getMenuList',tData)
-          treeData.value = makeMenuTree(tData);
-          console.log('makeMenuTree',treeData.value)
+          treeData.value = makeMenuTree(tData.list);
         }
         isUpdate.value = !!data?.isUpdate;
+        console.log('isUpdate',!!data?.isUpdate)
         updateSchema({
           field: 'status',
           ifShow: unref(isUpdate),
@@ -84,7 +82,7 @@
           const values = await validate();
           setDrawerProps({ confirmLoading: true });
           // let result;
-          console.log('values', values);
+          console.log('values', values,unref(isUpdate));
           if (!unref(isUpdate)) {
             await saveRoleApi(values);
           } else {