fix login issue

src/app.jsx

@@ -293,7 +293,7 @@ export const layout = async ({ initialState }) => {
     menu: {
 
       params: {
-        userId: initialState?.currentUser?.userid,
+        userId:initialState?.currentUser,
       },
       request: async (params, defaultMenuData) => {
         // initialState.currentUser 中包含了所有用户信息

src/pages/baseSetting/reportProjectSetting/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-09-18 11:44:42
+ * @LastEditTime: 2021-09-29 19:04:25
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -580,7 +580,7 @@ const ReportProjectSetting = () => {
                     // const resp = await getResponsibilityCenterList({pageSize:100,current:1});
                     return calcType == 4 ? (
                       <ProFormText
-                        label="计算公示"
+                        label="计算公式"
                         rules={[
                           {
                             required: true,

src/pages/baseSetting/visitsAndBedDayCostSetting/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-09-10 09:13:29
+ * @LastEditTime: 2021-09-29 19:10:16
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -37,7 +37,7 @@ const VisitsAndBedDayCostSetting = () => {
       key: 'incomeType',
       hideInSearch: true,
       ellipsis: true,
-      render: num => <>{num == 1 ? '门诊方式' : '住院方式'}</>
+      render: num => <>{num == 1 ? '门诊收入' : '住院收入'}</>
     },
     {
       title: '对应值',
@@ -100,7 +100,7 @@ const VisitsAndBedDayCostSetting = () => {
       dataIndex: 'shareParamName',
       key: 'shareParamName',
       hideInSearch: true,
-      ellipsis: true,
+
     },
     {
       title: '分摊参数代码',
@@ -117,7 +117,7 @@ const VisitsAndBedDayCostSetting = () => {
       dataIndex: 'reportName',
       key: 'reportName',
       hideInSearch: true,
-      ellipsis: true,
+
     },
     {
       title: '编号',
@@ -230,7 +230,6 @@ const VisitsAndBedDayCostSetting = () => {
     setIfcostCorresponding(bool);
     if(!edit)setDefaultReportTableSelected([].concat([]));
     if(bool&&edit){
-      console.log('成本');
       const {costFileType,costCorresponding} = dataById;
       setDefaultReportTableSelected([].concat([costCorresponding]));
       setActiveKey(`${costFileType}`);

src/pages/costAccounting/beforeCollectionSearch/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-09-10 09:15:16
+ * @LastEditTime: 2021-09-29 19:11:59
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -189,8 +189,7 @@ const BeforeCollectionSearch = () => {
   //获取列表
   const getList = async (params = {}, sort, filter) => {
     const {dateTime,responsibilityCode=[]}  = params;
-    // console.log(moment(dateTime).format('YYYY-MM'));
-    console.log({responsibilityCode});
+
     const res = await getBeforeIncomeCollectionList({ ...params,dateTime:moment(dateTime).format('YYYY-MM'),responsibilityCode:responsibilityCode[responsibilityCode.length-1]});
     if(res&&res.status){
       const { data: { totalAmount } } = res;
@@ -229,6 +228,7 @@ const BeforeCollectionSearch = () => {
         search={{
           defaultCollapsed: false,
           labelWidth: 'auto',
+          span:6
         }}
         footer={() => <a>{`合计：${totalCount}`}</a>}
 

src/pages/costAllocationParamsSetting/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-09-18 11:32:02
+ * @LastEditTime: 2021-09-29 19:14:25
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -44,7 +44,7 @@ const CostAllocationParamsSetting = () => {
       key: 'calcType',
       hideInSearch: true,
       ellipsis: true,
-      render: (text) => <>{text == 1 ? '手动填写' : '按对应会计科目计算'}</>,
+      render: (_,text) =>{return <>{text.calcType == 1 ? '手动填写' : '按对应会计科目计算'}</> },
     },
     {
       title:'操作',
@@ -94,7 +94,6 @@ const CostAllocationParamsSetting = () => {
       dataIndex: 'accountingCode',
       key: 'accountingCode',
       hideInSearch: true,
-      ellipsis: true,
     },
     {
       title: '会计科目名称',

src/pages/platformMana/roleManage/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-09-10 09:22:49
+ * @LastEditTime: 2021-09-29 19:07:26
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -105,7 +105,7 @@ const UserMana = () => {
       dataIndex: 'id',
       key: 'id',
       hideInSearch: true,
-      ellipsis: true,
+
     },
     {
       title: '姓名',
@@ -136,7 +136,7 @@ const UserMana = () => {
       dataIndex: 'menuId',
       key: 'menuId',
       hideInSearch: true,
-      ellipsis: true,
+ 
     },
     {
       title: '菜单名称',