From 19e42703daa659f413b49570640b37cc7fbf9b1d Mon Sep 17 00:00:00 2001 From: chenqiang Date: Wed, 1 Nov 2023 13:37:07 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E6=94=B9=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=97=A5=E6=9C=9F=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinancialReport/BookReport/loadable.jsx | 90 +++++++++---- .../FinancialReport/OperationReport/loadable.jsx | 102 +++++++++++---- .../FinancialReport/ParkCardReport/loadable.jsx | 83 ++++++++---- .../ParkingIncomeReport/loadable.jsx | 90 +++++++++---- .../FinancialReport/PayChannelStat/loadable.jsx | 111 ++++++++++++---- .../FinancialReport/PaySummaryReport/loadable.jsx | 140 +++++++++++++++------ .../FinancialReport/PdaStat/loadable.jsx | 83 ++++++++---- .../FinancialReport/PreOrderReport/loadable.jsx | 87 +++++++++---- .../Invoice/CreateInvoice/loadable.jsx | 39 ++++-- .../Invoice/CreateInvoiceRecord/loadable.jsx | 39 ++++-- .../SettleBill/AbnormalPayment/loadable.jsx | 39 ++++-- .../FinancialMgm/SettleBill/BillDiff/loadable.jsx | 41 +++--- .../SettleBill/GeneralBusiness/loadable.jsx | 39 ++++-- .../FinancialMgm/SettleBill/PayRepeat/loadable.jsx | 41 +++--- 14 files changed, 735 insertions(+), 289 deletions(-) diff --git a/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx index d53199f..afaa4b0 100644 --- a/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx @@ -40,7 +40,7 @@ function BookReport() { time_type: "1", start_time: moment().startOf("day").format("YYYY-MM-DD"), end_time: moment().endOf("day").format("YYYY-MM-DD"), - pn: "1", + pn: 1, page_size: "15", }; //页面检索-退款 @@ -48,9 +48,10 @@ function BookReport() { sell_name: "", type: 2, time_class: "1", //日期类型 + time_type: "1", start_time: moment(new Date()).format("YYYY-MM-DD"), end_time: moment(new Date()).format("YYYY-MM-DD"), - pn: "1", + pn: 1, page_size: "15", }; let form_data = sessionStorage.getItem("FormData_BookReport"); @@ -284,15 +285,44 @@ function BookReport() { const TimeChange = () => { let e = FormData.time_type; let str = "day"; + let mat = "YYYY-MM-DD"; if (e == 4) { str = "year"; + mat = "YYYY"; } else if (e == 3) { str = "month"; + mat = "YYYY-MM"; } else if (e == 2) { str = "week"; + mat = "YYYY-MM-DD"; + } + return { str, mat }; + }; + //切换时间变化 + const SetTimeNow = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment().format("YYYY"); + end = moment().format("YYYY"); + } else if (e == 3) { + start = moment().format("YYYY-MM"); + end = moment().format("YYYY-MM"); + } else if (e == 2) { + start = moment().day(1).format("YYYY-MM-DD"); + end = moment().day(7).format("YYYY-MM-DD"); + } else { + start = moment().startOf("day").format("YYYY-MM-DD"); + end = moment().endOf("day").format("YYYY-MM-DD"); } - return str; + setFormData({ + ...FormData, + time_type: e, + start_time: start, + end_time: end, + }); }; + //时间 const onChangeData = (dates, dataString) => { if (Picker == "week") { @@ -310,17 +340,22 @@ function BookReport() { } }; //页码 - function onShowSizeChange(pn, pn_size) { - setFormData({ - ...FormData, - pn: pn, - page_size: pn_size, - }); - setFormDatas({ - ...FormDatas, - pn: pn, - page_size: pn_size, - }); + function onShowSizeChange(pn, page_size) { + let temFormData = {}; + if (FormData.page_size == page_size) { + temFormData = { + ...FormData, + pn, + }; + } else { + temFormData = { + ...FormData, + pn: 1, + page_size, + }; + } + setFormData(temFormData); + setFormDatas(temFormData); } const onChange = (eal) => { var e = eal; @@ -575,12 +610,7 @@ function BookReport() { label: "年", }, ]} - onChange={(e) => { - setFormData({ - ...FormData, - time_type: e, - }); - }} + onChange={(e) => SetTimeNow(e)} /> @@ -588,11 +618,12 @@ function BookReport() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, start_time: date @@ -613,11 +644,12 @@ function BookReport() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, end_time: date @@ -648,7 +680,15 @@ function BookReport() { { - setFormDatas({ ...FormData }); + var fortm = FormData; + setFormData({ + ...fortm, + pn: 1, + }); + setFormDatas({ + ...fortm, + pn: 1, + }); }} > 查询 diff --git a/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx index 589323d..e6eac10 100644 --- a/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx @@ -42,13 +42,13 @@ function OperationReport() { operator_id: "0", //商户 name: "", //停车场名称 park_type: "", //车场类型 1=路内 2=路外 - operator_status: [0], //商用状态(1为待上线，2为商用，3为试运营，4为下线) + operator_status: [], //商用状态(1为待上线，2为商用，3为试运营，4为下线) area: [5910983100858368], date_type: "1", is_excel: 0, start_time: moment().startOf("day").format("YYYY-MM-DD"), end_time: moment().endOf("day").format("YYYY-MM-DD"), - pn: "1", + pn: 1, page_size: "15", }; //图新展示 @@ -173,6 +173,9 @@ function OperationReport() { dataIndex: "park_type", key: "park_type", align: "center", + render: (_, record) => { + return _ == 1 ? "路内车场" : "路外车场"; + }, }, { title: ( @@ -190,7 +193,7 @@ function OperationReport() { key: "road_rate", align: "center", render: (_, record) => { - return _ && _ + "%"; + return _ ? _ + "%" : "0%"; }, }, { @@ -198,6 +201,15 @@ function OperationReport() { dataIndex: "operator_status", key: "operator_status", align: "center", + render: (_, record) => { + var str = ""; + if (_) { + str = + sysConfig?.operatorStatus?.filter((ele) => ele.value == _)[0] + ?.label || ""; + } + return str; + }, }, ], }, @@ -391,28 +403,61 @@ function OperationReport() { const TimeChange = () => { let e = FormData.date_type; let str = "day"; + let mat = "YYYY-MM-DD"; if (e == 4) { str = "year"; + mat = "YYYY"; } else if (e == 3) { str = "month"; + mat = "YYYY-MM"; } else if (e == 2) { str = "week"; + mat = "YYYY-MM-DD"; } - return str; + return { str, mat }; }; - - //页码 - function onShowSizeChange(pn, pn_size) { + //切换时间变化 + const SetTimeNow = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment().format("YYYY"); + end = moment().format("YYYY"); + } else if (e == 3) { + start = moment().format("YYYY-MM"); + end = moment().format("YYYY-MM"); + } else if (e == 2) { + start = moment().day(1).format("YYYY-MM-DD"); + end = moment().day(7).format("YYYY-MM-DD"); + } else { + start = moment().startOf("day").format("YYYY-MM-DD"); + end = moment().endOf("day").format("YYYY-MM-DD"); + } setFormData({ ...FormData, - pn: pn, - page_size: pn_size, - }); - setFormDatas({ - ...FormDatas, - pn: pn, - page_size: pn_size, + date_type: e, + start_time: start, + end_time: end, }); + }; + + //页码 + function onShowSizeChange(pn, page_size) { + let temFormData = {}; + if (FormData.page_size == page_size) { + temFormData = { + ...FormData, + pn, + }; + } else { + temFormData = { + ...FormData, + pn: 1, + page_size, + }; + } + setFormData(temFormData); + setFormDatas(temFormData); } const onChange = (eal) => { var e = eal; @@ -613,12 +658,7 @@ function OperationReport() { label: "年", }, ]} - onChange={(e) => { - setFormData({ - ...FormData, - date_type: e, - }); - }} + onChange={(e) => SetTimeNow(e)} /> @@ -626,11 +666,12 @@ function OperationReport() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, start_time: date @@ -651,11 +692,12 @@ function OperationReport() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, end_time: date @@ -780,7 +822,7 @@ function OperationReport() { mode="multiple" maxTagCount={2} placeholder="请选择" - options={sysConfig.operatorStatus} + options={sysConfig.operatorStatus.slice(1)} onChange={(e) => setFormData({ ...FormData, @@ -804,7 +846,15 @@ function OperationReport() { { - setFormDatas({ ...FormData }); + var fortm = FormData; + setFormData({ + ...fortm, + pn: 1, + }); + setFormDatas({ + ...fortm, + pn: 1, + }); }} > 查询 diff --git a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx index 7773161..6f8007f 100644 --- a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx @@ -28,7 +28,7 @@ function ParkCardReport() { time_type: "1", start_time: moment().startOf("day").format("YYYY-MM-DD"), end_time: moment().endOf("day").format("YYYY-MM-DD"), - pn: "1", + pn: 1, page_size: "15", }; @@ -168,27 +168,61 @@ function ParkCardReport() { const TimeChange = () => { let e = FormData.time_type; let str = "day"; + let mat = "YYYY-MM-DD"; if (e == 4) { str = "year"; + mat = "YYYY"; } else if (e == 3) { str = "month"; + mat = "YYYY-MM"; } else if (e == 2) { str = "week"; + mat = "YYYY-MM-DD"; } - return str; + return { str, mat }; }; - //页码 - function onShowSizeChange(pn, pn_size) { + //切换时间变化 + const SetTimeNow = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment().format("YYYY"); + end = moment().format("YYYY"); + } else if (e == 3) { + start = moment().format("YYYY-MM"); + end = moment().format("YYYY-MM"); + } else if (e == 2) { + start = moment().day(1).format("YYYY-MM-DD"); + end = moment().day(7).format("YYYY-MM-DD"); + } else { + start = moment().startOf("day").format("YYYY-MM-DD"); + end = moment().endOf("day").format("YYYY-MM-DD"); + } setFormData({ ...FormData, - pn: pn, - page_size: pn_size, - }); - setFormDatas({ - ...FormDatas, - pn: pn, - page_size: pn_size, + time_type: e, + start_time: start, + end_time: end, }); + }; + + //页码 + function onShowSizeChange(pn, page_size) { + let temFormData = {}; + if (FormData.page_size == page_size) { + temFormData = { + ...FormData, + pn, + }; + } else { + temFormData = { + ...FormData, + pn: 1, + page_size, + }; + } + setFormData(temFormData); + setFormDatas(temFormData); } const onChange = (eal) => { var e = eal; @@ -306,12 +340,7 @@ function ParkCardReport() { label: "年", }, ]} - onChange={(e) => { - setFormData({ - ...FormData, - time_type: e, - }); - }} + onChange={(e) => SetTimeNow(e)} /> @@ -319,11 +348,12 @@ function ParkCardReport() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, start_time: date @@ -344,11 +374,12 @@ function ParkCardReport() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, end_time: date @@ -379,7 +410,15 @@ function ParkCardReport() { { - setFormDatas({ ...FormData }); + var fortm = FormData; + setFormData({ + ...fortm, + pn: 1, + }); + setFormDatas({ + ...fortm, + pn: 1, + }); }} > 查询 diff --git a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx index 573c28b..1bf4eb6 100644 --- a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx @@ -39,14 +39,14 @@ function ParkingIncomeReport() { const formdata = { operator_id: "0", //商户 park_type: "", //车场类型 - operator_status: [0], //状态 + operator_status: [], //状态 name: "", //停车场名称 area: [5910983100858368], date_type: "1", start_time: moment().startOf("day").format("YYYY-MM-DD"), end_time: moment().endOf("day").format("YYYY-MM-DD"), is_excel: 0, - pn: "1", + pn: 1, page_size: "15", }; @@ -342,14 +342,42 @@ function ParkingIncomeReport() { const TimeChange = () => { let e = FormData.date_type; let str = "day"; + let mat = "YYYY-MM-DD"; if (e == 4) { str = "year"; + mat = "YYYY"; } else if (e == 3) { str = "month"; + mat = "YYYY-MM"; } else if (e == 2) { str = "week"; + mat = "YYYY-MM-DD"; } - return str; + return { str, mat }; + }; + //切换时间变化 + const SetTimeNow = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment().format("YYYY"); + end = moment().format("YYYY"); + } else if (e == 3) { + start = moment().format("YYYY-MM"); + end = moment().format("YYYY-MM"); + } else if (e == 2) { + start = moment().day(1).format("YYYY-MM-DD"); + end = moment().day(7).format("YYYY-MM-DD"); + } else { + start = moment().startOf("day").format("YYYY-MM-DD"); + end = moment().endOf("day").format("YYYY-MM-DD"); + } + setFormData({ + ...FormData, + date_type: e, + start_time: start, + end_time: end, + }); }; //获取数据 @@ -386,17 +414,22 @@ function ParkingIncomeReport() { }; //页码 - function onShowSizeChange(pn, pn_size) { - setFormData({ - ...FormData, - pn: pn, - page_size: pn_size, - }); - setFormDatas({ - ...FormDatas, - pn: pn, - page_size: pn_size, - }); + function onShowSizeChange(pn, page_size) { + let temFormData = {}; + if (FormData.page_size == page_size) { + temFormData = { + ...FormData, + pn, + }; + } else { + temFormData = { + ...FormData, + pn: 1, + page_size, + }; + } + setFormData(temFormData); + setFormDatas(temFormData); } const onChange = (eal) => { var e = eal; @@ -566,12 +599,7 @@ function ParkingIncomeReport() { label: "年", }, ]} - onChange={(e) => { - setFormData({ - ...FormData, - date_type: e, - }); - }} + onChange={(e) => SetTimeNow(e)} /> @@ -579,11 +607,12 @@ function ParkingIncomeReport() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, start_time: date @@ -604,11 +633,12 @@ function ParkingIncomeReport() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, end_time: date @@ -734,7 +764,7 @@ function ParkingIncomeReport() { mode="multiple" maxTagCount={2} placeholder="请选择" - options={sysConfig.operatorStatus} + options={sysConfig.operatorStatus.slice(1)} onChange={(e) => setFormData({ ...FormData, @@ -758,7 +788,15 @@ function ParkingIncomeReport() { { - setFormDatas({ ...FormData }); + var fortm = FormData; + setFormData({ + ...fortm, + pn: 1, + }); + setFormDatas({ + ...fortm, + pn: 1, + }); }} > 查询 diff --git a/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx index f792c19..2489177 100644 --- a/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx @@ -36,7 +36,7 @@ function PayChannelStat() { type: "1", start_time: moment().startOf("day").format("YYYY-MM-DD"), end_time: moment().endOf("day").format("YYYY-MM-DD"), - pn: "1", + pn: 1, page_size: "15", }; @@ -346,14 +346,61 @@ function PayChannelStat() { const TimeChange = () => { let e = FormData.type; let str = "day"; + let mat = "YYYY-MM-DD"; if (e == 4) { str = "year"; + mat = "YYYY"; } else if (e == 3) { str = "month"; + mat = "YYYY-MM"; } else if (e == 2) { str = "week"; + mat = "YYYY-MM-DD"; } - return str; + return { str, mat }; + }; + //切换时间变化 + const SetTimeNow = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment().format("YYYY"); + end = moment().format("YYYY"); + } else if (e == 3) { + start = moment().format("YYYY-MM"); + end = moment().format("YYYY-MM"); + } else if (e == 2) { + start = moment().day(1).format("YYYY-MM-DD"); + end = moment().day(7).format("YYYY-MM-DD"); + } else { + start = moment().startOf("day").format("YYYY-MM-DD"); + end = moment().endOf("day").format("YYYY-MM-DD"); + } + setFormData({ + ...FormData, + type: e, + start_time: start, + end_time: end, + }); + }; + //数据上传 + const DateFormt = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment(FormData.start_time).startOf("year").format("YYYY-MM-DD"); + end = moment(FormData.end_time).endOf("year").format("YYYY-MM-DD"); + } else if (e == 3) { + start = moment(FormData.start_time).startOf("month").format("YYYY-MM-DD"); + end = moment(FormData.end_time).endOf("month").format("YYYY-MM-DD"); + } else { + start = FormData.start_time; + end = FormData.end_time; + } + return { + start_time: start, + end_time: end, + }; }; //数据展示处理 const WorkShow = (data) => { @@ -382,17 +429,22 @@ function PayChannelStat() { ]); }; //页码 - function onShowSizeChange(pn, pn_size) { - setFormData({ - ...FormData, - pn: pn, - page_size: pn_size, - }); - setFormDatas({ - ...FormDatas, - pn: pn, - page_size: pn_size, - }); + function onShowSizeChange(pn, page_size) { + let temFormData = {}; + if (FormData.page_size == page_size) { + temFormData = { + ...FormData, + pn, + }; + } else { + temFormData = { + ...FormData, + pn: 1, + page_size, + }; + } + setFormData(temFormData); + setFormDatas(temFormData); } const onChange = (eal) => { var e = eal; @@ -454,7 +506,11 @@ function PayChannelStat() { //获取页面显示数据 const getData = (data) => { setLoading(false); - ajax.ElectInvoice.getChannellist({ ...data, type: TimeChange() }).then( + ajax.ElectInvoice.getChannellist({ + ...data, + ...DateFormt(data.type), + type: TimeChange().str, + }).then( (res) => { if (parseInt(res?.status) === 20000) { setData({ @@ -532,12 +588,7 @@ function PayChannelStat() { label: "年", }, ]} - onChange={(e) => { - setFormData({ - ...FormData, - type: e, - }); - }} + onChange={(e) => SetTimeNow(e)} /> @@ -545,11 +596,12 @@ function PayChannelStat() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, start_time: date @@ -570,11 +622,12 @@ function PayChannelStat() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, end_time: date @@ -605,7 +658,15 @@ function PayChannelStat() { { - setFormDatas({ ...FormData }); + var fortm = FormData; + setFormData({ + ...fortm, + pn: 1, + }); + setFormDatas({ + ...fortm, + pn: 1, + }); }} > 查询 diff --git a/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx index 0ad53d9..71fc91f 100644 --- a/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx @@ -38,10 +38,10 @@ function PaySummaryReport() { const formdata = { operator_id: "0", //商户 type: "1", - start: moment().startOf("day").format("YYYY-MM-DD"), - end: moment().endOf("day").format("YYYY-MM-DD"), - pn: "1", - page_size: "15", + start_time: moment().startOf("day").format("YYYY-MM-DD"), + end_time: moment().endOf("day").format("YYYY-MM-DD"), + // pn: 1, + // page_size: "15", }; const tabt = [ { @@ -221,27 +221,79 @@ function PaySummaryReport() { const TimeChange = () => { let e = FormData.type; let str = "day"; + let mat = "YYYY-MM-DD"; if (e == 4) { str = "year"; + mat = "YYYY"; } else if (e == 3) { str = "month"; + mat = "YYYY-MM"; } else if (e == 2) { str = "week"; + mat = "YYYY-MM-DD"; } - return str; + return { str, mat }; }; - //页码 - function onShowSizeChange(pn, pn_size) { + //切换时间变化 + const SetTimeNow = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment().format("YYYY"); + end = moment().format("YYYY"); + } else if (e == 3) { + start = moment().format("YYYY-MM"); + end = moment().format("YYYY-MM"); + } else if (e == 2) { + start = moment().day(1).format("YYYY-MM-DD"); + end = moment().day(7).format("YYYY-MM-DD"); + } else { + start = moment().startOf("day").format("YYYY-MM-DD"); + end = moment().endOf("day").format("YYYY-MM-DD"); + } setFormData({ ...FormData, - pn: pn, - page_size: pn_size, - }); - setFormDatas({ - ...FormDatas, - pn: pn, - page_size: pn_size, + type: e, + start_time: start, + end_time: end, }); + }; + //数据上传 + const DateFormt = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment(FormData.start_time).startOf("year").format("YYYY-MM-DD"); + end = moment(FormData.end_time).endOf("year").format("YYYY-MM-DD"); + } else if (e == 3) { + start = moment(FormData.start_time).startOf("month").format("YYYY-MM-DD"); + end = moment(FormData.end_time).endOf("month").format("YYYY-MM-DD"); + } else { + start = FormData.start_time; + end = FormData.end_time; + } + return { + start_time: start, + end_time: end, + }; + }; + //页码 + function onShowSizeChange(pn, page_size) { + let temFormData = {}; + if (FormData.page_size == page_size) { + temFormData = { + ...FormData, + pn, + }; + } else { + temFormData = { + ...FormData, + pn: 1, + page_size, + }; + } + setFormData(temFormData); + setFormDatas(temFormData); } const onChange = (eal) => { var e = eal; @@ -311,8 +363,9 @@ function PaySummaryReport() { //导出 const ReportPaySummaryReport = () => { ajax.ElectInvoice.ReportPaySummaryReport({ - ...FormDatas, - type: TimeChange(), + ...data, + ...DateFormt(data.type), + type: TimeChange().str, }).then( (res) => { if (parseInt(res?.status) === 20000) { @@ -347,7 +400,11 @@ function PaySummaryReport() { //获取页面显示数据 const getData = (data) => { setLoading(false); - ajax.ElectInvoice.getPaySummaryReport({ ...data, type: TimeChange() }).then( + ajax.ElectInvoice.getPaySummaryReport({ + ...data, + ...DateFormt(data.type), + type: TimeChange().str, + }).then( (res) => { if (parseInt(res?.status) === 20000) { setData({ @@ -426,12 +483,7 @@ function PaySummaryReport() { label: "年", }, ]} - onChange={(e) => { - setFormData({ - ...FormData, - type: e, - }); - }} + onChange={(e) => SetTimeNow(e)} /> @@ -439,22 +491,23 @@ function PaySummaryReport() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, - start: date + start_time: date ? moment(date).day(1).format("YYYY-MM-DD") : null, }); } else { - setFormData({ ...FormData, start: dateString }); + setFormData({ ...FormData, start_time: dateString }); } }} - disabledDate={(current) => current > moment(FormData.end)} + disabledDate={(current) => current > moment(FormData.end_time)} /> @@ -464,22 +517,25 @@ function PaySummaryReport() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, - end: date + end_time: date ? moment(date).day(7).format("YYYY-MM-DD") : null, }); } else { - setFormData({ ...FormData, end: dateString }); + setFormData({ ...FormData, end_time: dateString }); } }} - disabledDate={(current) => current < moment(FormData.start)} + disabledDate={(current) => + current < moment(FormData.start_time) + } /> @@ -516,7 +572,15 @@ function PaySummaryReport() { { - setFormDatas({ ...FormData }); + var fortm = FormData; + setFormData({ + ...fortm, + pn: 1, + }); + setFormDatas({ + ...fortm, + pn: 1, + }); }} > 查询 @@ -596,7 +660,7 @@ function PaySummaryReport() { -
+ {/*
-
+
*/} diff --git a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx index 9ecd4ed..d85b29e 100644 --- a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx @@ -39,7 +39,7 @@ function PdaStat() { is_excel: 0, start_time: moment().startOf("day").format("YYYY-MM-DD"), end_time: moment().endOf("day").format("YYYY-MM-DD"), - pn: "1", + pn: 1, page_size: "15", }; @@ -203,28 +203,60 @@ function PdaStat() { const TimeChange = () => { let e = FormData.time_type; let str = "day"; + let mat = "YYYY-MM-DD"; if (e == 4) { str = "year"; + mat = "YYYY"; } else if (e == 3) { str = "month"; + mat = "YYYY-MM"; } else if (e == 2) { str = "week"; + mat = "YYYY-MM-DD"; } - return str; + return { str, mat }; }; - - //页码 - function onShowSizeChange(pn, pn_size) { + //切换时间变化 + const SetTimeNow = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment().format("YYYY"); + end = moment().format("YYYY"); + } else if (e == 3) { + start = moment().format("YYYY-MM"); + end = moment().format("YYYY-MM"); + } else if (e == 2) { + start = moment().day(1).format("YYYY-MM-DD"); + end = moment().day(7).format("YYYY-MM-DD"); + } else { + start = moment().startOf("day").format("YYYY-MM-DD"); + end = moment().endOf("day").format("YYYY-MM-DD"); + } setFormData({ ...FormData, - pn: pn, - page_size: pn_size, - }); - setFormDatas({ - ...FormDatas, - pn: pn, - page_size: pn_size, + time_type: e, + start_time: start, + end_time: end, }); + }; + //页码 + function onShowSizeChange(pn, page_size) { + let temFormData = {}; + if (FormData.page_size == page_size) { + temFormData = { + ...FormData, + pn, + }; + } else { + temFormData = { + ...FormData, + pn: 1, + page_size, + }; + } + setFormData(temFormData); + setFormDatas(temFormData); } const onChange = (eal) => { var e = eal; @@ -442,12 +474,7 @@ function PdaStat() { label: "年", }, ]} - onChange={(e) => { - setFormData({ - ...FormData, - time_type: e, - }); - }} + onChange={(e) => SetTimeNow(e)} /> @@ -455,11 +482,12 @@ function PdaStat() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, start_time: date @@ -480,11 +508,12 @@ function PdaStat() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, end_time: date @@ -515,7 +544,15 @@ function PdaStat() { { - setFormDatas({ ...FormData }); + var fortm = FormData; + setFormData({ + ...fortm, + pn: 1, + }); + setFormDatas({ + ...fortm, + pn: 1, + }); }} > 查询 diff --git a/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx index d8ca0a9..21c0c69 100644 --- a/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx @@ -33,7 +33,7 @@ function PreOrderReport() { time_type: "1", start_time: moment().startOf("day").format("YYYY-MM-DD"), end_time: moment().endOf("day").format("YYYY-MM-DD"), - pn: "1", + pn: 1, page_size: "15", }; const formlayout = { @@ -215,15 +215,44 @@ function PreOrderReport() { const TimeChange = () => { let e = FormData.time_type; let str = "day"; + let mat = "YYYY-MM-DD"; if (e == 4) { str = "year"; + mat = "YYYY"; } else if (e == 3) { str = "month"; + mat = "YYYY-MM"; } else if (e == 2) { str = "week"; + mat = "YYYY-MM-DD"; } - return str; + return { str, mat }; }; + //切换时间变化 + const SetTimeNow = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment().format("YYYY"); + end = moment().format("YYYY"); + } else if (e == 3) { + start = moment().format("YYYY-MM"); + end = moment().format("YYYY-MM"); + } else if (e == 2) { + start = moment().day(1).format("YYYY-MM-DD"); + end = moment().day(7).format("YYYY-MM-DD"); + } else { + start = moment().startOf("day").format("YYYY-MM-DD"); + end = moment().endOf("day").format("YYYY-MM-DD"); + } + setFormData({ + ...FormData, + time_type: e, + start_time: start, + end_time: end, + }); + }; + //时间 const onChangeData = (dates, dataString) => { if (Picker == "week") { @@ -241,17 +270,22 @@ function PreOrderReport() { } }; //页码 - function onShowSizeChange(pn, pn_size) { - setFormData({ - ...FormData, - pn: pn, - page_size: pn_size, - }); - setFormDatas({ - ...FormDatas, - pn: pn, - page_size: pn_size, - }); + function onShowSizeChange(pn, page_size) { + let temFormData = {}; + if (FormData.page_size == page_size) { + temFormData = { + ...FormData, + pn, + }; + } else { + temFormData = { + ...FormData, + pn: 1, + page_size, + }; + } + setFormData(temFormData); + setFormDatas(temFormData); } const Daownload = (url) => { var link = document.createElement("a"); @@ -381,12 +415,7 @@ function PreOrderReport() { label: "年", }, ]} - onChange={(e) => { - setFormData({ - ...FormData, - time_type: e, - }); - }} + onChange={(e) => SetTimeNow(e)} /> @@ -394,11 +423,12 @@ function PreOrderReport() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, start_time: date @@ -419,11 +449,12 @@ function PreOrderReport() { { - if (TimeChange() == "week") { + if (TimeChange().str == "week") { setFormData({ ...FormData, end_time: date @@ -473,7 +504,15 @@ function PreOrderReport() { { - setFormDatas({ ...FormData }); + var fortm = FormData; + setFormData({ + ...fortm, + pn: 1, + }); + setFormDatas({ + ...fortm, + pn: 1, + }); }} > 查询 diff --git a/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx b/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx index c25a25a..1ec0a4f 100644 --- a/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx +++ b/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx @@ -35,7 +35,7 @@ function CreateInvoice() { dealer_id: "", //操作人id start_time: moment().startOf("day").format("YYYY-MM-DD HH:mm:ss"), end_time: moment().endOf("day").format("YYYY-MM-DD HH:mm:ss"), - pn: "1", + pn: 1, page_size: "15", }; const formlayout = { @@ -294,17 +294,22 @@ function CreateInvoice() { }); }; //页码 - function onShowSizeChange(pn, pn_size) { - setFormData({ - ...FormData, - pn: pn, - page_size: pn_size, - }); - setFormDatas({ - ...FormDatas, - pn: pn, - page_size: pn_size, - }); + function onShowSizeChange(pn, page_size) { + let temFormData = {}; + if (FormData.page_size == page_size) { + temFormData = { + ...FormData, + pn, + }; + } else { + temFormData = { + ...FormData, + pn: 1, + page_size, + }; + } + setFormData(temFormData); + setFormDatas(temFormData); } //合并开票 const InvoiceAnd = () => { @@ -610,7 +615,15 @@ function CreateInvoice() { { - setFormDatas({ ...FormData }); + var fortm = FormData; + setFormData({ + ...fortm, + pn: 1, + }); + setFormDatas({ + ...fortm, + pn: 1, + }); }} > 查询 diff --git a/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx b/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx index dd27dcc..c119a20 100644 --- a/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx +++ b/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx @@ -40,7 +40,7 @@ function CreateInvoiceRecord() { start_time: moment().startOf("day").format("YYYY-MM-DD HH:mm:ss"), end_time: moment().endOf("day").format("YYYY-MM-DD HH:mm:ss"), zt: "", //状态 - pn: "1", + pn: 1, page_size: "15", }; const formlayout = { @@ -436,17 +436,22 @@ function CreateInvoiceRecord() { ]; //页码 - function onShowSizeChange(pn, pn_size) { - setFormData({ - ...FormData, - pn: pn, - page_size: pn_size, - }); - setFormDatas({ - ...FormDatas, - pn: pn, - page_size: pn_size, - }); + function onShowSizeChange(pn, page_size) { + let temFormData = {}; + if (FormData.page_size == page_size) { + temFormData = { + ...FormData, + pn, + }; + } else { + temFormData = { + ...FormData, + pn: 1, + page_size, + }; + } + setFormData(temFormData); + setFormDatas(temFormData); } //提交 const SubmitPush = () => { @@ -766,7 +771,15 @@ function CreateInvoiceRecord() { { - setFormDatas({ ...FormData }); + var fortm = FormData; + setFormData({ + ...fortm, + pn: 1, + }); + setFormDatas({ + ...fortm, + pn: 1, + }); }} > 查询 diff --git a/src/pages/FinancialMgm/SettleBill/AbnormalPayment/loadable.jsx b/src/pages/FinancialMgm/SettleBill/AbnormalPayment/loadable.jsx index 3dce027..9f71e19 100644 --- a/src/pages/FinancialMgm/SettleBill/AbnormalPayment/loadable.jsx +++ b/src/pages/FinancialMgm/SettleBill/AbnormalPayment/loadable.jsx @@ -33,7 +33,7 @@ function AbnormalPayment() { dflsh: "", //对方流水号 clfs: "1", //处理方式 czr: "", //操作人 - pn: "1", + pn: 1, page_size: "15", }; let form_data = sessionStorage.getItem("FormData_AbnormalPayment"); @@ -351,17 +351,22 @@ function AbnormalPayment() { }); }; //页码 - function onShowSizeChange(pn, pn_size) { - setFormData({ - ...FormData, - pn: pn, - page_size: pn_size, - }); - setFormDatas({ - ...FormDatas, - pn: pn, - page_size: pn_size, - }); + function onShowSizeChange(pn, page_size) { + let temFormData = {}; + if (FormData.page_size == page_size) { + temFormData = { + ...FormData, + pn, + }; + } else { + temFormData = { + ...FormData, + pn: 1, + page_size, + }; + } + setFormData(temFormData); + setFormDatas(temFormData); } //获取页面显示数据 const getData = (data) => { @@ -571,7 +576,15 @@ function AbnormalPayment() { { - setFormDatas({ ...FormData }); + var fortm = FormData; + setFormData({ + ...fortm, + pn: 1, + }); + setFormDatas({ + ...fortm, + pn: 1, + }); }} > 查询 diff --git a/src/pages/FinancialMgm/SettleBill/BillDiff/loadable.jsx b/src/pages/FinancialMgm/SettleBill/BillDiff/loadable.jsx index ddc0992..e6209e2 100644 --- a/src/pages/FinancialMgm/SettleBill/BillDiff/loadable.jsx +++ b/src/pages/FinancialMgm/SettleBill/BillDiff/loadable.jsx @@ -28,7 +28,7 @@ function BillDiff() { start_time: moment(new Date()).subtract(1, "months").format("YYYY-MM-DD"), payment_channels: "", //支付渠道 ycfl: "1", //异常分类 - pn: "1", + pn: 1, page_size: "15", }; //页面检索-退款 @@ -41,7 +41,7 @@ function BillDiff() { dflsh: "", //对方流水号 clfs: "1", //处理方式 czr: "", //操作人 - pn: "1", + pn: 1, page_size: "15", }; let form_data = sessionStorage.getItem("FormData_BillDiff"); @@ -384,17 +384,22 @@ function BillDiff() { }); }; //页码 - function onShowSizeChange(pn, pn_size) { - setFormData({ - ...FormData, - pn: pn, - page_size: pn_size, - }); - setFormDatas({ - ...FormDatas, - pn: pn, - page_size: pn_size, - }); + function onShowSizeChange(pn, page_size) { + let temFormData = {}; + if (FormData.page_size == page_size) { + temFormData = { + ...FormData, + pn, + }; + } else { + temFormData = { + ...FormData, + pn: 1, + page_size, + }; + } + setFormData(temFormData); + setFormDatas(temFormData); } //获取页面显示数据 const getData = (data) => { @@ -718,7 +723,15 @@ function BillDiff() { { - setFormDatas({ ...FormData }); + var fortm = FormData; + setFormData({ + ...fortm, + pn: 1, + }); + setFormDatas({ + ...fortm, + pn: 1, + }); }} > 查询 diff --git a/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx b/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx index 3b00a64..5b68623 100644 --- a/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx +++ b/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx @@ -31,7 +31,7 @@ function GeneralBusiness() { tenantId: "", //支付商户id start_time: moment().startOf("day").format("YYYY-MM-DD"), end_time: moment().endOf("day").format("YYYY-MM-DD"), - pn: "1", + pn: 1, page_size: "15", }; //页面tab @@ -225,17 +225,22 @@ function GeneralBusiness() { ); }; //页码 - function onShowSizeChange(pn, pn_size) { - setFormData({ - ...FormData, - pn: pn, - page_size: pn_size, - }); - setFormDatas({ - ...FormDatas, - pn: pn, - page_size: pn_size, - }); + function onShowSizeChange(pn, page_size) { + let temFormData = {}; + if (FormData.page_size == page_size) { + temFormData = { + ...FormData, + pn, + }; + } else { + temFormData = { + ...FormData, + pn: 1, + page_size, + }; + } + setFormData(temFormData); + setFormDatas(temFormData); } const Daownload = (url) => { var link = document.createElement("a"); @@ -350,7 +355,15 @@ function GeneralBusiness() { { - setFormDatas({ ...FormData }); + var fortm = FormData; + setFormData({ + ...fortm, + pn: 1, + }); + setFormDatas({ + ...fortm, + pn: 1, + }); }} > 查询 diff --git a/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx b/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx index 58bcdf9..b494224 100644 --- a/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx +++ b/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx @@ -29,7 +29,7 @@ function PayRepeat() { // workker: "", //操作员 water_class: "1", //流水号类型 out_trade_no: "", //流水号内容 - pn: "1", + pn: 1, page_size: "15", }; //页面检索-退款 @@ -40,7 +40,7 @@ function PayRepeat() { start_time: moment(new Date()).subtract(1, "months").format("YYYY-MM-DD"), water_class: "1", //流水号类型 out_trade_no: "", //流水号内容 - pn: "1", + pn: 1, page_size: "15", }; let form_data = sessionStorage.getItem("FormData_payrepeat"); @@ -410,17 +410,22 @@ function PayRepeat() { }); }; //页码 - function onShowSizeChange(pn, pn_size) { - setFormData({ - ...FormData, - pn: pn, - page_size: pn_size, - }); - setFormDatas({ - ...FormDatas, - pn: pn, - page_size: pn_size, - }); + function onShowSizeChange(pn, page_size) { + let temFormData = {}; + if (FormData.page_size == page_size) { + temFormData = { + ...FormData, + pn, + }; + } else { + temFormData = { + ...FormData, + pn: 1, + page_size, + }; + } + setFormData(temFormData); + setFormDatas(temFormData); } //退款操作 const getRepeatTD = (text) => { @@ -815,7 +820,15 @@ function PayRepeat() { { - setFormDatas({ ...FormData }); + var fortm = FormData; + setFormData({ + ...fortm, + pn: 1, + }); + setFormDatas({ + ...fortm, + pn: 1, + }); }} > 查询