.

src/components/RightContent/AvatarDropdown.jsx

@@ -13,6 +13,7 @@ import myPath from '@/utils/myPath';
  */
 const loginOut = async () => {
   localStorage.removeItem('token');
+  localStorage.removeItem('orgId');
   const { query = {}, pathname } = history.location;
   const { redirect } = query;
   if (window.location.pathname !== '/user/login' && !redirect) {

src/pages/deleteLog/index.jsx

@@ -16,36 +16,31 @@ const formatterTime = (val) => {
 };
 
 export default (props) => {
-  const initDate = useRef(moment())
-  const deleteDateRef = useRef(moment())
   const { initialState } = useModel('@@initialState');
-  const [orgName,setOrgName]=useState('')
-
+  let orgId = localStorage.getItem('orgId');
 
-  const handleBeforSearch = (params) => {
-    const { createDate, deleteDate, ...others } = params;
+  const [orgName,setOrgName]=useState('')
 
-    let start, end;
-    if (!createDate || createDate.length < 1) {
-      // 默认时间是今天
-      start = moment().format('YYYY-MM-DD')
-      end = start
-    } else {
-      start = moment(createDate[0]).format('YYYY-MM-DD')
-      end = moment(createDate[1]).format('YYYY-MM-DD')
-    }
-    let deleteStart, deleteEnd;
-    if (!deleteDate || deleteDate.length < 1) {
-      // 默认时间是今天
-      deleteStart = moment().format('YYYY-MM-DD')
-      deleteEnd = deleteStart
-    } else {
-      deleteStart = moment(deleteDate[0]).format('YYYY-MM-DD')
-      deleteEnd = moment(deleteDate[1]).format('YYYY-MM-DD')
-    }
+  const [start, setStart] = useState()
+  const [end, setEnd] = useState()  
+  const [deleteStart, setdeleteStart] = useState()
+  const [deleteEnd, setdeleteEnd] = useState()
 
-    return { ...others, start, end, deleteStart, deleteEnd };
+  const handelChange = (date, dateStrings) => {
+    setStart(dateStrings[0])
+    setEnd(dateStrings[1])
   }
+  const handelDeleteChange = (date, dateStrings) => {
+    setdeleteStart(dateStrings[0])
+    setdeleteEnd(dateStrings[1])
+  }
+  const handleReset = () => {
+    setStart()
+    setEnd()
+    setdeleteStart()
+    setdeleteEnd()
+  }
+
   useEffect(()=>{
     if (initialState.currentUser.orgId) {
       getDetail(initialState.currentUser.orgId).then((res)=>{
@@ -83,7 +78,9 @@ export default (props) => {
       dataIndex: 'deleteDate',
       key: 'deleteDate',
       render: (t) => formatterTime(t),
-      renderFormItem: (_, record) => <RangePicker defaultValue={[deleteDateRef.current, deleteDateRef.current]} placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+      renderFormItem: (_, record) => 
+      <RangePicker onChange={handelChange} 
+      placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
     },
     {
       title: '申请人',
@@ -95,17 +92,17 @@ export default (props) => {
       dataIndex: 'createDate',
       key: 'createDate',
       render: (t) => formatterTime(t),
-      renderFormItem: (_, record) => <RangePicker defaultValue={[initDate.current, initDate.current]} placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+      renderFormItem: (_, record) => <RangePicker onChange={handelDeleteChange} placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
     },
   ]
-
   return (
     <PageHeaderWrapper>
       <PageTable
         columns={columns}
         request={getDeleteformList}
         options={false}
-        beforeSearchSubmit={handleBeforSearch}
+        params={{ start, end, deleteStart, deleteEnd,orgId }}        
+        onReset={handleReset}
         rowKey="formId"
       />
     </PageHeaderWrapper>

src/pages/resumework/abnormal/index.jsx

@@ -2,14 +2,14 @@ import React from 'react'
 import moment from 'moment';
 import { Badge, Image } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { getAbnormalList,getOrgAbnormalList } from '@/services/work'
+import { getAbnormalList } from '@/services/work'
 import PageTable from '@/components/PageTable'
 
 const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
 };
 export default (props) => {
-  let role = localStorage.getItem('roleAlias');
+  let orgId = localStorage.getItem('orgId');
   const columns = [
     {
       title: '企业名称',
@@ -65,7 +65,8 @@ export default (props) => {
     <PageHeaderWrapper>
       <PageTable
         columns={columns}
-        request={role=='admin'?getAbnormalList:getOrgAbnormalList}
+        request={getAbnormalList}
+        params={{orgId}}
         search={false}
         options={false}
         rowKey="formId"

src/pages/user/Login/index.jsx

@@ -19,6 +19,7 @@ const Login = () => {
       // 登录
       const { user, menu, report_url, roleAlias } = await login({ ...values, password: md5(values.password) });
       localStorage.setItem('roleAlias', roleAlias);
+      localStorage.setItem('orgId', user.orgId);
       await setInitialState((s) =>
       ({
         ...s,

src/services/work.js

@@ -8,19 +8,28 @@ export const getList = (params) => request('/resume-work-form', { params });
 export const exportList = (params) => request('/resume-work-form/export', { params });
 
 // 获取异常列表
-export const getAbnormalList = (params) =>
-  request(
+export const getAbnormalList = (params) =>{
+  if (params.orgId==null||params.orgId=='null') {
+    delete params.orgId
+    params.isAll=true
+  }
+  return request(
     `/resume-work-form?start=${moment(Date.now()).format('YYYY-MM-DD')}&end=${moment(
       Date.now(),
-    ).format('YYYY-MM-DD')}&isAll=true&isAbnormal=true`,
+    ).format('YYYY-MM-DD')}&isAbnormal=true`,
     { params },
   );
+    }
 // 获取删除列表
-export const getDeleteformList = (params) =>
-  request(
-    `/resume-work-form?isAll=true&isDelete=true`,
-    { params },
-  );
+export const getDeleteformList = (params) =>{
+  if (params.orgId==null||params.orgId=='null') {
+    delete params.orgId
+    params.isAll=true
+  }
+  return request(`/resume-work-form?isDelete=true`, {
+    params,
+  });
+}
 
 /**
  * 删除提交记录
@@ -28,13 +37,3 @@ export const getDeleteformList = (params) =>
  * @returns
  */
 export const deleteworkForm = (id) => request(`/resume-work-form/${id}`, { method: 'delete' });
-
-let orgId = localStorage.getItem('orgId');
-// 获取企业异常列表
-export const getOrgAbnormalList = (params) =>
-  request(
-    `/resume-work-form?start=${moment(Date.now()).format('YYYY-MM-DD')}&end=${moment(
-      Date.now(),
-    ).format('YYYY-MM-DD')}&orgId=${orgId}&isAbnormal=true`,
-    { params },
-  );