浏览代码

调整自评tab样式,更新禅道ID:10516,10515,10513,10512,10510

code4eat 3 年之前
父节点
当前提交
cb40da6ff9

+ 5 - 7
src/app.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-03 14:28:27
- * @LastEditTime: 2021-10-27 17:18:48
+ * @LastEditTime: 2021-10-28 15:16:09
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/app.tsx
@@ -144,10 +144,10 @@ const authHeaderInterceptor = (url: string, options: RequestOptionsInit) => {
        authHeader.token = token;
   }
 
-  if(ifStopNextRequest){
-        //token过期阻止下一步请求
-        throw new Error('token过期!');
-  }
+  // if(ifStopNextRequest){
+  //       //token过期阻止下一步请求
+  //       throw new Error('token过期!');
+  // }
 
   return {
     url: `${url}`,
@@ -169,7 +169,6 @@ 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:'操作成功!'
@@ -181,7 +180,6 @@ const responseInterceptors = async (response: Response, options: RequestOptionsI
              }
              return true;
         }else if(errorCode == 499){
-          ifStopNextRequest = true;
           Modal.confirm({
             title: '抱歉,登录已过期请重新登录!',
             onOk: () => {

+ 8 - 5
src/pages/DataManagement/publicData/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-23 08:49:14
- * @LastEditTime: 2021-10-28 09:52:27
+ * @LastEditTime: 2021-10-28 15:03:32
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/DataManagement/publicData/index.tsx
@@ -20,7 +20,7 @@ import { useModel } from 'umi';
 
 import './index.less'
 
-import { Form, Table, Space, Button, Popconfirm } from 'antd'
+import { Form, Table, Space, Button, Popconfirm,Card,Descriptions} from 'antd'
 
 
 import {
@@ -340,15 +340,19 @@ const PublicData: React.FC<PublicDataType> = (props) => {
         <MccsPageContainer>
             <MccsDrawerForm
                 title='关联条款'
-                width={600}
+                width={1000}
                 visible={drawerVisible}
                 onVisibleChange={onDrawerVisibleChangeHandle}
                 onFinish={drawerFormOnFinnish}
             >
                 <Form.Item>
+
                     <MccsTable
                         columns={drawerTableColumns}
-                        request={publicData.getDrawerTableList}
+                        request={async (params:any)=>{
+                              const ids = (selectedFiles.map((t:any)=>t.id)).join(',');
+                              return  await publicData.getDrawerTableList(params,ids)
+                        }} 
                         search={{
                             labelWidth: 0,
                             span: 10
@@ -371,7 +375,6 @@ const PublicData: React.FC<PublicDataType> = (props) => {
                                 </Space>
                             );
                         }}
-
                     >
 
                     </MccsTable>

+ 8 - 3
src/pages/DataManagement/publicData/model.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-23 09:02:09
- * @LastEditTime: 2021-10-28 09:20:56
+ * @LastEditTime: 2021-10-28 15:08:00
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/DataManagement/publicData/model.ts
@@ -93,13 +93,18 @@ const publicData = () => {
        }
   }
 
-  const getDrawerTableList = async (params:any) => {
-    const resp = await getAllAccreditionLevelFourList(params);
+  const getDrawerTableList = async (params:any,ids:string) => {
+    const resp = await getAllAccreditionLevelFourList({...params,id:ids});
     if (resp) {
       return {
         data: resp,
         success: true,
       };
+    }else{
+      return {
+        data: [],
+        success: true,
+      };
     }
   };
 

+ 3 - 4
src/pages/DataManagement/publicData/serve.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-23 09:04:27
- * @LastEditTime: 2021-09-29 18:40:55
+ * @LastEditTime: 2021-10-28 15:07:46
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/DataManagement/publicData/serve.ts
@@ -20,9 +20,8 @@ export const getTreeList  = (keyword?:string|number)=>{
 }
 
 //获取所有四码列表
-export const getAllAccreditionLevelFourList  = (params?:any)=>{
-  
-    return request('/api/pfm/publicresource/getNumStr', {
+export const getAllAccreditionLevelFourList  = (params:any)=>{
+    return request('/api/pfm/publicresource/getByPublicResourceId', {
         method: 'GET',
         params:{...params}
     });

+ 1 - 1
src/pages/GradeHospitalAccreditation/ledgerUpload/index.less

@@ -58,4 +58,4 @@
     font-weight: 400;
     color: #7A8599;
     margin-bottom:16px;
-  }
+}

+ 3 - 2
src/pages/GradeHospitalAccreditation/ledgerUpload/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-14 10:22:09
- * @LastEditTime: 2021-10-27 17:23:43
+ * @LastEditTime: 2021-10-28 15:18:44
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/GradeHospitalAccreditation/articleManagement/index.tsx
@@ -268,9 +268,10 @@ const LedgerUpload: React.FC<LedgerUploadPropsType> = (props) => {
                                                     />
                                                 </TabPane>
                                                 <TabPane tab="自评结果" key="2">
+                                                    <div className='selfEvolutionTitle'>开始自评</div>
                                                     <div className='selfEvolutionArea'>
-                                                        <div className='selfEvolutionTitle'>开始自评</div>
                                                         <MccsClickableTabs
+                                                            classNames='tabWrap'
                                                             onChange={(value:{label:string,value:any})=>restLedgerUploadModelData.onSelfEvolutionTabChange(value)}
                                                             data={restLedgerUploadModelData.targetScores}
                                                             value={restLedgerUploadModelData.selectedSelfEvolution}