chenglb
/
PMS_Frontend_v1.0.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix(): 解决会员统计的问题

tags/PMS_Frontend_v1.0.6-develop
chenqiang 1 year ago
parent
e927a5ba41
commit
a2b50961ee
18 changed files with 142 additions and 400 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 55
      src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx
  2. 47
      src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx
  3. 41
      src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx
  4. 40
      src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx
  5. 30
      src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx
  6. 2
      src/pages/FinancialMgm/FinancialReport/OperationReport/index.scss
  7. 44
      src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx
  8. 30
      src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx
  9. 36
      src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx
  10. 41
      src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx
  11. 34
      src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx
  12. 36
      src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx
  13. 32
      src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx
  14. 4
      src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx
  15. 2
      src/pages/FinancialMgm/SettleBill/AbnormalPayment/loadable.jsx
  16. 5
      src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx
  17. 52
      src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx
  18. 11
      src/services/ElectInvoice/index.js

55
src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx
View File

@ -43,11 +43,8 @@ function ExceptionParkReport() {
area: [], area: [],
date_type: "1", date_type: "1",
is_excel: 0, is_excel: 0,
start_time: moment()
.startOf("day")
.subtract(1, "days")
.format("YYYY-MM-DD"),
end_time: moment().endOf("day").subtract(1, "days").format("YYYY-MM-DD"),
start_time: moment().startOf("day").format("YYYY-MM-DD"),
end_time: moment().endOf("day").format("YYYY-MM-DD"),
pn: 1, pn: 1,
page_size: dictionary?.pageSizeOptions1[0], page_size: dictionary?.pageSizeOptions1[0],
}; };
@ -214,8 +211,8 @@ function ExceptionParkReport() {
start = moment().day(1).format("YYYY-MM-DD"); start = moment().day(1).format("YYYY-MM-DD");
end = moment().day(7).format("YYYY-MM-DD"); end = moment().day(7).format("YYYY-MM-DD");
} else { } else {
start = moment().startOf("day").subtract(1, "days").format("YYYY-MM-DD");
end = moment().endOf("day").subtract(1, "days").format("YYYY-MM-DD");
start = moment().startOf("day").format("YYYY-MM-DD");
end = moment().endOf("day").format("YYYY-MM-DD");
} }
setFormData({ setFormData({
...FormData, ...FormData,
@ -447,24 +444,14 @@ function ExceptionParkReport() {
? moment(date).day(1).format("YYYY-MM-DD") ? moment(date).day(1).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date > moment(FormData.end_time)) {
setFormData({
...FormData,
end_time: dateString,
start_time: FormData.end_time,
});
} else {
setFormData({
...FormData,
start_time: dateString,
});
}
} else { } else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
} }
}} }}
disabledDate={(current) => current > moment(FormData.end_time)}
disabledDate={(current) =>
current > moment(FormData.end_time) ||
current < moment(FormData.end_time).subtract(180, "days")
}
/> />
</div> </div>
</div> </div>
@ -486,25 +473,13 @@ function ExceptionParkReport() {
? moment(date).day(7).format("YYYY-MM-DD") ? moment(date).day(7).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date < moment(FormData.start_time)) {
setFormData({
...FormData,
start_time: dateString,
end_time: FormData.start_time,
});
} else {
setFormData({
...FormData,
end_time: dateString,
});
}
} else { } else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });
} }
}} }}
disabledDate={(current) => disabledDate={(current) =>
current < moment(FormData.start_time)
current < moment(FormData.start_time) ||
current > moment(FormData.start_time).add(180, "days")
} }
/> />
</div> </div>
@ -673,7 +648,7 @@ function ExceptionParkReport() {
<span <span
className={"sear_ser"} className={"sear_ser"}
onClick={() => { onClick={() => {
ReportPaySummaryReport();
Data?.total && ReportPaySummaryReport();
// setFormDatas({ ...FormData }); // setFormDatas({ ...FormData });
}} }}
> >
@ -692,7 +667,13 @@ function ExceptionParkReport() {
className="yisa_tabled" className="yisa_tabled"
columns={column(selectArr)} columns={column(selectArr)}
rowKey={(record) => record.id} rowKey={(record) => record.id}
dataSource={Data.data}
dataSource={
Data.data
// .sort(
// (a, b) =>
// new Date(b.analyse_date) - new Date(a.analyse_date)
// )
}
pagination={false} pagination={false}
scroll={{ scroll={{
// x: 1300, // x: 1300,

47
src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx
View File

@ -326,9 +326,9 @@ function ParkingAly() {
type: "value", type: "value",
name: "停车次数（次）", name: "停车次数（次）",
min: 0, min: 0,
// /max: 50,
interval: 10,
splitNumber: 6, //设置坐标轴的分割段数
// // /max: 50,
// interval: 10,
// splitNumber: 6, //设置坐标轴的分割段数
axisLabel: { axisLabel: {
//formatter: "{value}元", //formatter: "{value}元",
textStyle: { textStyle: {
@ -504,24 +504,14 @@ function ParkingAly() {
? moment(date).day(1).format("YYYY-MM-DD") ? moment(date).day(1).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date > moment(FormData.end_date)) {
setFormData({
...FormData,
end_date: dateString,
start_date: FormData.end_date,
});
} else {
setFormData({
...FormData,
start_date: dateString,
});
}
} else { } else {
setFormData({ ...FormData, start_date: dateString }); setFormData({ ...FormData, start_date: dateString });
} }
}} }}
disabledDate={(current) => current > moment(FormData.end_date)}
disabledDate={(current) =>
current > moment(FormData.end_date) ||
current < moment(FormData.end_date).subtract(180, "days")
}
/> />
</div> </div>
</div> </div>
@ -543,25 +533,13 @@ function ParkingAly() {
? moment(date).day(7).format("YYYY-MM-DD") ? moment(date).day(7).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date < moment(FormData.start_date)) {
setFormData({
...FormData,
start_date: dateString,
end_date: FormData.start_date,
});
} else {
setFormData({
...FormData,
end_date: dateString,
});
}
} else { } else {
setFormData({ ...FormData, end_date: dateString }); setFormData({ ...FormData, end_date: dateString });
} }
}} }}
disabledDate={(current) => disabledDate={(current) =>
current < moment(FormData.start_date)
current < moment(FormData.start_date) ||
current > moment(FormData.start_date).add(180, "days")
} }
/> />
</div> </div>
@ -614,7 +592,7 @@ function ParkingAly() {
<span <span
className={"sear_ser"} className={"sear_ser"}
onClick={() => { onClick={() => {
ReportPaySummaryReport();
Data?.total && ReportPaySummaryReport();
// setFormDatas({ ...FormData }); // setFormDatas({ ...FormData });
}} }}
> >
@ -633,7 +611,10 @@ function ParkingAly() {
className="yisa_tabled" className="yisa_tabled"
columns={column(selectArr)} columns={column(selectArr)}
rowKey={(record) => record.id} rowKey={(record) => record.id}
dataSource={Data.data}
dataSource={Data.data.sort(
(a, b) => new Date(b.date) - new Date(a.date)
)}
scroll={{ y: "calc(100vh - 360px)" }}
pagination={false} pagination={false}
/> />
</div> </div>

41
src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx
View File

@ -793,24 +793,14 @@ function PayAly() {
? moment(date).day(1).format("YYYY-MM-DD") ? moment(date).day(1).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date > moment(FormData.end_date)) {
setFormData({
...FormData,
end_date: dateString,
start_date: FormData.end_date,
});
} else {
setFormData({
...FormData,
start_date: dateString,
});
}
} else { } else {
setFormData({ ...FormData, start_date: dateString }); setFormData({ ...FormData, start_date: dateString });
} }
}} }}
disabledDate={(current) => current > moment(FormData.end_date)}
disabledDate={(current) =>
current > moment(FormData.end_date) ||
current < moment(FormData.end_date).subtract(180, "days")
}
/> />
</div> </div>
</div> </div>
@ -832,25 +822,13 @@ function PayAly() {
? moment(date).day(7).format("YYYY-MM-DD") ? moment(date).day(7).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date < moment(FormData.start_date)) {
setFormData({
...FormData,
start_date: dateString,
end_date: FormData.start_date,
});
} else {
setFormData({
...FormData,
end_date: dateString,
});
}
} else { } else {
setFormData({ ...FormData, end_date: dateString }); setFormData({ ...FormData, end_date: dateString });
} }
}} }}
disabledDate={(current) => disabledDate={(current) =>
current < moment(FormData.start_date)
current < moment(FormData.start_date) ||
current > moment(FormData.start_date).add(180, "days")
} }
/> />
</div> </div>
@ -991,7 +969,7 @@ function PayAly() {
<span <span
className={"sear_ser"} className={"sear_ser"}
onClick={() => { onClick={() => {
ReportPaySummaryReport();
Data?.total && ReportPaySummaryReport();
// setFormDatas({ ...FormData }); // setFormDatas({ ...FormData });
}} }}
> >
@ -1010,7 +988,10 @@ function PayAly() {
className="yisa_tabled" className="yisa_tabled"
columns={column(selectArr)} columns={column(selectArr)}
rowKey={(record) => record.id} rowKey={(record) => record.id}
dataSource={Data.data}
dataSource={Data.data.sort(
(a, b) =>
new Date(b.analyse_date) - new Date(a.analyse_date)
)}
pagination={false} pagination={false}
scroll={{ scroll={{
// x: 1300, // x: 1300,

40
src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx
View File

@ -662,24 +662,14 @@ function RegisterAly() {
? moment(date).day(1).format("YYYY-MM-DD") ? moment(date).day(1).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date > moment(FormData.end_date)) {
setFormData({
...FormData,
end_date: dateString,
start_date: FormData.end_date,
});
} else {
setFormData({
...FormData,
start_date: dateString,
});
}
} else { } else {
setFormData({ ...FormData, start_date: dateString }); setFormData({ ...FormData, start_date: dateString });
} }
}} }}
disabledDate={(current) => current > moment(FormData.end_date)}
disabledDate={(current) =>
current > moment(FormData.end_date) ||
current < moment(FormData.end_date).subtract(180, "days")
}
/> />
</div> </div>
</div> </div>
@ -701,25 +691,13 @@ function RegisterAly() {
? moment(date).day(7).format("YYYY-MM-DD") ? moment(date).day(7).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date < moment(FormData.start_date)) {
setFormData({
...FormData,
start_date: dateString,
end_date: FormData.start_date,
});
} else {
setFormData({
...FormData,
end_date: dateString,
});
}
} else { } else {
setFormData({ ...FormData, end_date: dateString }); setFormData({ ...FormData, end_date: dateString });
} }
}} }}
disabledDate={(current) => disabledDate={(current) =>
current < moment(FormData.start_date)
current < moment(FormData.start_date) ||
current > moment(FormData.start_date).add(180, "days")
} }
/> />
</div> </div>
@ -810,7 +788,7 @@ function RegisterAly() {
<span <span
className={"sear_ser"} className={"sear_ser"}
onClick={() => { onClick={() => {
ReportPaySummaryReport();
Data?.total && ReportPaySummaryReport();
// setFormDatas({ ...FormData }); // setFormDatas({ ...FormData });
}} }}
> >
@ -829,7 +807,9 @@ function RegisterAly() {
className="yisa_tabled" className="yisa_tabled"
columns={column(selectArr)} columns={column(selectArr)}
rowKey={(record) => record.id} rowKey={(record) => record.id}
dataSource={Data.data}
dataSource={Data.data.sort(
(a, b) => new Date(b.date) - new Date(a.date)
)}
pagination={false} pagination={false}
scroll={{ scroll={{
// x: 1300, // x: 1300,

30
src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx
View File

@ -636,19 +636,6 @@ function BookReport() {
? moment(date).day(1).format("YYYY-MM-DD") ? moment(date).day(1).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date > moment(FormData.end_time)) {
setFormData({
...FormData,
end_time: dateString,
start_time: FormData.end_time,
});
} else {
setFormData({
...FormData,
start_time: dateString,
});
}
} else { } else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
} }
@ -675,20 +662,7 @@ function BookReport() {
? moment(date).day(7).format("YYYY-MM-DD") ? moment(date).day(7).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date < moment(FormData.start_time)) {
setFormData({
...FormData,
start_time: dateString,
end_time: FormData.start_time,
});
} else {
setFormData({
...FormData,
end_time: dateString,
});
}
} else {
} else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });
} }
}} }}
@ -756,7 +730,7 @@ function BookReport() {
<span <span
className={"sear_ser"} className={"sear_ser"}
onClick={() => { onClick={() => {
// setFormDatas({ ...FormData });
// Data?.total && setFormDatas({ ...FormData });
}} }}
> >
导出 导出

2
src/pages/FinancialMgm/FinancialReport/OperationReport/index.scss
View File

@ -377,7 +377,7 @@ $color-primary : var(--color-primary);
} }
.table_raps { .table_raps {
width: 3146px;
width: 3612px;
} }
.yisa_tabled { .yisa_tabled {

44
src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx
View File

@ -108,19 +108,19 @@ function OperationReport() {
}, },
{ {
text: "优惠合计", text: "优惠合计",
valuet: "pms_agio",
value: "orp_agio",
value: "pms_agio",
valuet: "orp_agio",
}, },
{ {
text: "实付合计", text: "实付合计",
valuet: "pms_paid_amount",
value: "orp_paid_amount",
value: "pms_paid_amount",
valuet: "orp_paid_amount",
}, },
{ {
text: "退实付合计", text: "退实付合计",
valuet: "pms_refund_paid",
value: "orp_refund_paid",
value: "pms_refund_paid",
valuet: "orp_refund_paid",
}, },
{ {
text: "欠费合计", text: "欠费合计",
@ -707,20 +707,7 @@ function OperationReport() {
? moment(date).day(1).format("YYYY-MM-DD") ? moment(date).day(1).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date > moment(FormData.end_time)) {
setFormData({
...FormData,
end_time: dateString,
start_time: FormData.end_time,
});
} else {
setFormData({
...FormData,
start_time: dateString,
});
}
} else {
} else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
} }
}} }}
@ -746,20 +733,7 @@ function OperationReport() {
? moment(date).day(7).format("YYYY-MM-DD") ? moment(date).day(7).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date < moment(FormData.start_time)) {
setFormData({
...FormData,
start_time: dateString,
end_time: FormData.start_time,
});
} else {
setFormData({
...FormData,
end_time: dateString,
});
}
} else {
} else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });
} }
}} }}
@ -1027,7 +1001,7 @@ function OperationReport() {
<span <span
className={"sear_ser"} className={"sear_ser"}
onClick={() => { onClick={() => {
ReportPaySummaryReport();
Data?.total && ReportPaySummaryReport();
// setFormDatas({ ...FormData }); // setFormDatas({ ...FormData });
}} }}
> >

30
src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx
View File

@ -363,19 +363,6 @@ function ParkCardReport() {
? moment(date).day(1).format("YYYY-MM-DD") ? moment(date).day(1).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date > moment(FormData.end_time)) {
setFormData({
...FormData,
end_time: dateString,
start_time: FormData.end_time,
});
} else {
setFormData({
...FormData,
start_time: dateString,
});
}
} else { } else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
} }
@ -402,20 +389,7 @@ function ParkCardReport() {
? moment(date).day(7).format("YYYY-MM-DD") ? moment(date).day(7).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date < moment(FormData.start_time)) {
setFormData({
...FormData,
start_time: dateString,
end_time: FormData.start_time,
});
} else {
setFormData({
...FormData,
end_time: dateString,
});
}
} else {
} else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });
} }
}} }}
@ -462,7 +436,7 @@ function ParkCardReport() {
<span <span
className={"sear_ser"} className={"sear_ser"}
onClick={() => { onClick={() => {
// setFormDatas({ ...FormData });
// Data?.total && setFormDatas({ ...FormData });
}} }}
> >
导出 导出

36
src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx
View File

@ -89,8 +89,8 @@ function ParkingIncomeReport() {
}, },
{ {
text: "退款合计", text: "退款合计",
valuet: "pms_refund_amount",
value: "orp_refund_amount",
value: "pms_refund_amount",
valuet: "orp_refund_amount",
}, },
{ {
text: "单泊位应收", text: "单泊位应收",
@ -622,20 +622,7 @@ function ParkingIncomeReport() {
? moment(date).day(1).format("YYYY-MM-DD") ? moment(date).day(1).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date > moment(FormData.end_time)) {
setFormData({
...FormData,
end_time: dateString,
start_time: FormData.end_time,
});
} else {
setFormData({
...FormData,
start_time: dateString,
});
}
} else {
} else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
} }
}} }}
@ -661,20 +648,7 @@ function ParkingIncomeReport() {
? moment(date).day(7).format("YYYY-MM-DD") ? moment(date).day(7).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date < moment(FormData.start_time)) {
setFormData({
...FormData,
start_time: dateString,
end_time: FormData.start_time,
});
} else {
setFormData({
...FormData,
end_time: dateString,
});
}
} else {
} else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });
} }
}} }}
@ -943,7 +917,7 @@ function ParkingIncomeReport() {
<span <span
className={"sear_ser"} className={"sear_ser"}
onClick={() => { onClick={() => {
ReportPaySummaryReport();
Data?.total && ReportPaySummaryReport();
// setFormDatas({ ...FormData }); // setFormDatas({ ...FormData });
}} }}
> >

41
src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx
View File

@ -608,19 +608,6 @@ function PayChannelStat() {
? moment(date).day(1).format("YYYY-MM-DD") ? moment(date).day(1).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date > moment(FormData.end_time)) {
setFormData({
...FormData,
end_time: dateString,
start_time: FormData.end_time,
});
} else {
setFormData({
...FormData,
start_time: dateString,
});
}
} else { } else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
} }
@ -647,20 +634,7 @@ function PayChannelStat() {
? moment(date).day(7).format("YYYY-MM-DD") ? moment(date).day(7).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date < moment(FormData.start_time)) {
setFormData({
...FormData,
start_time: dateString,
end_time: FormData.start_time,
});
} else {
setFormData({
...FormData,
end_time: dateString,
});
}
} else {
} else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });
} }
}} }}
@ -737,12 +711,17 @@ function PayChannelStat() {
fontWeight: 700, fontWeight: 700,
}} }}
> >
{percent}
{percent}%
</div> </div>
<div className="dfsf">{ele?.tcsrtotal || 0}元</div> <div className="dfsf">{ele?.tcsrtotal || 0}元</div>
</div> </div>
)} )}
percent={ele?.tcsrpersent || 0}
percent={
ele?.tcsrpersent?.slice(
0,
ele.tcsrpersent.length - 1
) || 0
}
/> />
<div className="dsf">{ele.text}</div> <div className="dsf">{ele.text}</div>
</div> </div>
@ -757,7 +736,7 @@ function PayChannelStat() {
message={"暂无数据"} message={"暂无数据"}
> >
<div className="scrplltab"> <div className="scrplltab">
<Tooltip
{/* <Tooltip
placement="leftBottom" placement="leftBottom"
title={SelectCol} title={SelectCol}
trigger={"click"} trigger={"click"}
@ -765,7 +744,7 @@ function PayChannelStat() {
<div className={Show ? "poxi showas" : "poxi"} title="隐藏列"> <div className={Show ? "poxi showas" : "poxi"} title="隐藏列">
<FunnelPlotOutlined className={"colsa"} /> <FunnelPlotOutlined className={"colsa"} />
</div> </div>
</Tooltip>
</Tooltip> */}
<div className="table_raps"> <div className="table_raps">
<Table <Table
className="yisa_tabled" className="yisa_tabled"

34
src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx
View File

@ -36,7 +36,7 @@ const { TextArea } = Input;
function PaySummaryReport() { function PaySummaryReport() {
//页面检索-重复 //页面检索-重复
const formdata = { const formdata = {
operator_id: "", //商户
operator_id: "0", //商户
type: "1", type: "1",
start_time: moment() start_time: moment()
.startOf("day") .startOf("day")
@ -506,20 +506,7 @@ function PaySummaryReport() {
? moment(date).day(1).format("YYYY-MM-DD") ? moment(date).day(1).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date > moment(FormData.end_time)) {
setFormData({
...FormData,
end_time: dateString,
start_time: FormData.end_time,
});
} else {
setFormData({
...FormData,
start_time: dateString,
});
}
} else {
}else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
} }
}} }}
@ -545,20 +532,7 @@ function PaySummaryReport() {
? moment(date).day(7).format("YYYY-MM-DD") ? moment(date).day(7).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date < moment(FormData.start_time)) {
setFormData({
...FormData,
start_time: dateString,
end_time: FormData.start_time,
});
} else {
setFormData({
...FormData,
end_time: dateString,
});
}
} else {
} else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });
} }
}} }}
@ -651,7 +625,7 @@ function PaySummaryReport() {
<span <span
className={"sear_ser"} className={"sear_ser"}
onClick={() => { onClick={() => {
ReportPaySummaryReport();
Data?.total && ReportPaySummaryReport();
// setFormDatas({ ...FormData }); // setFormDatas({ ...FormData });
}} }}
> >

36
src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx
View File

@ -60,7 +60,7 @@ function PdaStat() {
align: "center", align: "center",
}, },
{ {
title: "登陆名",
title: "登录名",
dataIndex: "pda_number", dataIndex: "pda_number",
key: "pda_number", key: "pda_number",
align: "center", align: "center",
@ -414,7 +414,7 @@ function PdaStat() {
</div> </div>
</div> </div>
<div className="form_item"> <div className="form_item">
<span className="lab">登陆名</span>
<span className="lab">登录名</span>
<div className="inputs"> <div className="inputs">
<Input <Input
value={FormData.pda_number} value={FormData.pda_number}
@ -497,20 +497,7 @@ function PdaStat() {
? moment(date).day(1).format("YYYY-MM-DD") ? moment(date).day(1).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date > moment(FormData.end_time)) {
setFormData({
...FormData,
end_time: dateString,
start_time: FormData.end_time,
});
} else {
setFormData({
...FormData,
start_time: dateString,
});
}
} else {
} else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
} }
}} }}
@ -536,20 +523,7 @@ function PdaStat() {
? moment(date).day(7).format("YYYY-MM-DD") ? moment(date).day(7).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date < moment(FormData.start_time)) {
setFormData({
...FormData,
start_time: dateString,
end_time: FormData.start_time,
});
} else {
setFormData({
...FormData,
end_time: dateString,
});
}
} else {
} else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });
} }
}} }}
@ -596,7 +570,7 @@ function PdaStat() {
<span <span
className={"sear_ser"} className={"sear_ser"}
onClick={() => { onClick={() => {
ReportPaySummaryReport();
Data?.total && ReportPaySummaryReport();
}} }}
> >
导出 导出

32
src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx
View File

@ -438,20 +438,7 @@ function PreOrderReport() {
? moment(date).day(1).format("YYYY-MM-DD") ? moment(date).day(1).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date > moment(FormData.end_time)) {
setFormData({
...FormData,
end_time: dateString,
start_time: FormData.end_time,
});
} else {
setFormData({
...FormData,
start_time: dateString,
});
}
} else {
}else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
} }
}} }}
@ -477,20 +464,7 @@ function PreOrderReport() {
? moment(date).day(7).format("YYYY-MM-DD") ? moment(date).day(7).format("YYYY-MM-DD")
: null, : null,
}); });
} else if (TimeChange().str == "day") {
if (date < moment(FormData.start_time)) {
setFormData({
...FormData,
start_time: dateString,
end_time: FormData.start_time,
});
} else {
setFormData({
...FormData,
end_time: dateString,
});
}
} else {
} else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });
} }
}} }}
@ -556,7 +530,7 @@ function PreOrderReport() {
<span <span
className={"sear_ser"} className={"sear_ser"}
onClick={() => { onClick={() => {
// setFormDatas({ ...FormData });
// Data?.total && setFormDatas({ ...FormData });
}} }}
> >
导出 导出

4
src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx
View File

@ -92,7 +92,7 @@ function CreateInvoice() {
rules: [ rules: [
{ {
required: true, required: true,
message: "企业类型不能为空",
message: "发票类型不能为空",
}, },
], ],
}, },
@ -266,7 +266,7 @@ function CreateInvoice() {
开票 开票
</Button> </Button>
<a <a
href={`#/financialMgm/parkingOrderInquiry?order_id=${record.order_id}`}
href={`#/financialMgm/parkingOrderInquiry?order_id=${record.order_id}&pay_time=${record.pay_time}`}
> >
支付详情 支付详情
</a> </a>

2
src/pages/FinancialMgm/SettleBill/AbnormalPayment/loadable.jsx
View File

@ -25,7 +25,7 @@ function AbnormalPayment() {
//页面检索-退款 //页面检索-退款
const formdatb = { const formdatb = {
type: 1, type: 1,
payment_channels: 0,
payment_channels: "0",
time_class: "1", //日期类型 time_class: "1", //日期类型
end_time: moment(new Date()).format("YYYY-MM-DD"), end_time: moment(new Date()).format("YYYY-MM-DD"),
start_time: moment(new Date()).subtract(1, "months").format("YYYY-MM-DD"), start_time: moment(new Date()).subtract(1, "months").format("YYYY-MM-DD"),

5
src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx
View File

@ -28,7 +28,7 @@ function GeneralBusiness() {
//页面检索-重复 //页面检索-重复
const formdata = { const formdata = {
channelType: "4", //支付方式id channelType: "4", //支付方式id
tenantId: "", //支付商户id
tenantId: "0", //支付商户id
start_time: moment().startOf("day").format("YYYY-MM-DD"), start_time: moment().startOf("day").format("YYYY-MM-DD"),
end_time: moment().endOf("day").format("YYYY-MM-DD"), end_time: moment().endOf("day").format("YYYY-MM-DD"),
pn: 1, pn: 1,
@ -167,7 +167,8 @@ function GeneralBusiness() {
<a <a
onClick={() => { onClick={() => {
// sessionStorage.setItem(FormData_BillDiff,JSON.stringify()); // sessionStorage.setItem(FormData_BillDiff,JSON.stringify());
window.location.href = "#/financialMgm/billDiff";
// window.location.href = "#/financialMgm/billDiff";
// message.warn("")
}} }}
> >
{_} {_}

52
src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx
View File

@ -68,6 +68,7 @@ function PayRepeat() {
const [Selectdata, setSelectdata] = useState([]); const [Selectdata, setSelectdata] = useState([]);
//弹框列表数据 //弹框列表数据
const [Tabdata, setTabdata] = useState({ const [Tabdata, setTabdata] = useState({
park_record_id: "",
order: [], order: [],
flow_list: [], flow_list: [],
}); });
@ -430,24 +431,28 @@ function PayRepeat() {
} }
//退款操作 //退款操作
const getRepeatTD = (text) => { const getRepeatTD = (text) => {
// ajax.ElectInvoice.getRepeatDetail({ re_mark: text }).then(
// (res) => {
// if (parseInt(res?.status) === 20000) {
// message.success(res?.message);
// setOpen(false);
// setTabdata({
// order: [],
// flow_list: [],
// });
// setTextcl("");
// } else {
// message.error(res?.message);
// }
// },
// (err) => {
// console.log(err);
// }
// );
ajax.ElectInvoice.getRepeatRefund({
park_record_id: text,
reason: Textcl,
}).then(
(res) => {
if (parseInt(res?.status) === 20000) {
message.success(res?.message);
setOpen(false);
setTabdata({
park_record_id: "",
order: [],
flow_list: [],
});
setTextcl("");
} else {
message.error(res?.message);
}
},
(err) => {
console.log(err);
}
);
}; };
//获取查看详情显示数据 //获取查看详情显示数据
const getRepeatDetail = (id) => { const getRepeatDetail = (id) => {
@ -456,6 +461,7 @@ function PayRepeat() {
(res) => { (res) => {
if (parseInt(res?.status) === 20000) { if (parseInt(res?.status) === 20000) {
setTabdata({ setTabdata({
park_record_id: id,
order: [res?.data?.order || {}], order: [res?.data?.order || {}],
flow_list: res?.data?.flow_list || [], flow_list: res?.data?.flow_list || [],
}); });
@ -473,6 +479,7 @@ function PayRepeat() {
(res) => { (res) => {
if (parseInt(res?.status) === 20000) { if (parseInt(res?.status) === 20000) {
setTabdata({ setTabdata({
park_record_id: "",
order: [res?.data?.order || {}], order: [res?.data?.order || {}],
flow_list: res?.data?.flow_list || [], flow_list: res?.data?.flow_list || [],
}); });
@ -886,7 +893,11 @@ function PayRepeat() {
footer={null} footer={null}
onCancel={() => { onCancel={() => {
setOpen(false); setOpen(false);
setTabdata([]);
setTabdata({
park_record_id: "",
order: [],
flow_list: [],
});
}} }}
width={1200} width={1200}
destroyOnClose destroyOnClose
@ -930,7 +941,7 @@ function PayRepeat() {
) : ( ) : (
<p <p
className="ant-btn submit" className="ant-btn submit"
onClick={() => getRepeatTD(Tabdata.order.order_id)}
onClick={() => getRepeatTD(Tabdata.park_record_id)}
> >
退款 退款
</p> </p>
@ -940,6 +951,7 @@ function PayRepeat() {
onClick={() => { onClick={() => {
setOpen(false); setOpen(false);
setTabdata({ setTabdata({
park_record_id: "",
order: [], order: [],
flow_list: [], flow_list: [],
}); });

11
src/services/ElectInvoice/index.js
View File

@ -119,7 +119,7 @@ const getPayRepeat = (params) => {
data: params, data: params,
}); });
}; };
//退款
//退款--
const getPayRepeatRefund = (params) => { const getPayRepeatRefund = (params) => {
return ajax({ return ajax({
url: "/api/fin/bill/refund_list", url: "/api/fin/bill/refund_list",
@ -135,6 +135,14 @@ const getRepeatDetail = (params) => {
data: params, data: params,
}); });
}; };
// 退款操作
const getRepeatRefund = (params) => {
return ajax({
url: "/api/fin/bill/repeat_refund",
type: "post",
data: params,
});
};
//下载 //下载
const downLoadRefund = (params) => { const downLoadRefund = (params) => {
return ajax({ return ajax({
@ -212,6 +220,7 @@ export default {
getPayRepeat, getPayRepeat,
getRepeatDetail, getRepeatDetail,
getPayRepeatRefund, getPayRepeatRefund,
getRepeatRefund,
downLoadRefund, downLoadRefund,
getParking, getParking,

Write Preview
Loading…
Cancel
Save