Browse Source

fix(): 解决商户问题

tags/PMS_Frontend_v1.0.6-develop
chenqiang 1 year ago
parent
commit
a2dab14c6b
  1. 4
      src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx
  2. 4
      src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx
  3. 4
      src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx
  4. 4
      src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx
  5. 4
      src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx
  6. 6
      src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx
  7. 6
      src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx
  8. 2
      src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx
  9. 2
      src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx
  10. 4
      src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx
  11. 2
      src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx
  12. 2
      src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx
  13. 9
      src/services/ElectInvoice/index.js

4
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")
}
/>
</div>
@ -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")
}
/>
</div>

4
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")
}
/>
</div>
@ -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")
}
/>
</div>

4
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")
}
/>
</div>
@ -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")
}
/>
</div>

4
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")
}
/>
</div>
@ -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")
}
/>
</div>

4
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);

6
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 });
}
}}

6
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 });
}
}}

2
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);

2
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);

4
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);

2
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);

2
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);

9
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,

Loading…
Cancel
Save