李志伟 3 年之前
父節點
當前提交
cfd51ba3de
共有 4 個檔案被更改,包括 15 行新增2 行删除
  1. 1
    0
      src/app.jsx
  2. 3
    2
      src/pages/resumework/abnormal/index.jsx
  3. 1
    0
      src/pages/user/orgLogin/index.jsx
  4. 10
    0
      src/services/work.js

+ 1
- 0
src/app.jsx 查看文件

30
   if (history.location.pathname !== loginPath) {
30
   if (history.location.pathname !== loginPath) {
31
     const res = await fetchUserInfo();
31
     const res = await fetchUserInfo();
32
     localStorage.setItem('roleAlias', res.roleAlias);
32
     localStorage.setItem('roleAlias', res.roleAlias);
33
+    localStorage.setItem('orgId', res.user.orgId);
33
     return {
34
     return {
34
       fetchUserInfo,
35
       fetchUserInfo,
35
       currentUser: res.user,
36
       currentUser: res.user,

+ 3
- 2
src/pages/resumework/abnormal/index.jsx 查看文件

2
 import moment from 'moment';
2
 import moment from 'moment';
3
 import { Badge, Image } from 'antd';
3
 import { Badge, Image } from 'antd';
4
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
4
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
5
-import { getAbnormalList } from '@/services/work'
5
+import { getAbnormalList,getOrgAbnormalList } from '@/services/work'
6
 import PageTable from '@/components/PageTable'
6
 import PageTable from '@/components/PageTable'
7
 
7
 
8
 const formatterTime = (val) => {
8
 const formatterTime = (val) => {
9
   return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
9
   return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
10
 };
10
 };
11
 export default (props) => {
11
 export default (props) => {
12
+  let role = localStorage.getItem('roleAlias');
12
   const columns = [
13
   const columns = [
13
     {
14
     {
14
       title: '企业名称',
15
       title: '企业名称',
64
     <PageHeaderWrapper>
65
     <PageHeaderWrapper>
65
       <PageTable
66
       <PageTable
66
         columns={columns}
67
         columns={columns}
67
-        request={getAbnormalList}
68
+        request={role=='admin'?getAbnormalList:getOrgAbnormalList}
68
         search={false}
69
         search={false}
69
         options={false}
70
         options={false}
70
         rowKey="formId"
71
         rowKey="formId"

+ 1
- 0
src/pages/user/orgLogin/index.jsx 查看文件

19
       // 登录
19
       // 登录
20
       const { user, menu, report_url, roleAlias } = await orgLogin({ ...values, password: md5(values.password) });
20
       const { user, menu, report_url, roleAlias } = await orgLogin({ ...values, password: md5(values.password) });
21
       localStorage.setItem('roleAlias', roleAlias);
21
       localStorage.setItem('roleAlias', roleAlias);
22
+      localStorage.setItem('orgId', user.orgId);
22
       await setInitialState((s) => ({ ...s, currentUser: user, menuAccess: menu, report_url: report_url, roleAlias: roleAlias }));
23
       await setInitialState((s) => ({ ...s, currentUser: user, menuAccess: menu, report_url: report_url, roleAlias: roleAlias }));
23
       message.success('登录成功!');
24
       message.success('登录成功!');
24
       /** 此方法会跳转到 redirect 参数所在的位置 */
25
       /** 此方法会跳转到 redirect 参数所在的位置 */

+ 10
- 0
src/services/work.js 查看文件

28
  * @returns
28
  * @returns
29
  */
29
  */
30
 export const deleteworkForm = (id) => request(`/resume-work-form/${id}`, { method: 'delete' });
30
 export const deleteworkForm = (id) => request(`/resume-work-form/${id}`, { method: 'delete' });
31
+
32
+let orgId = localStorage.getItem('orgId');
33
+// 获取企业异常列表
34
+export const getOrgAbnormalList = (params) =>
35
+  request(
36
+    `/resume-work-form?start=${moment(Date.now()).format('YYYY-MM-DD')}&end=${moment(
37
+      Date.now(),
38
+    ).format('YYYY-MM-DD')}&orgId=${orgId}&isAbnormal=true`,
39
+    { params },
40
+  );