李志伟 3 年之前
父節點
當前提交
0f67a0ddcb
共有 4 個文件被更改,包括 23 次插入31 次删除
  1. 0
    1
      config/routes.js
  2. 16
    3
      src/pages/deleteLog/index.jsx
  3. 7
    11
      src/pages/resumework/form/index.jsx
  4. 0
    16
      src/utils/hooks/useFetchState.js

+ 0
- 1
config/routes.js 查看文件

78
   {
78
   {
79
     path: '/deleteLog',
79
     path: '/deleteLog',
80
     name: '删除日志',
80
     name: '删除日志',
81
-    access:'admin',
82
     icon: 'ProfileOutlined',
81
     icon: 'ProfileOutlined',
83
     component: '@/pages/deleteLog',    
82
     component: '@/pages/deleteLog',    
84
   },
83
   },

+ 16
- 3
src/pages/deleteLog/index.jsx 查看文件

1
 
1
 
2
-import React, { useRef } from 'react'
2
+import React, { useRef,useState,useEffect } from 'react'
3
 import moment from 'moment';
3
 import moment from 'moment';
4
-import { DatePicker } from 'antd';
4
+import { useModel } from 'umi';
5
+import { DatePicker,Input } from 'antd';
5
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
6
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
6
 import PageTable from '@/components/PageTable'
7
 import PageTable from '@/components/PageTable'
7
 import OrgSearch from '@/components/OrgSearch';
8
 import OrgSearch from '@/components/OrgSearch';
8
 import { getDeleteformList } from '@/services/work'
9
 import { getDeleteformList } from '@/services/work'
10
+import { getDetail } from '@/services/org';
9
 
11
 
10
 const { RangePicker } = DatePicker;
12
 const { RangePicker } = DatePicker;
11
 
13
 
16
 export default (props) => {
18
 export default (props) => {
17
   const initDate = useRef(moment())
19
   const initDate = useRef(moment())
18
   const deleteDateRef = useRef(moment())
20
   const deleteDateRef = useRef(moment())
21
+  const { initialState } = useModel('@@initialState');
22
+  const [orgName,setOrgName]=useState('')
23
+
19
 
24
 
20
   const handleBeforSearch = (params) => {
25
   const handleBeforSearch = (params) => {
21
     const { createDate, deleteDate, ...others } = params;
26
     const { createDate, deleteDate, ...others } = params;
41
 
46
 
42
     return { ...others, start, end, deleteStart, deleteEnd };
47
     return { ...others, start, end, deleteStart, deleteEnd };
43
   }
48
   }
49
+  useEffect(()=>{
50
+    if (initialState.currentUser.orgId) {
51
+      getDetail(initialState.currentUser.orgId).then((res)=>{
52
+        setOrgName(res.orgName);
53
+      })
54
+    }
55
+  },[initialState.currentUser.orgId])
44
 
56
 
45
   const columns = [
57
   const columns = [
46
     {
58
     {
50
       search: true,
62
       search: true,
51
       hideInTable: true,
63
       hideInTable: true,
52
       renderFormItem: () => (
64
       renderFormItem: () => (
53
-        <OrgSearch placeholder='请输入企业名称' />
65
+        !initialState.currentUser.orgId?
66
+        <OrgSearch placeholder='请输入企业名称' />:<Input readOnly value={orgName} />
54
       ),
67
       ),
55
     },
68
     },
56
     {
69
     {

+ 7
- 11
src/pages/resumework/form/index.jsx 查看文件

18
   const initDate = useRef(moment())
18
   const initDate = useRef(moment())
19
   const actionRef = useRef();
19
   const actionRef = useRef();
20
   const { initialState } = useModel('@@initialState');
20
   const { initialState } = useModel('@@initialState');
21
-  const isorg=useRef(false)
22
-  const [orgName,setOrgName]=useState()
21
+  const [orgName,setOrgName]=useState('')
23
 
22
 
24
   const handleBeforSearch = (params) => {
23
   const handleBeforSearch = (params) => {
25
     const { createDate, ...others } = params;
24
     const { createDate, ...others } = params;
33
       start = moment(createDate[0]).format('YYYY-MM-DD')
32
       start = moment(createDate[0]).format('YYYY-MM-DD')
34
       end = moment(createDate[1]).format('YYYY-MM-DD')
33
       end = moment(createDate[1]).format('YYYY-MM-DD')
35
     }
34
     }
36
-    if (isorg.current) {
35
+    if (initialState.currentUser.orgId) {
37
       orgId=initialState.currentUser.orgId
36
       orgId=initialState.currentUser.orgId
38
       return { ...others, start, end,orgId };
37
       return { ...others, start, end,orgId };
39
     }
38
     }
49
     })
48
     })
50
   }
49
   }
51
   useEffect(()=>{
50
   useEffect(()=>{
52
-    if (initialState.roleAlias == 'org') {
53
-      isorg.current=true
51
+    if (initialState.currentUser.orgId) {
54
       getDetail(initialState.currentUser.orgId).then((res)=>{
52
       getDetail(initialState.currentUser.orgId).then((res)=>{
55
         setOrgName(res.orgName);
53
         setOrgName(res.orgName);
56
       })
54
       })
57
-    }else{
58
-      setOrgName('');
59
     }
55
     }
60
-  },[initialState.currentUser.orgId, initialState.roleAlias])
61
-
56
+  },[initialState.currentUser.orgId])
57
+  
62
   const columns = [
58
   const columns = [
63
     {
59
     {
64
       title: '企业名称',
60
       title: '企业名称',
67
       search: true,
63
       search: true,
68
       hideInTable:true,
64
       hideInTable:true,
69
       renderFormItem: () => (
65
       renderFormItem: () => (
70
-        !isorg.current?
66
+        !initialState.currentUser.orgId?
71
         <OrgSearch placeholder='请输入企业名称' />:<Input readOnly value={orgName} />
67
         <OrgSearch placeholder='请输入企业名称' />:<Input readOnly value={orgName} />
72
       ),
68
       ),
73
-      formItemProps: !isorg.current?{
69
+      formItemProps: !initialState.currentUser.orgId?{
74
         rules: [          
70
         rules: [          
75
           {
71
           {
76
             required: true,
72
             required: true,

+ 0
- 16
src/utils/hooks/useFetchState.js 查看文件

1
-import { useCallback, useEffect, useRef, useState } from 'react';
2
-
3
-function useFetchState(...props) {
4
-  const focus = useRef();
5
-  const [state, setState] = useState(...props);
6
-  useEffect(() => {
7
-    focus.current = true;
8
-    return () => (focus.current = false);
9
-  }, []);
10
-  const setFetchState = useCallback((...params) => {
11
-    focus.current && setState(...params);
12
-  }, []);
13
-  return [state, setFetchState];
14
-}
15
-
16
-export default useFetchState;