添加湖北兼容条件

config/oneapi.json

@@ -1,7 +1,7 @@
 {
   "openapi": "3.0.1",
   "info": {
-    "title": "Ant Design Pro",
+    "title": "",
     "version": "1.0.0"
   },
   "servers": [

src/app.tsx

@@ -179,6 +179,8 @@ const responseInterceptors = async (response: Response, options: responseInterce
     if (status == 200) {
       // 网络请求成功
       const _response = await response.clone().json();
+      const restext = await response.clone().text();
+      console.log({restext});
       const { status: dataStatus, errorCode, errorMessage, data } = _response;
       if (dataStatus == 200) {
 
@@ -307,12 +309,11 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
           }
 
           if (currentUser) {
-            const localMasterData = localStorage.getItem('initialState');
-
-            if (localMasterData) {
-              const { openedSysLists } = JSON.parse(localMasterData);
-              const currentSys = openedSysLists.filter((t:any) => t.name == '评审管理');
-              const systemId = currentSys.length > 0 ? currentSys[0].id : 0;
+            const currentSelectedTab = localStorage.getItem('currentSelectedTab');
+            
+            if (currentSelectedTab) {
+              const { menuId } = JSON.parse(currentSelectedTab);
+              const systemId = menuId;
               const data: any[] = await getMenus(systemId);
 
               if (data) {

src/components/MccsLightTable/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-24 09:43:04
- * @LastEditTime: 2022-06-21 15:01:04
+ * @LastEditTime: 2022-07-04 16:32:17
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /MedicalWisdomCheckSys/src/components/MccsLightTable/index.tsx
@@ -12,6 +12,7 @@ import type { MccsLightTableTypes } from './typings';
 import { Empty, Tooltip, Pagination } from 'antd';
 
 import './style.less';
+import { useModel } from 'umi';
 
 
 
@@ -27,6 +28,8 @@ const MccsLightTable: React.FC<{
     renderRow?: (data: any) => React.Component<any>,
 }> = props => {
 
+    const { initialState } = useModel('@@initialState');
+
     const {
         columns,
         renderRow,
@@ -68,10 +71,12 @@ const MccsLightTable: React.FC<{
 
     useEffect(() => {
         const _columns = columns.filter(item => !item.hideInTable);
+
         const hasSetWidColumns = _columns.filter(item => item.width);
         const needCountWidCloumnsNum = _columns.length - hasSetWidColumns.length;
         const widArray = hasSetWidColumns.map(item => item.width)
         const CountableWid = widArray.reduce((prev, curr) => (prev || 0) + (curr || 0), 0);
+
         // 初始化cell长度
         const a = _columns.map((item, index) => {
 
@@ -133,20 +138,29 @@ const MccsLightTable: React.FC<{
     
         const { pfmDataDirectoryList: list, gradeLevel: grade } = data;
         const _cpcolumns = Object.assign([], renderColumns);
-        _cpcolumns.splice(0, 1);  // 剔除第一个
+
+        if(initialState?.currentUser?.ruleVersion != 'HB202001') {
+            //非武汉医院
+            _cpcolumns.splice(0, 1);  // 剔除第一个
+        }
         
         const headWid = renderColumns[0] && renderColumns[0].width ? renderColumns[0].width : 0;
 
+        
+
         return (
             <div className='list' >
-                <div className='head' style={{ width: `${headWid}%` }}>{grade}</div>
-                <div className='headRelaData' style={{ position: 'relative', left: `${headWid}%` }}>
+                {initialState?.currentUser?.ruleVersion != 'HB202001'&&<div className='head' style={{ width: `${headWid}%` }}>{grade}</div>}
+                <div className='headRelaData' style={{ position: 'relative', left: `${initialState?.currentUser?.ruleVersion != 'HB202001'?headWid:0}%` }}>
                     {
                         (list).map((item: any, index: number) => {
+                             
+                            console.log({item});
                             return (
                                 <div className='subList' key={index}>
                                     {
                                         _cpcolumns.map((v: any, k: any) => {
+                                            // console.log({v,_cpcolumns,list});
                                             let cellValue = item[v.key];
                                             // 自定义value结果
                                             if (v.render) {

src/pages/GradeHospitalAccreditation/articleManagement/index.tsx

@@ -2,7 +2,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-14 10:22:09
- * @LastEditTime: 2022-06-17 16:16:01
+ * @LastEditTime: 2022-06-22 10:22:12
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/GradeHospitalAccreditation/articleManagement/index.tsx
@@ -81,8 +81,6 @@ const ArticleManagement: React.FC<ArticleManagementProps> = (props) => {
     
 
     const columns = [
-
-
         {
             key: 'keyword',
             hideInTable: true,
@@ -241,7 +239,6 @@ const ArticleManagement: React.FC<ArticleManagementProps> = (props) => {
             width: 100,
             valueType: 'option',
             render: (_: any, record: any) => {
-
                 return [<a key="1" onClick={() => openDetailInDrawer(record)}>详情</a>]
             },
         },

src/pages/GradeHospitalAccreditation/articleManagement/model.ts

@@ -2,7 +2,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-14 10:46:45
- * @LastEditTime: 2022-06-20 17:34:01
+ * @LastEditTime: 2022-06-22 10:17:27
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/GradeHospitalAccreditation/articleManagement/model.ts

src/pages/GradeHospitalAccreditation/ledgerUpload/index.tsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-14 10:22:09
- * @LastEditTime: 2022-06-17 16:18:06
+ * @LastEditTime: 2022-06-22 10:20:38
  * @LastEditors: code4eat awesomedema@gmail.com
  * @Description: In User Settings Edit
  * @FilePath: /MedicalWisdomCheckSys/src/pages/GradeHospitalAccreditation/articleManagement/index.tsx
@@ -35,17 +35,32 @@ const LedgerUpload: React.FC<LedgerUploadPropsType> = (props) => {
 
     const columns = [
         {
-            hideInTable: true,
-            renderFormItem: (item: any, { type }: any, form: any) => {
+            // hideInTable: true,
+            // renderFormItem: (item: any, { type }: any, form: any) => {
 
-                if (type === 'form') {
-                    return null;
-                }
-                return (
+            //     if (type === 'form') {
+            //         return null;
+            //     }
+            //     return (
 
-                    <ProFormDateRangePicker name='date' placeholder={['开始时间', '结束时间']} fieldProps={{ locale }} />
+            //         <ProFormDateRangePicker name={['date', 'dataRange']} placeholder={['开始时间', '结束时间']} fieldProps={{ locale }} />
 
-                )
+            //     )
+            // },
+            dataIndex: 'createTime',
+            key: 'createTime',
+            valueType: 'dateRange',
+            hideInTable: true,
+            fieldProps: {
+                placeholder: ['开始时间', '结束时间'],
+            },
+            search: {
+                transform: (value:any) => {
+                    return {
+                        startDate: value[0],
+                        endDate: value[1],
+                    };
+                },
             },
         },
         {
@@ -158,16 +173,16 @@ const LedgerUpload: React.FC<LedgerUploadPropsType> = (props) => {
         restLedgerUploadModelData.setDrawerVisible(visible);
     }
 
-    useEffect(()=>{
-        
-        const {drawerVisible} = restLedgerUploadModelData;
-        
+    useEffect(() => {
+
+        const { drawerVisible } = restLedgerUploadModelData;
+
         // 关闭抽屉时，取消编辑模式
-        if(!drawerVisible){
+        if (!drawerVisible) {
             restArticleManagementModelData.setEditMode(false);
         }
 
-    },[restLedgerUploadModelData.drawerVisible]);
+    }, [restLedgerUploadModelData.drawerVisible]);
 
     useEffect(() => {
         // 监听上传台账弹窗变化，更新本地drawer里台账记录
@@ -177,7 +192,7 @@ const LedgerUpload: React.FC<LedgerUploadPropsType> = (props) => {
 
     }, [restArticleManagementModelData.modalVisible]);
 
-    
+
     return (
         <React.Fragment>
             <ArticleManagementCopy
@@ -190,19 +205,19 @@ const LedgerUpload: React.FC<LedgerUploadPropsType> = (props) => {
                 visible={restLedgerUploadModelData.drawerVisible}
                 onVisibleChange={onVisibleChangeHandle}
                 headerStyle={{
-                    display:'none'
+                    display: 'none'
                 }}
                 noFormMode={true}
                 width={'60%'}
                 closable={!editMode}
-                footer={editMode?(<div className='diyFooter'>
-                    <Button type='default' style={{marginRight:10}} onClick={()=>restLedgerUploadModelData.setDrawerVisible(false)}>取消</Button>
-                    <Button type='primary' onClick={()=>restArticleManagementModelData.commitTaizhangImplementationHandle()}>保存</Button>
-                </div>):null}
+                footer={editMode ? (<div className='diyFooter'>
+                    <Button type='default' style={{ marginRight: 10 }} onClick={() => restLedgerUploadModelData.setDrawerVisible(false)}>取消</Button>
+                    <Button type='primary' onClick={() => restArticleManagementModelData.commitTaizhangImplementationHandle()}>保存</Button>
+                </div>) : null}
             >
                 <div className='leafContent'>
-                     {/* <DetailModule /> */}
-                     <ArticleDetail  />
+                    {/* <DetailModule /> */}
+                    <ArticleDetail />
                 </div>
             </MccsDrawerForm>
         </React.Fragment>

src/pages/user/Login/index.tsx

@@ -35,7 +35,8 @@ const Login: React.FC = () => {
   const setUserInfo = async (data: API.CurrentUserData) => {
    
       localStorage.setItem('userData',JSON.stringify(data));
-      const menuData = await getMenus();
+      const currentSelectedTab = localStorage.getItem('currentSelectedTab');
+      const menuData = await getMenus(JSON.parse(currentSelectedTab as string).id);
       await setInitialState((s) => ({
         ...s,
         currentUser: data,
@@ -59,7 +60,6 @@ const Login: React.FC = () => {
         await setUserInfo({...loginResult});
         /** 此方法会跳转到 redirect 参数所在的位置 */
         if (!history) {
-            console.log('history为false',history);
             location.href = '/'
         };
         const { query } = history.location;