调整数据报表展示

src/app.jsx

@@ -292,7 +292,6 @@ export const layout = async ({ initialState }) => {
     },
     menu: {
 
-
       params: {
         userId: initialState?.currentUser?.userid,
       },
@@ -303,6 +302,7 @@ export const layout = async ({ initialState }) => {
           //开发环境或超级账号
           return []
         }
+    
         if (currentUser) {
           const resp = await getMenus();
           const { data: menu } = resp;

src/menuIcons.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-08-05 15:54:27
- * @LastEditTime: 2021-08-05 16:46:29
+ * @LastEditTime: 2021-08-30 14:00:06
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /CostAccountManaSys/src/menuIcons.js
@@ -20,6 +20,8 @@ import { SmileOutlined,
      AccountBookOutlined,
      ControlOutlined,
      CrownOutlined,
+     ToolOutlined,
+     TableOutlined
 } from '@ant-design/icons';
 
 const iconEnum = {
@@ -28,6 +30,8 @@ const iconEnum = {
   picLeft: <PicLeftOutlined />,
   setting: <SettingOutlined />,
   crown:<CrownOutlined />,
+  tool:<ToolOutlined />,
+  TableOutlined:<TableOutlined />,
   NodeExpandOutlined:<NodeExpandOutlined />,
   BorderOuterOutlined:<BorderOuterOutlined />,
   CopyrightOutlined:<CopyrightOutlined />,

src/pages/accountingSubjectConnect/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-28 10:32:49
+ * @LastEditTime: 2021-08-30 15:50:56
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -16,7 +16,7 @@ import { DrawerForm } from '@ant-design/pro-form';
 
 import { getAccountProductConnectList,getAccountProductConnectableList,saveAccountProductConnected } from './service';
 
-const ResponsibilityCenterConnect = () => {
+const AccountingSubjectConnect = () => {
   const columns = [
     {
       title: '会计科目名称',
@@ -244,4 +244,4 @@ const ResponsibilityCenterConnect = () => {
   );
 };
 
-export default ResponsibilityCenterConnect;
+export default AccountingSubjectConnect;

src/pages/baseSetting/reportProjectSetting/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-28 16:28:25
+ * @LastEditTime: 2021-08-30 17:35:45
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -43,7 +43,7 @@ import {reportTypes} from '@/projectConstant';
 
 import {deepGetAllParents} from '@/utils';
 
-const IncomeCollectionSetting = () => {
+const ReportProjectSetting = () => {
   const columns = [
     {
       title: '报表项目名',
@@ -274,7 +274,7 @@ const IncomeCollectionSetting = () => {
       const res = await getAccountingSubjectList({ ...params, accountType });
       const opendedArr = deepGetAllParents(res.data.list,'children');
       opendedArr&&setDefaultExpandedKeys(opendedArr.map(item=>item.accountingCode));
-      
+
       return {
         data: res.data.list,
         total: res.data.totalCount,
@@ -553,7 +553,7 @@ const IncomeCollectionSetting = () => {
             },
           };
         }}
-        onVisibleChange={(bool) => setDrawerVisible(bool)}
+        onVisibleChange={(bool) => {!bool&&setAccountType(1);setDrawerVisible(bool)}}
         renderListFunc={getTableList}
         config={{ tableSearch: false, rowKeys: settingType == 1 ? 'accountingCode' :settingType==2?'id':'responsibilityCode' }}
         onFinishFunc={async (value, selectedRowKeys) => {
@@ -618,4 +618,4 @@ const IncomeCollectionSetting = () => {
   );
 };
 
-export default IncomeCollectionSetting;
+export default ReportProjectSetting;

src/pages/baseSetting/visitsAndBedDayCostSetting/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-28 10:41:01
+ * @LastEditTime: 2021-08-30 15:53:18
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -21,7 +21,7 @@ import { getVisitsAndBedDayCostSettingList, delVisitsAndBedDayCostSettingList, a
 import { getCostshareparamList } from '@/pages/costAllocationParamsSetting/service';
 import { getReportProjectSettingList } from '@/pages/baseSetting/reportProjectSetting/service';
 
-const DistrictMana = () => {
+const VisitsAndBedDayCostSetting = () => {
   const columns = [
     {
       title: '分配方式',
@@ -587,4 +587,4 @@ const DistrictMana = () => {
   );
 };
 
-export default DistrictMana;
+export default VisitsAndBedDayCostSetting;

src/pages/costAccounting/afterCollectionSearch/index.jsx

@@ -2,7 +2,7 @@
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
 
- * @LastEditTime: 2021-08-28 10:42:58
+ * @LastEditTime: 2021-08-31 10:46:51
 
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
@@ -31,7 +31,9 @@ const AfterCollectionSearch = () => {
   const [currentTime, setCurrentTime] = useState(moment(new Date()).subtract(1,'months').format('YYYY-MM'));
   const [selectableResponsibilityList, setSelectableResponsibilityList] = useState([]);
   const [selectedResponsibilityCode,setSelectedResponsibilityCode] = useState(null);
-  const [selectedAccountingCode,setSelectedAccountingCode] = useState(null)
+  const [selectedAccountingCode,setSelectedAccountingCode] = useState(null);
+  const [windowH,setWindowH] = useState(500);
+  const [windowW,setWindowW] = useState(1500);
   
   // const [selectableCostProjectList, setSelectableCostProjectList] = useState([])
 
@@ -240,7 +242,7 @@ const AfterCollectionSearch = () => {
             key: item[0],
             fixed:index == 0?'left':'right',
             hideInSearch: true,
-            width: 100,
+            width: 150,
           }
         }
         return {
@@ -248,10 +250,10 @@ const AfterCollectionSearch = () => {
           dataIndex: item[0],
           key: item[0],
           hideInSearch: true,
-          width: 500,
+          width: 150,
         }
       });
-      
+      setWindowW((columns.length)*150);
       setReportTableColumns(columns);
       setTotalData(totalMapToArr);
 
@@ -269,6 +271,7 @@ const AfterCollectionSearch = () => {
     const responsibilityList = await getResponsibilityCenterList({ pageSize: 50 });
     const { data: { list } } = responsibilityList;
     setSelectableResponsibilityList(list);
+    setWindowH(window.document.body.clientHeight-300);
   }, []);
 
   return (
@@ -309,7 +312,7 @@ const AfterCollectionSearch = () => {
           bordered
           pagination={false}
           search={false}
-          scroll={{ x: 1500, y: 300 }}
+          scroll={{ x:windowW, y:windowH }}
           summary={() => (
             <Table.Summary fixed >
               <Table.Summary.Row className="rowCell">

src/pages/costAccounting/afterCostShareSearch/index.jsx

@@ -2,7 +2,7 @@
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
 
- * @LastEditTime: 2021-08-28 19:08:04
+ * @LastEditTime: 2021-08-31 10:43:53
 
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
@@ -26,12 +26,13 @@ import 'moment/locale/zh-cn';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 import './index.less';
 
-const AfterCollectionSearch = () => {
+const AfterCostShareSearch = () => {
 
   const [currentTime, setCurrentTime] = useState(moment(new Date()).subtract(1,'months').format('YYYY-MM'));
   const [selectableResponsibilityList, setSelectableResponsibilityList] = useState([]);
   const [selectedResponsibilityCode,setSelectedResponsibilityCode] = useState(null);
-
+  const [windowH,setWindowH] = useState(500);
+  const [windowW,setWindowW] = useState(1500);
   const [selectableAccountingSubjectList,setSelectableAccountingSubjectList] = useState([]);
   
   // const [selectableCostProjectList, setSelectableCostProjectList] = useState([])
@@ -106,30 +107,35 @@ const AfterCollectionSearch = () => {
       dataIndex: 'levelName',
       key: 'levelName',
       hideInSearch: true,
+      ellipsis: true,
     },
     {
       title: '责任中心编码',
       dataIndex: 'responsibilityCode',
       key: 'responsibilityCode',
       hideInSearch: true,
+      ellipsis: true,
     },
     {
       title: '责任中心名',
       dataIndex: 'responsibilityName',
       key: 'responsibilityName',
       hideInSearch: true,
+      ellipsis: true,
     },
     {
       title: '会计科目编码',
       dataIndex: 'accountingCode',
       key: 'accountingCode',
       hideInSearch: true,
+      ellipsis: true,
     },
     {
       title: '会计科目名',
       dataIndex: 'accountingName',
       key: 'accountingName',
       hideInSearch: true,
+      ellipsis: true,
     },
     {
       title: '金额',
@@ -173,8 +179,6 @@ const AfterCollectionSearch = () => {
   const renderDrawerHandle = () => {
    
       setDrawerVisible(true);
-
-    
   }
 
   const getReportData = async (params = {}, sort, filter)=>{
@@ -194,7 +198,7 @@ const AfterCollectionSearch = () => {
             key: item[0],
             fixed:index == 0?'left':'right',
             hideInSearch: true,
-            width: 100,
+            width: 150,
           }
         }
         return {
@@ -202,10 +206,10 @@ const AfterCollectionSearch = () => {
           dataIndex: item[0],
           key: item[0],
           hideInSearch: true,
-          width: 500,
+          width: 150,
         }
       });
-      
+      setWindowW((columns.length)*150);
       setReportTableColumns(columns);
       setTotalData(totalMapToArr);
 
@@ -228,6 +232,9 @@ const AfterCollectionSearch = () => {
     const { data: { list } } = responsibilityList;
     setSelectableResponsibilityList(list);
     await getAllAccountingSubjectForSearch();
+
+    setWindowH(window.document.body.clientHeight-300);
+    
   }, []);
 
   return (
@@ -268,7 +275,7 @@ const AfterCollectionSearch = () => {
           bordered
           pagination={false}
           search={false}
-          scroll={{ x: 1500, y: 300 }}
+          scroll={{ x: windowW, y:windowH }}
           summary={() => (
             <Table.Summary fixed >
               <Table.Summary.Row className="rowCell">
@@ -292,4 +299,4 @@ const AfterCollectionSearch = () => {
   );
 };
 
-export default AfterCollectionSearch;
+export default AfterCostShareSearch;

src/pages/costAccounting/beforeCollectionSearch/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-28 15:01:12
+ * @LastEditTime: 2021-08-30 15:54:46
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -23,7 +23,7 @@ import moment from 'moment';
 import 'moment/locale/zh-cn';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 
-const IncomeCostDataImport = () => {
+const BeforeCollectionSearch = () => {
 
   const [currentTime, setCurrentTime] = useState(moment().format('YYYY-MM'));
   const [selectableResponsibilityList,setSelectableResponsibilityList] = useState([]);
@@ -227,4 +227,4 @@ const IncomeCostDataImport = () => {
   );
 };
 
-export default IncomeCostDataImport;
+export default BeforeCollectionSearch;

src/pages/costAccounting/beforeCostShareSearch/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-20 13:42:30
+ * @LastEditTime: 2021-08-30 15:50:18
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -14,7 +14,6 @@ import { PageContainer } from '@ant-design/pro-layout';
 import ProTable from '@ant-design/pro-table';
 import {
   ProFormDatePicker,
-  ProFormSelect,
 } from '@ant-design/pro-form';
 import { getBeforeCostShareSearchList } from './service';
 import { getResponsibilityCenterList } from '@/pages/responsibilityCenter/service';
@@ -23,7 +22,7 @@ import moment from 'moment';
 import 'moment/locale/zh-cn';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 
-const IncomeCostDataImport = () => {
+const BeforeCostShareSearch = () => {
 
   const [currentTime, setCurrentTime] = useState(moment().format('YYYY-MM'));
   const [selectableResponsibilityList,setSelectableResponsibilityList] = useState([]);
@@ -121,36 +120,42 @@ const IncomeCostDataImport = () => {
       dataIndex: 'departCode',
       key: 'departCode',
       hideInSearch: true,
+      ellipsis: true,
     },
     {
       title: '科室名称',
       dataIndex: 'departName',
       key: 'departName',
       hideInSearch: true,
+      ellipsis: true,
     },
     {
       title: '责任中心编码',
       dataIndex: 'responsibilityCode',
       key: 'responsibilityCode',
       hideInSearch: true,
+      ellipsis: true,
     },
     {
       title: '责任中心名称',
       dataIndex: 'responsibilityName',
       key: 'responsibilityName',
       hideInSearch: true,
+      ellipsis: true,
     },
     {
       title: '会计科目编码',
       dataIndex: 'accountCode',
       key: 'accountCode',
       hideInSearch: true,
+      ellipsis: true,
     },
     {
       title: '会计科目名称',
       dataIndex: 'accountName',
       key: 'accountName',
       hideInSearch: true,
+      ellipsis: true,
     },
     {
       title: '成本项目编码',
@@ -235,4 +240,4 @@ const IncomeCostDataImport = () => {
   );
 };
 
-export default IncomeCostDataImport;
+export default BeforeCostShareSearch;

src/pages/costAccounting/costShareReportTable/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-28 20:58:27
+ * @LastEditTime: 2021-08-30 15:55:35
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -28,7 +28,7 @@ const {host} = envConfig;
 const Host = host;
 
 
-const CostShare = () => {
+const CostShareReportTable = () => {
 
   const [currentTime, setCurrentTime] = useState(moment(new Date()).subtract(1, 'months').format('YYYY-MM'));
 
@@ -191,4 +191,4 @@ const CostShare = () => {
   );
 };
 
-export default CostShare;
+export default CostShareReportTable;

src/pages/costAccounting/departmentCostCalculate/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-28 14:55:58
+ * @LastEditTime: 2021-08-30 15:55:57
  * @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 CostShare = () => {
+const DepartmentCostCalculate = () => {
 
   const [currentTime, setCurrentTime] = useState(moment(new Date()).subtract(1, 'months').format('YYYY-MM'));
   const [selectableResponsibilityList, setSelectableResponsibilityList] = useState([]);
@@ -190,4 +190,4 @@ const CostShare = () => {
   );
 };
 
-export default CostShare;
+export default DepartmentCostCalculate;

src/pages/costAccounting/wholeHospCostCalculate/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-28 14:21:39
+ * @LastEditTime: 2021-08-30 15:56:33
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -28,7 +28,7 @@ const {host} = envConfig;
 const Host = host;
 
 
-const CostShare = () => {
+const WholeHospCostCalculate = () => {
 
   const [currentTime, setCurrentTime] = useState(moment(new Date()).subtract(1, 'months').format('YYYY-MM'));
 
@@ -165,4 +165,4 @@ const CostShare = () => {
   );
 };
 
-export default CostShare;
+export default WholeHospCostCalculate;

src/pages/costAllocationParamsSetting/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-28 10:54:43
+ * @LastEditTime: 2021-08-30 15:57:21
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -21,7 +21,7 @@ import {deepGetAllParents} from '@/utils';
 import { getCostshareparamList, editCostshareparamList, delCostshareparam, addCostshareparam,updateCostShareParamByAccountId } from './service';
 import { getAccountingSubjectList} from '../accountingSubject/service';
 
-const DepartmentMana = () => {
+const CostAllocationParamsSetting = () => {
   const columns = [
 
     {
@@ -457,4 +457,4 @@ const DepartmentMana = () => {
   );
 };
 
-export default DepartmentMana;
+export default CostAllocationParamsSetting;

src/pages/costProjectMana/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-16 20:33:16
+ * @LastEditTime: 2021-08-30 15:57:46
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -21,7 +21,7 @@ import {
   addCostProject,importExcel
 } from './service';
 
-const DepartmentMana = () => {
+const CostProjectMana = () => {
   const columns = [
 
     {
@@ -246,4 +246,4 @@ const DepartmentMana = () => {
   );
 };
 
-export default DepartmentMana;
+export default CostProjectMana;