diff --git a/src/pages/DataVerification/HistoricalAccounting/index.tsx b/src/pages/DataVerification/HistoricalAccounting/index.tsx index d748096..9052198 100644 --- a/src/pages/DataVerification/HistoricalAccounting/index.tsx +++ b/src/pages/DataVerification/HistoricalAccounting/index.tsx @@ -12,6 +12,7 @@ import useRequest from "@ahooksjs/use-request"; import { handleGetEndaccountHisList, handleGetServiceShopList } from "../service"; import { getFieldEnumTreeNoSession } from "@/services/options"; import moment from 'moment' +import { exportXlsxFromProColumnsExcelJS } from "@/utils/exportExcelFun"; const HistoricalAccounting: React.FC<{ currentUser: CurrentUser }> = (props) => { @@ -413,27 +414,29 @@ const HistoricalAccounting: React.FC<{ currentUser: CurrentUser }> = (props) => }} toolbar={{ actions: [ - - - , + // + // + // , - + {/*
*/} + {/* 处理状态: */} + {/* */} + {/*
*/} + {/*
*/} + {/* 异常类型: */} + {/* */} + {/*
*/} +
+ 经营模式: + +
+
+ 时间: + { + setSelectTime([moment(e[0]._d), moment(e[1]._d)]) + }} + />
-
- { - return { - onClick: () => { - setShowDrawer(true); - setCurrentRow(record) - }, - } - }} - > - +
+ +
+
+ { + return { + onClick: () => { + setShowDrawer(true); + setCurrentRow(record) + }, + } + }} + > + +
- { - setShowDrawer(false); - }} - destroyOnClose={true} - footer={ - currentRow?.Treatment_MarkState === 3 ? -
- -
- - -
-
: '' - } - > - -
- - ) + + { + setShowDrawer(false); + }} + destroyOnClose={true} + footer={ + currentRow?.Treatment_MarkState === 3 ? +
+ +
+ + +
+
: '' + } + > + +
+ + ) } export default connect(({ - user - }: ConnectState) => ({ + user +}: ConnectState) => ({ currentUser: user?.currentUser }))(List); diff --git a/src/pages/reports/audit/curDailyReport/index.tsx b/src/pages/reports/audit/curDailyReport/index.tsx index 854909a..6eac3f7 100644 --- a/src/pages/reports/audit/curDailyReport/index.tsx +++ b/src/pages/reports/audit/curDailyReport/index.tsx @@ -18,6 +18,7 @@ import * as numeral from "numeral"; import ProDescriptions from "@ant-design/pro-descriptions"; import PageTitleBox from "@/components/PageTitleBox"; import LeftSelectTree from "../../settlementAccount/component/leftSelectTree"; +import { exportXlsxFromProColumnsExcelJS } from "@/utils/exportExcelFun"; const curDailyReport: React.FC<{ currentUser: CurrentUser }> = (props) => { @@ -415,27 +416,36 @@ const curDailyReport: React.FC<{ currentUser: CurrentUser }> = (props) => { }} toolbar={{ actions: [ - - - , + // + // + // ,