权限

config/routes.js

@@ -78,7 +78,6 @@ export default [
   {
     path: '/deleteLog',
     name: '删除日志',
-    access:'admin',
     icon: 'ProfileOutlined',
     component: '@/pages/deleteLog',    
   },

src/pages/deleteLog/index.jsx

@@ -1,11 +1,13 @@
 
-import React, { useRef } from 'react'
+import React, { useRef,useState,useEffect } from 'react'
 import moment from 'moment';
-import { DatePicker } from 'antd';
+import { useModel } from 'umi';
+import { DatePicker,Input } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable'
 import OrgSearch from '@/components/OrgSearch';
 import { getDeleteformList } from '@/services/work'
+import { getDetail } from '@/services/org';
 
 const { RangePicker } = DatePicker;
 
@@ -16,6 +18,9 @@ const formatterTime = (val) => {
 export default (props) => {
   const initDate = useRef(moment())
   const deleteDateRef = useRef(moment())
+  const { initialState } = useModel('@@initialState');
+  const [orgName,setOrgName]=useState('')
+
 
   const handleBeforSearch = (params) => {
     const { createDate, deleteDate, ...others } = params;
@@ -41,6 +46,13 @@ export default (props) => {
 
     return { ...others, start, end, deleteStart, deleteEnd };
   }
+  useEffect(()=>{
+    if (initialState.currentUser.orgId) {
+      getDetail(initialState.currentUser.orgId).then((res)=>{
+        setOrgName(res.orgName);
+      })
+    }
+  },[initialState.currentUser.orgId])
 
   const columns = [
     {
@@ -50,7 +62,8 @@ export default (props) => {
       search: true,
       hideInTable: true,
       renderFormItem: () => (
-        <OrgSearch placeholder='请输入企业名称' />
+        !initialState.currentUser.orgId?
+        <OrgSearch placeholder='请输入企业名称' />:<Input readOnly value={orgName} />
       ),
     },
     {

src/pages/resumework/form/index.jsx

@@ -18,8 +18,7 @@ export default (props) => {
   const initDate = useRef(moment())
   const actionRef = useRef();
   const { initialState } = useModel('@@initialState');
-  const isorg=useRef(false)
-  const [orgName,setOrgName]=useState()
+  const [orgName,setOrgName]=useState('')
 
   const handleBeforSearch = (params) => {
     const { createDate, ...others } = params;
@@ -33,7 +32,7 @@ export default (props) => {
       start = moment(createDate[0]).format('YYYY-MM-DD')
       end = moment(createDate[1]).format('YYYY-MM-DD')
     }
-    if (isorg.current) {
+    if (initialState.currentUser.orgId) {
       orgId=initialState.currentUser.orgId
       return { ...others, start, end,orgId };
     }
@@ -49,16 +48,13 @@ export default (props) => {
     })
   }
   useEffect(()=>{
-    if (initialState.roleAlias == 'org') {
-      isorg.current=true
+    if (initialState.currentUser.orgId) {
       getDetail(initialState.currentUser.orgId).then((res)=>{
         setOrgName(res.orgName);
       })
-    }else{
-      setOrgName('');
     }
-  },[initialState.currentUser.orgId, initialState.roleAlias])
-
+  },[initialState.currentUser.orgId])
+  
   const columns = [
     {
       title: '企业名称',
@@ -67,10 +63,10 @@ export default (props) => {
       search: true,
       hideInTable:true,
       renderFormItem: () => (
-        !isorg.current?
+        !initialState.currentUser.orgId?
         <OrgSearch placeholder='请输入企业名称' />:<Input readOnly value={orgName} />
       ),
-      formItemProps: !isorg.current?{
+      formItemProps: !initialState.currentUser.orgId?{
         rules: [          
           {
             required: true,

src/utils/hooks/useFetchState.js

@@ -1,16 +0,0 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
-
-function useFetchState(...props) {
-  const focus = useRef();
-  const [state, setState] = useState(...props);
-  useEffect(() => {
-    focus.current = true;
-    return () => (focus.current = false);
-  }, []);
-  const setFetchState = useCallback((...params) => {
-    focus.current && setState(...params);
-  }, []);
-  return [state, setFetchState];
-}
-
-export default useFetchState;