调整请求方法逻辑/自评分数列表添加筛选

src/app.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-03 14:28:27
- * @LastEditTime: 2021-10-27 13:55:18
+ * @LastEditTime: 2021-10-27 17:18:48
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/app.tsx
@@ -27,8 +27,11 @@ const isDev = process.env.NODE_ENV === 'development';
 
 const loginPath = '/user/login';
 
+let ifStopNextRequest = false;
+
 let hospSign:any='';
 
+
 if(history){
   hospSign = history.location.query?.hospSign;
   if(!hospSign){
@@ -140,6 +143,12 @@ const authHeaderInterceptor = (url: string, options: RequestOptionsInit) => {
        const {token}:API.CurrentUserData = JSON.parse(userData);
        authHeader.token = token;
   }
+
+  if(ifStopNextRequest){
+        //token过期阻止下一步请求
+        throw new Error('token过期!');
+  }
+
   return {
     url: `${url}`,
     options: { ...options, interceptors: true, headers: authHeader },
@@ -160,6 +169,7 @@ const responseInterceptors = async (response: Response, options: RequestOptionsI
         const { status: dataStatus,errorCode,errorMessage,data} = _response;
         if(dataStatus == 200){
              //接口请求成功
+             ifStopNextRequest=false;
              if(requestMethod=='POST'&&url != "/api/pfm/login"){
                notification.success({
                 message:'操作成功！'
@@ -171,6 +181,7 @@ const responseInterceptors = async (response: Response, options: RequestOptionsI
              }
              return true;
         }else if(errorCode == 499){
+          ifStopNextRequest = true;
           Modal.confirm({
             title: '抱歉，登录已过期请重新登录！',
             onOk: () => {
@@ -194,8 +205,6 @@ const responseInterceptors = async (response: Response, options: RequestOptionsI
   }catch(error){
       console.log({error});    
   }
-  
-  return response;
 };
 
 

src/pages/GradeHospitalAccreditation/articleManagement/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-14 10:22:09
- * @LastEditTime: 2021-10-27 14:47:58
+ * @LastEditTime: 2021-10-27 15:08:06
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/GradeHospitalAccreditation/articleManagement/index.tsx
@@ -294,7 +294,7 @@ const ArticleManagement: React.FC<ArticleManagementProps> = (props) => {
                                 data={restModelData.uploadLedgerTypeList}
                             />
                         </Form.Item>
-                        {/* <ProFormDependency name={['tab']}>
+                        <ProFormDependency name={['tab']}>
                               {
                                   ({tab})=>{
                                     return tab&&tab.value.label == '制度'&&(
@@ -309,7 +309,7 @@ const ArticleManagement: React.FC<ArticleManagementProps> = (props) => {
                                     )
                                   }
                               }
-                        </ProFormDependency> */}
+                        </ProFormDependency>
                         <Form.Item name='files' rules={[
                             {
                                 required: true,

src/pages/GradeHospitalAccreditation/ledgerUpload/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-14 10:22:09
- * @LastEditTime: 2021-10-11 18:02:19
+ * @LastEditTime: 2021-10-27 17:23:43
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/GradeHospitalAccreditation/articleManagement/index.tsx
@@ -256,7 +256,7 @@ const LedgerUpload: React.FC<LedgerUploadPropsType> = (props) => {
                                 <MccsScoreBanner list={restLedgerUploadModelData.scoreList} />
                        
                                 <div style={{ marginTop: 5 }}>
-                                            <Tabs defaultActiveKey="1" centered size='large' onChange={(key) => setTabKey(key)}>
+                                            <Tabs defaultActiveKey="1" centered size='large' onChange={(key) => {key == '2'&&restLedgerUploadModelData.getSelectableSelfScoreList();setTabKey(key);}}>
                                                 <TabPane tab="台账记录" key="1">
                                                     <div className='articleSetBtn'>
                                                         <span onClick={()=>upLoadFileHandle()}>上传文件</span>

src/pages/GradeHospitalAccreditation/ledgerUpload/model.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-14 10:46:45
- * @LastEditTime: 2021-10-27 14:29:05
+ * @LastEditTime: 2021-10-27 17:21:57
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/GradeHospitalAccreditation/articleManagement/model.ts
@@ -124,7 +124,7 @@ const ledgerUpload = () => {
   useEffect(() => {
     //点击时获取对应详情
     getTableData();
-    getSelectableSelfScoreList();
+    // getSelectableSelfScoreList();
   }, [currentRecord]);
 
   useEffect(() => {
@@ -194,7 +194,8 @@ const ledgerUpload = () => {
     onSelfEvolutionTabChange,
     commitSelfEvolution,
     selectedSelfEvolution,
-    targetScores
+    targetScores,
+    getSelectableSelfScoreList
   };
 };