From a2dab14c6b89f7c099c9a1d1b4559add9b7b4896 Mon Sep 17 00:00:00 2001 From: chenqiang Date: Thu, 7 Dec 2023 15:09:37 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E8=A7=A3=E5=86=B3=E5=95=86=E6=88=B7?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquipmentAly/EquipmentRunningStat/loadable.jsx | 4 ++-- .../DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx | 4 ++-- src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx | 4 ++-- .../DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx | 4 ++-- src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx | 4 ++-- .../FinancialMgm/FinancialReport/OperationReport/loadable.jsx | 6 +++--- .../FinancialReport/ParkingIncomeReport/loadable.jsx | 6 +++--- .../FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx | 2 +- src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx | 2 +- .../FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx | 4 ++-- src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx | 2 +- src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx | 2 +- src/services/ElectInvoice/index.js | 9 +++++++++ 13 files changed, 31 insertions(+), 22 deletions(-) diff --git a/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx b/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx index 4ff7b15..f045d6f 100644 --- a/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx @@ -450,7 +450,7 @@ function ExceptionParkReport() { }} disabledDate={(current) => current > moment(FormData.end_time) || - current < moment(FormData.end_time).subtract(180, "days") + current < moment(FormData.end_time).subtract(120, "days") } /> @@ -479,7 +479,7 @@ function ExceptionParkReport() { }} disabledDate={(current) => current < moment(FormData.start_time) || - current > moment(FormData.start_time).add(180, "days") + current > moment(FormData.start_time).add(120, "days") } /> diff --git a/src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx b/src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx index 9d00fbc..fa54408 100644 --- a/src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx @@ -510,7 +510,7 @@ function ParkingAly() { }} disabledDate={(current) => current > moment(FormData.end_date) || - current < moment(FormData.end_date).subtract(180, "days") + current < moment(FormData.end_date).subtract(120, "days") } /> @@ -539,7 +539,7 @@ function ParkingAly() { }} disabledDate={(current) => current < moment(FormData.start_date) || - current > moment(FormData.start_date).add(180, "days") + current > moment(FormData.start_date).add(120, "days") } /> diff --git a/src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx b/src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx index e08d603..8b414da 100644 --- a/src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx @@ -799,7 +799,7 @@ function PayAly() { }} disabledDate={(current) => current > moment(FormData.end_date) || - current < moment(FormData.end_date).subtract(180, "days") + current < moment(FormData.end_date).subtract(120, "days") } /> @@ -828,7 +828,7 @@ function PayAly() { }} disabledDate={(current) => current < moment(FormData.start_date) || - current > moment(FormData.start_date).add(180, "days") + current > moment(FormData.start_date).add(120, "days") } /> diff --git a/src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx b/src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx index 87b5405..fb86fc7 100644 --- a/src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx @@ -668,7 +668,7 @@ function RegisterAly() { }} disabledDate={(current) => current > moment(FormData.end_date) || - current < moment(FormData.end_date).subtract(180, "days") + current < moment(FormData.end_date).subtract(120, "days") } /> @@ -697,7 +697,7 @@ function RegisterAly() { }} disabledDate={(current) => current < moment(FormData.start_date) || - current > moment(FormData.start_date).add(180, "days") + current > moment(FormData.start_date).add(120, "days") } /> diff --git a/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx index e04f1e8..5bb499b 100644 --- a/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx @@ -48,7 +48,7 @@ function BookReport() { }; //页面检索-退款 const formdatb = { - sell_name: "", + sell_name: "0", type: 2, time_class: "1", //日期类型 time_type: "1", @@ -426,7 +426,7 @@ function BookReport() { }; //获取页面筛选数据 const getSelectData = () => { - ajax.getAllOperator().then( + ajax.ElectInvoice.getSelectOperator().then( (res) => { if (parseInt(res?.status) === 20000) { setYunying(res.data); diff --git a/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx index 76cb87b..59fa86e 100644 --- a/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx @@ -544,7 +544,7 @@ function OperationReport() { }; //获取页面筛选数据 const getSelectData = () => { - ajax.getAllOperator().then( + ajax.ElectInvoice.getSelectOperator().then( (res) => { if (parseInt(res?.status) === 20000) { setYunying(res.data); @@ -707,7 +707,7 @@ function OperationReport() { ? moment(date).day(1).format("YYYY-MM-DD") : null, }); - } else { + } else { setFormData({ ...FormData, start_time: dateString }); } }} @@ -733,7 +733,7 @@ function OperationReport() { ? moment(date).day(7).format("YYYY-MM-DD") : null, }); - } else { + } else { setFormData({ ...FormData, end_time: dateString }); } }} diff --git a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx index e4397d0..1768d83 100644 --- a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx @@ -386,7 +386,7 @@ function ParkingIncomeReport() { //获取数据 //获取页面筛选数据 const getSelectData = () => { - ajax.getAllOperator().then( + ajax.ElectInvoice.getSelectOperator().then( (res) => { if (parseInt(res?.status) === 20000) { setYunying(res.data); @@ -622,7 +622,7 @@ function ParkingIncomeReport() { ? moment(date).day(1).format("YYYY-MM-DD") : null, }); - } else { + } else { setFormData({ ...FormData, start_time: dateString }); } }} @@ -648,7 +648,7 @@ function ParkingIncomeReport() { ? moment(date).day(7).format("YYYY-MM-DD") : null, }); - } else { + } else { setFormData({ ...FormData, end_time: dateString }); } }} diff --git a/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx index d74957e..070a7a8 100644 --- a/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx @@ -385,7 +385,7 @@ function PaySummaryReport() { //获取页面筛选数据 const getSelectData = () => { - ajax.getAllOperator().then( + ajax.ElectInvoice.getSelectOperator().then( (res) => { if (parseInt(res?.status) === 20000) { setYunying(res.data); diff --git a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx index b0e517c..9909efc 100644 --- a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx @@ -300,7 +300,7 @@ function PdaStat() { }; //获取页面筛选数据 const getSelectData = () => { - ajax.getAllOperator().then( + ajax.ElectInvoice.getSelectOperator().then( (res) => { if (parseInt(res?.status) === 20000) { setYunying(res.data); diff --git a/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx index da6a919..bf2f2fd 100644 --- a/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx @@ -28,7 +28,7 @@ function PreOrderReport() { //页面检索-重复 const formdata = { type: "1", //类型 - operator_id: 0, //运营商id + operator_id: "0", //运营商id headname: "", // time_type: "1", start_time: moment() @@ -301,7 +301,7 @@ function PreOrderReport() { }; //获取页面筛选数据 const getSelectData = () => { - ajax.getAllOperator().then( + ajax.ElectInvoice.getSelectOperator().then( (res) => { if (parseInt(res?.status) === 20000) { setYunying(res.data); diff --git a/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx b/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx index 9c15ee3..8f09c68 100644 --- a/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx +++ b/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx @@ -439,7 +439,7 @@ function CreateInvoice() { }; //获取页面筛选数据 const getSelectData = () => { - ajax.getAllOperator().then( + ajax.ElectInvoice.getSelectOperator().then( (res) => { if (parseInt(res?.status) === 20000) { setYunying(res.data); diff --git a/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx b/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx index ad11860..a93608e 100644 --- a/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx +++ b/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx @@ -560,7 +560,7 @@ function CreateInvoiceRecord() { }; //获取页面筛选数据 const getSelectData = () => { - ajax.getAllOperator().then( + ajax.ElectInvoice.getSelectOperator().then( (res) => { if (parseInt(res?.status) === 20000) { setYunying(res.data); diff --git a/src/services/ElectInvoice/index.js b/src/services/ElectInvoice/index.js index e1b7476..9899a96 100644 --- a/src/services/ElectInvoice/index.js +++ b/src/services/ElectInvoice/index.js @@ -91,6 +91,14 @@ const ReportPaySummaryReport = (params) => { data: params, }); }; +// 获取页面启用商户 +const getSelectOperator = (params) => { + return ajax({ + url: "/api/bpm/operator/get_on_job_operator", + type: "get", + data: params, + }); +}; //------------------------------------------------清分结算-------------------------- //************************渠道对账 // 获取列表数据 @@ -214,6 +222,7 @@ export default { getPaySummaryReport, ReportPaySummaryReport, getOperationReport, + getSelectOperator, getGeneralBusiness, getSetBilly,