更新登录提示/收入归集前页面渲染顺序

README.md

@@ -118,6 +118,8 @@ npm run start:dev //开发环境，不使用mock,所有数据通过代理接口
 #### 创建者有话说
 
 ```javascript
+
+//项目基于Antd Pro搭建
 //该项目运用了大量类似关系
 ...
     const [data,setData] = useSate<DataType>();

src/app.jsx

@@ -52,11 +52,15 @@ const loginParams = localStorage.getItem('loginParams');
 //医院标识
 let sign = '', isExpired = false;
 
-if (loginParams) {
-  const { hospSign, hospId } = JSON.parse(loginParams);
+if (hospSign) {
   sign = hospSign;
+}else{
+  //query里没有就从localstorage里找
+   const { hospSign } = JSON.parse(loginParams);
+   sign = hospSign;
 }
-const loginPath = `/user/login?hospSign=${hospSign}`;
+
+const loginPath = `/user/login?hospSign=${sign}`;
 
 let requestMethod = 'get';
 
@@ -95,15 +99,9 @@ export async function getInitialState() {
     }
   };
 
-  //医院标识
-  const sign = getQueryString('hospSign');
 
-  const fetchSubHosp = async () => {
-    // try {
-    //   const msg = await getSubHosp(sign);
-    // } catch (error) {
 
-    // }
+  const fetchSubHosp = async () => {
     return null
   }
 
@@ -228,6 +226,7 @@ const demoResponseInterceptors = async (response, options) => {
             duration: 5,
           });
         }
+        return;
       }
 
     }
@@ -247,12 +246,30 @@ const demoResponseInterceptors = async (response, options) => {
 
 
 
+const errorHandlerFunc = (error) => {
+  console.log({error});
+  
+  try {
+          
+          const { info } = error;
+          const errortext = '';
+          const { status, errorMessage } = info
+          notification.error({
+                  message: ` ${status?status:''}: ${errorMessage}`,
+                  description: errortext,
+          });
+
+  } catch (err) {
+          console.log({'errorHandlerFunc':err});
+          notification.error({
+                  message:'登录遇到未知错误，查看控制台！',
+          });
+  }
+};
+
 
 export const request = {
-  errorHandler: (error) => {
-    console.log({ error });
-    throw error;
-  },
+  errorHandler: errorHandlerFunc,
   // 新增自动添加AccessToken的请求前拦截器
   requestInterceptors: [authHeaderInterceptor],
   responseInterceptors: [demoResponseInterceptors],
@@ -293,7 +310,7 @@ export const layout = async ({ initialState }) => {
     menu: {
 
       params: {
-        userId:initialState?.currentUser,
+        userId:initialState,
       },
       request: async (params, defaultMenuData) => {
         // initialState.currentUser 中包含了所有用户信息

src/pages/costAccounting/beforeCollectionSearch/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-09-29 19:11:59
+ * @LastEditTime: 2021-12-01 15:32:50
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -25,7 +25,7 @@ import locale from 'antd/es/date-picker/locale/zh_CN';
 
 const BeforeCollectionSearch = () => {
 
-  const [currentTime, setCurrentTime] = useState(moment().format('YYYY-MM'));
+  const currentTime = moment().format('YYYY-MM');
   const [selectableResponsibilityList,setSelectableResponsibilityList] = useState([]);
   // const [selectableCostProjectList, setSelectableCostProjectList] = useState([])
 
@@ -51,9 +51,7 @@ const BeforeCollectionSearch = () => {
       title: '执行责任中心',
       key: 'responsibilityCode',
       hideInTable: true,
-      fieldProps:(form,config)=>{
-           console.log({form,config});
-      },
+      fieldProps:(form,config)=>{},
       dataIndex: 'responsibilityName',
       renderFormItem: (item, { type, defaultRender,formItemProps, fieldProps, ...rest }, form) => {
         // console.log({item,type, defaultRender,formItemProps, fieldProps,rest,form })
@@ -204,12 +202,18 @@ const BeforeCollectionSearch = () => {
   };
 
 
+  const getResponsibilityList = async ()=>{
+    const responsibilityList = await getResponsibilityCenterList({pageSize:500});
+    const {data:{list}} = responsibilityList;
+    setSelectableResponsibilityList(list);
+  }
 
 
-  useEffect(async () => {
-       const responsibilityList = await getResponsibilityCenterList({pageSize:500});
-       const {data:{list}} = responsibilityList;
-       setSelectableResponsibilityList(list);
+  useEffect(() => {
+    getResponsibilityList();
+    return () => {
+      setSelectableResponsibilityList([]); 
+    };
   }, []);
 
   return (

src/pages/user/Login/index.jsx

@@ -67,13 +67,12 @@ const Login = () => {
      
         message.success(defaultloginSuccessMessage);
 
-        if (!history) return;
+        if (!history){
+            location.href=redirect||'/';
+            return;
+        };
         const { query } = history.location;
         const { redirect } = query;
-  
-        // const resp = await getMenus();
-        // const {data:menu} = resp;
-        // await setInitialState((s) => ({ ...s,menu:menu}));
         history.push(redirect || '/');
         return;
       }else {
@@ -85,8 +84,6 @@ const Login = () => {
       setUserLoginState(data);
     } catch (error) {
       console.log({error});
-      const defaultloginFailureMessage = '登录失败，请重试！';
-      message.error(defaultloginFailureMessage);
     }
 
     setSubmitting(false);
@@ -94,20 +91,6 @@ const Login = () => {
   //登录类型
   const { status, type: loginType } = userLoginState;
 
-  useEffect(() => {
-
-    // fetchSubHosp().then(res => {
-    //   if (res&&res.success) {
-    //     const temp = res.map(item => ({
-    //       'value': item.id,
-    //       'label': item.name
-    //     }))
-    //     setSubHospList(temp);
-    //   }
-    // })
-  }, []);
-
-
   return (
     <div className={styles.container}>
       <div className={styles.content}>