diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..34a885d Binary files /dev/null and b/dist.zip differ diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx index ff0096d..7dbb21c 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx @@ -21,8 +21,8 @@ function ArrearageRecoverAly(props) { park_type: 0, date_type: "day", park_bussiness_type: 0, - start_time: moment().startOf("day").format('YYYY-MM-DD'), - end_time: moment().format('YYYY-MM-DD') + start_time: moment().subtract(1, 'days').format('YYYY-MM-DD'), + end_time: moment().subtract(1, 'days').format('YYYY-MM-DD') } const [formData, setFormData] = useState({ ...defaultFormData diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx index 0d54e82..03ee9d0 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx @@ -21,8 +21,8 @@ function CityArrearageAly(props) { park_type: 0, date_type: "day", park_bussiness_type: 0, - start_time: moment().startOf("day").format('YYYY-MM-DD'), - end_time: moment().format('YYYY-MM-DD') + start_time: moment().subtract(1, 'days').format('YYYY-MM-DD'), + end_time: moment().subtract(1, 'days').format('YYYY-MM-DD') } const [formData, setFormData] = useState({ ...defaultFormData diff --git a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx index 105ca9c..6648520 100644 --- a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx @@ -7,6 +7,7 @@ import { Tooltip, Checkbox, DatePicker, + Button } from "antd"; import { dictionary, utils } from "@/config/common"; import moment from "moment"; @@ -17,7 +18,7 @@ import { } from "@ant-design/icons"; import ajax from "@/services"; // import { useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks'; -import { ResultFlow } from "@/components"; +import { ResultFlow, ExportBtnNew } from "@/components"; import "./index.scss"; // import errorImg from "@/assets/images/layout/error.png" // import { useLocation } from "react-router-dom"; @@ -35,7 +36,7 @@ function ParkCardReport() { export: 0, page_size: dictionary?.pageSizeOptions1[0], }; - + const exportRef = useRef(null) const col = [ { title: "支付日期", @@ -303,17 +304,21 @@ function ParkCardReport() { document.body.removeChild(link); }; //导出 - const ReportPaySummaryReport = () => { + const ReportPaySummaryReport = (start, end) => { ajax.ElectInvoice.getParkCarOrder({ ...FormDatas, ...DateFormt(FormDatas.date_type), export: 1, + start: start, + end: end }).then( (res) => { if (parseInt(res?.status) === 20000) { Daownload(res?.data?.url); + exportRef.current.handleCancel() } else { message.error(res?.message); + exportRef.current.handleError() } }, (err) => { @@ -497,14 +502,26 @@ function ParkCardReport() {

共查询到 {Data?.total || 0}条数据

- { Data?.total && ReportPaySummaryReport(); }} > 导出 - + */} + 导出} + modalType="noImg" + ref={exportRef} + totalRecords={Data?.total} + imgno={false} + postdata={{ + formData: FormData + }} + isTableModule={true} + onOk={ReportPaySummaryReport} + />
diff --git a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx index 9d9b815..5e1e230 100644 --- a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx @@ -22,7 +22,7 @@ import { } from "@ant-design/icons"; import ajax from "@/services"; // import { useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks'; -import { ResultFlow } from "@/components"; +import { ResultFlow, ExportBtnNew } from "@/components"; import "./index.scss"; // import errorImg from "@/assets/images/layout/error.png" // import { useLocation } from "react-router-dom"; @@ -45,7 +45,7 @@ function PdaStat() { pn: 1, page_size: dictionary?.pageSizeOptions1[0], }; - + const exportRef = useRef(null) const col = [ { title: "日期", @@ -335,16 +335,20 @@ function PdaStat() { document.body.removeChild(link); }; //导出 - const ReportPaySummaryReport = () => { + const ReportPaySummaryReport = (start, end) => { ajax.ElectInvoice.getPdalist({ ...FormDatas, is_excel: 1, + start: start, + end: end }).then( (res) => { if (parseInt(res?.status) === 20000) { Daownload(res?.data?.url); + exportRef.current.handleCancel() } else { message.error(res?.message); + exportRef.current.handleError() } }, (err) => { @@ -580,14 +584,26 @@ function PdaStat() {

共查询到 {Data?.total || 0}条数据

- { Data?.total && ReportPaySummaryReport(); }} > 导出 - + */} + 导出} + modalType="noImg" + ref={exportRef} + totalRecords={Data?.total} + imgno={false} + postdata={{ + formData: FormData + }} + isTableModule={true} + onOk={ReportPaySummaryReport} + />
{ + const ReportPaySummaryReport = (start, end) => { ajax.ElectInvoice.getPayment({ ...FormDatas, ...DateFormt(FormDatas.date_type), export: 1, + start: start, + end: end }).then( (res) => { if (parseInt(res?.status) === 20000) { Daownload(res?.data?.url); + exportRef.current.handleCancel() } else { message.error(res?.message); + exportRef.current.handleError() } }, (err) => { @@ -577,14 +582,26 @@ function PreOrderReport() {

共查询到 {Data?.total || 0}条数据

- { Data?.total && ReportPaySummaryReport(); }} > 导出 - + */} + 导出} + modalType="noImg" + ref={exportRef} + totalRecords={Data?.total} + imgno={false} + postdata={{ + formData: FormData + }} + isTableModule={true} + onOk={ReportPaySummaryReport} + />
{zonji.map((ele) => {