fix incomeCostDataImport/afterCollectionSearch

src/components/CAUpload/index.jsx

@@ -6,8 +6,8 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Button, Upload, message, Modal, Divider, Menu, Dropdown } from 'antd';
 // import Cookies from 'js-cookie';
-// 服务器地址，此处为了做演示，没有全局引入，直接写了
-const Host = 'http://112.124.59.133:8082';
+// 服务器地址
+const Host = 'http://localhost:8082';
 
 
 

src/pages/baseSetting/reportProjectSetting/component/drawer.jsx

@@ -87,6 +87,7 @@ export default function DrawerContent(props) {
                         // 注释该行则默认不显示下拉选项
                         selections: [Table.SELECTION_ALL, Table.SELECTION_INVERT],
                         selectedRowKeys: selectedKeys,
+                        checkStrictly:false,
                         onChange: (selectedRowKeys, selectedRows) => {
                             setSelectedKeys(selectedRowKeys);
                         }

src/pages/baseSetting/visitsAndBedDayCostSetting/index.jsx

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
- * @LastEditTime: 2021-08-13 10:32:11
+ * @LastEditTime: 2021-08-13 10:40:26
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -292,8 +292,8 @@ const DistrictMana = () => {
             const { num: costCorresponding, reportName: costCorrespondingName,reportType:costFileType } = selectedCost;
             const data = { 
                allocation, incomeType, shareParamCode, shareParamName, incomeFieldNum,
-               incomeFileName:`[${reportTableTypes[incomeFileType]}]${incomeFileName}`,
-               costCorresponding, costCorrespondingName:`[${reportTableTypes[costFileType]}]${costCorrespondingName}`,
+               incomeFileName:`[${reportTableTypes[incomeFileType]}] ${incomeFileName}`,
+               costCorresponding, costCorrespondingName:`[${reportTableTypes[costFileType]}] ${costCorrespondingName}`,
                incomeFileType,costFileType}
             // console.log({data});
             const success = await addVisitsAndBedDayCostSettingList(data);

src/pages/costAccounting/afterCollectionSearch/index.jsx

@@ -1,7 +1,11 @@
 /*
  * @Author: your name
  * @Date: 2021-07-26 10:13:13
+<<<<<<< HEAD
  * @LastEditTime: 2021-08-13 15:47:16
+=======
+ * @LastEditTime: 2021-08-13 11:38:52
+>>>>>>> 374142147cfc35262bf45d74aed7a48605011ea5
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /TracerMethodology_PC/src/pages/UserMana/index.js
@@ -98,7 +102,7 @@ const AfterCollectionSearch = () => {
                 const resp = await getCostProjecttList({ pageSize: 100 });
                 const { status, data: { list } } = resp;
                 if (status == 200) {
-                  console.log({ resp, list });
+                
                   const arr = list.map(item => ({
                     'label': item.productName,
                     'value': item.productCode
@@ -196,9 +200,15 @@ const AfterCollectionSearch = () => {
 
   //获取列表
   const getList = async (params = {}, sort, filter) => {
+<<<<<<< HEAD
     const { dateTime } = params;
     console.log(moment(dateTime).format('yyyyMM'));
     const res = await getAfterIncomeCollectionList({ ...params, date: moment(dateTime).format('yyyyMM') });
+=======
+    const { date } = params;
+    console.log(moment(date).format('YYYY-MM'));
+    const res = await getAfterIncomeCollectionList({ ...params, date: moment(date).format('YYYYMM') });
+>>>>>>> 374142147cfc35262bf45d74aed7a48605011ea5
     if (res && res.status) {
       const { data: { totalAmount } } = res;
       setTotalCount(totalAmount);
@@ -273,7 +283,7 @@ const AfterCollectionSearch = () => {
         actionRef={actionRef}
         rowKey="id"
         toolBarRender={() => [
-          <Button type='primary' onClick={() => renderDrawerHandle()}>报表数据</Button>
+          <Button key='reportBtn' type='primary' onClick={() => renderDrawerHandle()}>报表数据</Button>
         ]}
         pagination={{
           pageSize: 10,
@@ -311,7 +321,7 @@ const AfterCollectionSearch = () => {
                 {
                   totalData.map((item, index) => {
                     return (
-                      <Table.Summary.Cell key={index}  className={index == 9 ? 'ant-table-cell ant-table-cell-fix-right ant-table-cell-fix-right-last' : 'cell'} index={index+1}>{item[1]}</Table.Summary.Cell>
+                      <Table.Summary.Cell key={index}  className={index == totalData.length-1 ? 'ant-table-cell ant-table-cell-fix-right ant-table-cell-fix-right-last' : 'cell'} index={index+1}>{item[1]}</Table.Summary.Cell>
                     )
                   })
                 }