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

fix(): 解决时间为周时问题

tags/PMS_V1.0.0_Alpha5
chenqiang 1 year ago
parent
45b86aa413
commit
a83cf76daa
13 changed files with 237 additions and 99 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. 27
      src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx
  2. 27
      src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx
  3. 27
      src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx
  4. 27
      src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx
  5. 7
      src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx
  6. 27
      src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx
  7. 27
      src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx
  8. 27
      src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx
  9. 27
      src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx
  10. 27
      src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx
  11. 32
      src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx
  12. 27
      src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx
  13. 27
      src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx

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

@ -210,8 +210,15 @@ function ExceptionParkReport() {
start = moment().format("YYYY-MM"); start = moment().format("YYYY-MM");
end = moment().format("YYYY-MM"); end = moment().format("YYYY-MM");
} else if (e == 2) { } else if (e == 2) {
start = moment().day(1).format("YYYY-MM-DD");
end = moment().day(7).format("YYYY-MM-DD");
let weekOfday = moment().format("E");
let last_monday = moment()
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
let last_sunday = moment()
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
start = last_monday;
end = last_sunday;
// start = moment().subtract(7, "days").format("YYYY-MM-DD"); // start = moment().subtract(7, "days").format("YYYY-MM-DD");
// end = moment().format("YYYY-MM-DD"); // end = moment().format("YYYY-MM-DD");
} else { } else {
@ -497,11 +504,13 @@ function ExceptionParkReport() {
onChange={(date, dateString) => { onChange={(date, dateString) => {
console.log(date, dateString); console.log(date, dateString);
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_monday = moment(date)
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
start_date: date
? moment(date).day(1).format("YYYY-MM-DD")
: null,
start_date: date ? last_monday : null,
}); });
} else { } else {
setFormData({ ...FormData, start_date: dateString }); setFormData({ ...FormData, start_date: dateString });
@ -526,11 +535,13 @@ function ExceptionParkReport() {
value={FormData.end_date ? moment(FormData.end_date) : null} value={FormData.end_date ? moment(FormData.end_date) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_sunday = moment(date)
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
end_date: date
? moment(date).day(7).format("YYYY-MM-DD")
: null,
end_date: date ? last_sunday : null,
}); });
} else { } else {
setFormData({ ...FormData, end_date: dateString }); setFormData({ ...FormData, end_date: dateString });

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

@ -147,8 +147,15 @@ function ParkingAly() {
start = moment().format("YYYY-MM"); start = moment().format("YYYY-MM");
end = moment().format("YYYY-MM"); end = moment().format("YYYY-MM");
} else if (e == 2) { } else if (e == 2) {
start = moment().day(1).format("YYYY-MM-DD");
end = moment().day(7).format("YYYY-MM-DD");
let weekOfday = moment().format("E");
let last_monday = moment()
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
let last_sunday = moment()
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
start = last_monday;
end = last_sunday;
// start = moment().subtract(7, "days").format("YYYY-MM-DD"); // start = moment().subtract(7, "days").format("YYYY-MM-DD");
// end = moment().format("YYYY-MM-DD"); // end = moment().format("YYYY-MM-DD");
} else { } else {
@ -500,11 +507,13 @@ function ParkingAly() {
value={FormData.start_date ? moment(FormData.start_date) : null} value={FormData.start_date ? moment(FormData.start_date) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_monday = moment(date)
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
start_date: date
? moment(date).day(1).format("YYYY-MM-DD")
: null,
start_date: date ? last_monday : null,
}); });
} else { } else {
setFormData({ ...FormData, start_date: dateString }); setFormData({ ...FormData, start_date: dateString });
@ -529,11 +538,13 @@ function ParkingAly() {
value={FormData.end_date ? moment(FormData.end_date) : null} value={FormData.end_date ? moment(FormData.end_date) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_sunday = moment(date)
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
end_date: date
? moment(date).day(7).format("YYYY-MM-DD")
: null,
end_date: date ? last_sunday : null,
}); });
} else { } else {
setFormData({ ...FormData, end_date: dateString }); setFormData({ ...FormData, end_date: dateString });

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

@ -160,8 +160,15 @@ function PayAly() {
start = moment().format("YYYY-MM"); start = moment().format("YYYY-MM");
end = moment().format("YYYY-MM"); end = moment().format("YYYY-MM");
} else if (e == 2) { } else if (e == 2) {
start = moment().day(1).format("YYYY-MM-DD");
end = moment().day(7).format("YYYY-MM-DD");
let weekOfday = moment().format("E");
let last_monday = moment()
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
let last_sunday = moment()
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
start = last_monday;
end = last_sunday;
// start = moment().subtract(7, "days").format("YYYY-MM-DD"); // start = moment().subtract(7, "days").format("YYYY-MM-DD");
// end = moment().format("YYYY-MM-DD"); // end = moment().format("YYYY-MM-DD");
} else { } else {
@ -789,11 +796,13 @@ function PayAly() {
value={FormData.start_date ? moment(FormData.start_date) : null} value={FormData.start_date ? moment(FormData.start_date) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_monday = moment(date)
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
start_date: date
? moment(date).day(1).format("YYYY-MM-DD")
: null,
start_date: date ? last_monday : null,
}); });
} else { } else {
setFormData({ ...FormData, start_date: dateString }); setFormData({ ...FormData, start_date: dateString });
@ -818,11 +827,13 @@ function PayAly() {
value={FormData.end_date ? moment(FormData.end_date) : null} value={FormData.end_date ? moment(FormData.end_date) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_sunday = moment(date)
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
end_date: date
? moment(date).day(7).format("YYYY-MM-DD")
: null,
end_date: date ? last_sunday : null,
}); });
} else { } else {
setFormData({ ...FormData, end_date: dateString }); setFormData({ ...FormData, end_date: dateString });

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

@ -151,8 +151,15 @@ function RegisterAly() {
start = moment().format("YYYY-MM"); start = moment().format("YYYY-MM");
end = moment().format("YYYY-MM"); end = moment().format("YYYY-MM");
} else if (e == 2) { } else if (e == 2) {
start = moment().day(1).format("YYYY-MM-DD");
end = moment().day(7).format("YYYY-MM-DD");
let weekOfday = moment().format("E");
let last_monday = moment()
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
let last_sunday = moment()
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
start = last_monday;
end = last_sunday;
// start = moment().subtract(7, "days").format("YYYY-MM-DD"); // start = moment().subtract(7, "days").format("YYYY-MM-DD");
// end = moment().format("YYYY-MM-DD"); // end = moment().format("YYYY-MM-DD");
} else { } else {
@ -662,11 +669,13 @@ function RegisterAly() {
value={FormData.start_date ? moment(FormData.start_date) : null} value={FormData.start_date ? moment(FormData.start_date) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_monday = moment(date)
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
start_date: date
? moment(date).day(1).format("YYYY-MM-DD")
: null,
start_date: date ? last_monday : null,
}); });
} else { } else {
setFormData({ ...FormData, start_date: dateString }); setFormData({ ...FormData, start_date: dateString });
@ -691,11 +700,13 @@ function RegisterAly() {
value={FormData.end_date ? moment(FormData.end_date) : null} value={FormData.end_date ? moment(FormData.end_date) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_sunday = moment(date)
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
end_date: date
? moment(date).day(7).format("YYYY-MM-DD")
: null,
end_date: date ? last_sunday : null,
}); });
} else { } else {
setFormData({ ...FormData, end_date: dateString }); setFormData({ ...FormData, end_date: dateString });

7
src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx
View File

@ -1350,9 +1350,10 @@ const ParkingOverview = connect(function mapStateToProps(state) {
let yune = data?.data?.content; let yune = data?.data?.content;
setText(yune); setText(yune);
} else if (data?.data?.type == "arrears") { } else if (data?.data?.type == "arrears") {
let buf = [data?.data, ...qfdata].slice(0, 10);
sessionStorage.setItem("tmd", JSON.stringify(buf));
setqfdata(buf);
let buf = JSON.parse(JSON.stringify(qfdata));
let arrs = buf.unshift(data?.data).slice(0, 10);
sessionStorage.setItem("tmd", JSON.stringify(arrs));
setqfdata(arrs);
setHoShow(true); setHoShow(true);
} }
}; };

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

@ -315,8 +315,15 @@ function BookReport() {
start = moment().format("YYYY-MM"); start = moment().format("YYYY-MM");
end = moment().format("YYYY-MM"); end = moment().format("YYYY-MM");
} else if (e == 2) { } else if (e == 2) {
start = moment().day(1).format("YYYY-MM-DD");
end = moment().day(7).format("YYYY-MM-DD");
let weekOfday = moment().format("E");
let last_monday = moment()
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
let last_sunday = moment()
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
start = last_monday;
end = last_sunday;
// start = moment().subtract(7, "days").format("YYYY-MM-DD"); // start = moment().subtract(7, "days").format("YYYY-MM-DD");
// end = moment().format("YYYY-MM-DD"); // end = moment().format("YYYY-MM-DD");
} else { } else {
@ -632,11 +639,13 @@ function BookReport() {
value={FormData.start_time ? moment(FormData.start_time) : null} value={FormData.start_time ? moment(FormData.start_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_monday = moment(date)
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
start_time: date
? moment(date).day(1).format("YYYY-MM-DD")
: null,
start_time: date ? last_monday : null,
}); });
} else { } else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
@ -658,11 +667,13 @@ function BookReport() {
value={FormData.end_time ? moment(FormData.end_time) : null} value={FormData.end_time ? moment(FormData.end_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_sunday = moment(date)
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
end_time: date
? moment(date).day(7).format("YYYY-MM-DD")
: null,
end_time: date ? last_sunday : null,
}); });
} else { } else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });

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

@ -455,8 +455,15 @@ function OperationReport() {
start = moment().format("YYYY-MM"); start = moment().format("YYYY-MM");
end = moment().format("YYYY-MM"); end = moment().format("YYYY-MM");
} else if (e == 2) { } else if (e == 2) {
start = moment().day(1).format("YYYY-MM-DD");
end = moment().day(7).format("YYYY-MM-DD");
let weekOfday = moment().format("E");
let last_monday = moment()
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
let last_sunday = moment()
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
start = last_monday;
end = last_sunday;
// start = moment().subtract(7, "days").format("YYYY-MM-DD"); // start = moment().subtract(7, "days").format("YYYY-MM-DD");
// end = moment().format("YYYY-MM-DD"); // end = moment().format("YYYY-MM-DD");
} else { } else {
@ -706,11 +713,13 @@ function OperationReport() {
onChange={(date, dateString) => { onChange={(date, dateString) => {
console.log(date, dateString); console.log(date, dateString);
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_monday = moment(date)
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
start_time: date
? moment(date).day(1).format("YYYY-MM-DD")
: null,
start_time: date ? last_monday : null,
}); });
} else { } else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
@ -732,11 +741,13 @@ function OperationReport() {
value={FormData.end_time ? moment(FormData.end_time) : null} value={FormData.end_time ? moment(FormData.end_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_sunday = moment(date)
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
end_time: date
? moment(date).day(7).format("YYYY-MM-DD")
: null,
end_time: date ? last_sunday : null,
}); });
} else { } else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });

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

@ -196,8 +196,15 @@ function ParkCardReport() {
start = moment().format("YYYY-MM"); start = moment().format("YYYY-MM");
end = moment().format("YYYY-MM"); end = moment().format("YYYY-MM");
} else if (e == 2) { } else if (e == 2) {
start = moment().day(1).format("YYYY-MM-DD");
end = moment().day(7).format("YYYY-MM-DD");
let weekOfday = moment().format("E");
let last_monday = moment()
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
let last_sunday = moment()
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
start = last_monday;
end = last_sunday;
// start = moment().subtract(7, "days").format("YYYY-MM-DD"); // start = moment().subtract(7, "days").format("YYYY-MM-DD");
// end = moment().format("YYYY-MM-DD"); // end = moment().format("YYYY-MM-DD");
} else { } else {
@ -410,11 +417,13 @@ function ParkCardReport() {
value={FormData.start_time ? moment(FormData.start_time) : null} value={FormData.start_time ? moment(FormData.start_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_monday = moment(date)
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
start_time: date
? moment(date).day(1).format("YYYY-MM-DD")
: null,
start_time: date ? last_monday : null,
}); });
} else { } else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
@ -436,11 +445,13 @@ function ParkCardReport() {
value={FormData.end_time ? moment(FormData.end_time) : null} value={FormData.end_time ? moment(FormData.end_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_sunday = moment(date)
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
end_time: date
? moment(date).day(7).format("YYYY-MM-DD")
: null,
end_time: date ? last_sunday : null,
}); });
} else { } else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });

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

@ -369,8 +369,15 @@ function ParkingIncomeReport() {
start = moment().format("YYYY-MM"); start = moment().format("YYYY-MM");
end = moment().format("YYYY-MM"); end = moment().format("YYYY-MM");
} else if (e == 2) { } else if (e == 2) {
start = moment().day(1).format("YYYY-MM-DD");
end = moment().day(7).format("YYYY-MM-DD");
let weekOfday = moment().format("E");
let last_monday = moment()
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
let last_sunday = moment()
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
start = last_monday;
end = last_sunday;
// start = moment().subtract(7, "days").format("YYYY-MM-DD"); // start = moment().subtract(7, "days").format("YYYY-MM-DD");
// end = moment().format("YYYY-MM-DD"); // end = moment().format("YYYY-MM-DD");
} else { } else {
@ -621,11 +628,13 @@ function ParkingIncomeReport() {
value={FormData.start_time ? moment(FormData.start_time) : null} value={FormData.start_time ? moment(FormData.start_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_monday = moment(date)
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
start_time: date
? moment(date).day(1).format("YYYY-MM-DD")
: null,
start_time: date ? last_monday : null,
}); });
} else { } else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
@ -647,11 +656,13 @@ function ParkingIncomeReport() {
value={FormData.end_time ? moment(FormData.end_time) : null} value={FormData.end_time ? moment(FormData.end_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_sunday = moment(date)
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
end_time: date
? moment(date).day(7).format("YYYY-MM-DD")
: null,
end_time: date ? last_sunday : null,
}); });
} else { } else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });

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

@ -370,8 +370,15 @@ function PayChannelStat() {
start = moment().format("YYYY-MM"); start = moment().format("YYYY-MM");
end = moment().format("YYYY-MM"); end = moment().format("YYYY-MM");
} else if (e == 2) { } else if (e == 2) {
start = moment().day(1).format("YYYY-MM-DD");
end = moment().day(7).format("YYYY-MM-DD");
let weekOfday = moment().format("E");
let last_monday = moment()
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
let last_sunday = moment()
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
start = last_monday;
end = last_sunday;
// start = moment().subtract(7, "days").format("YYYY-MM-DD"); // start = moment().subtract(7, "days").format("YYYY-MM-DD");
// end = moment().format("YYYY-MM-DD"); // end = moment().format("YYYY-MM-DD");
} else { } else {
@ -604,11 +611,13 @@ function PayChannelStat() {
value={FormData.start_time ? moment(FormData.start_time) : null} value={FormData.start_time ? moment(FormData.start_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_monday = moment(date)
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
start_time: date
? moment(date).day(1).format("YYYY-MM-DD")
: null,
start_time: date ? last_monday : null,
}); });
} else { } else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
@ -630,11 +639,13 @@ function PayChannelStat() {
value={FormData.end_time ? moment(FormData.end_time) : null} value={FormData.end_time ? moment(FormData.end_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_sunday = moment(date)
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
end_time: date
? moment(date).day(7).format("YYYY-MM-DD")
: null,
end_time: date ? last_sunday : null,
}); });
} else { } else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });

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

@ -248,8 +248,15 @@ function PaySummaryReport() {
start = moment().format("YYYY-MM"); start = moment().format("YYYY-MM");
end = moment().format("YYYY-MM"); end = moment().format("YYYY-MM");
} else if (e == 2) { } else if (e == 2) {
start = moment().day(1).format("YYYY-MM-DD");
end = moment().day(7).format("YYYY-MM-DD");
let weekOfday = moment().format("E");
let last_monday = moment()
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
let last_sunday = moment()
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
start = last_monday;
end = last_sunday;
// start = moment().subtract(7, "days").format("YYYY-MM-DD"); // start = moment().subtract(7, "days").format("YYYY-MM-DD");
// end = moment().format("YYYY-MM-DD"); // end = moment().format("YYYY-MM-DD");
} else { } else {
@ -506,8 +513,14 @@ function PaySummaryReport() {
value={FormData.start_time ? moment(FormData.start_time) : null} value={FormData.start_time ? moment(FormData.start_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_sunday = moment(date).subtract(
weekOfday - 1,
"days"
);
let days = moment(FormData.end_time).diff( let days = moment(FormData.end_time).diff(
moment(date).day(1),
last_sunday,
"days" "days"
); );
if (days > 30) { if (days > 30) {
@ -522,7 +535,7 @@ function PaySummaryReport() {
setFormData({ setFormData({
...FormData, ...FormData,
start_time: date start_time: date
? moment(date).day(1).format("YYYY-MM-DD")
? last_sunday.format("YYYY-MM-DD")
: null, : null,
}); });
} }
@ -556,9 +569,12 @@ function PaySummaryReport() {
value={FormData.end_time ? moment(FormData.end_time) : null} value={FormData.end_time ? moment(FormData.end_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let days = moment(date)
.day(7)
.diff(moment(FormData.start_time), "days");
let weekOfday = moment(date).format("E");
let last_sunday = moment(date).add(7 - weekOfday, "days");
let days = last_sunday.diff(
moment(FormData.start_time),
"days"
);
console.log(days); console.log(days);
if (days > 30) { if (days > 30) {
setFormData({ setFormData({
@ -569,7 +585,7 @@ function PaySummaryReport() {
setFormData({ setFormData({
...FormData, ...FormData,
end_time: date end_time: date
? moment(date).day(7).format("YYYY-MM-DD")
? last_sunday.format("YYYY-MM-DD")
: null, : null,
}); });
} }

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

@ -230,8 +230,15 @@ function PdaStat() {
start = moment().format("YYYY-MM"); start = moment().format("YYYY-MM");
end = moment().format("YYYY-MM"); end = moment().format("YYYY-MM");
} else if (e == 2) { } else if (e == 2) {
start = moment().day(1).format("YYYY-MM-DD");
end = moment().day(7).format("YYYY-MM-DD");
let weekOfday = moment().format("E");
let last_monday = moment()
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
let last_sunday = moment()
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
start = last_monday;
end = last_sunday;
// start = moment().subtract(7, "days").format("YYYY-MM-DD"); // start = moment().subtract(7, "days").format("YYYY-MM-DD");
// end = moment().format("YYYY-MM-DD"); // end = moment().format("YYYY-MM-DD");
} else { } else {
@ -493,11 +500,13 @@ function PdaStat() {
value={FormData.start_time ? moment(FormData.start_time) : null} value={FormData.start_time ? moment(FormData.start_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_monday = moment(date)
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
start_time: date
? moment(date).day(1).format("YYYY-MM-DD")
: null,
start_time: date ? last_monday : null,
}); });
} else { } else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
@ -519,11 +528,13 @@ function PdaStat() {
value={FormData.end_time ? moment(FormData.end_time) : null} value={FormData.end_time ? moment(FormData.end_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_sunday = moment(date)
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
end_time: date
? moment(date).day(7).format("YYYY-MM-DD")
: null,
end_time: date ? last_sunday : null,
}); });
} else { } else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });

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

@ -237,8 +237,15 @@ function PreOrderReport() {
start = moment().format("YYYY-MM"); start = moment().format("YYYY-MM");
end = moment().format("YYYY-MM"); end = moment().format("YYYY-MM");
} else if (e == 2) { } else if (e == 2) {
start = moment().day(1).format("YYYY-MM-DD");
end = moment().day(7).format("YYYY-MM-DD");
let weekOfday = moment().format("E");
let last_monday = moment()
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
let last_sunday = moment()
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
start = last_monday;
end = last_sunday;
// start = moment().subtract(7, "days").format("YYYY-MM-DD"); // start = moment().subtract(7, "days").format("YYYY-MM-DD");
// end = moment().format("YYYY-MM-DD"); // end = moment().format("YYYY-MM-DD");
} else { } else {
@ -471,11 +478,13 @@ function PreOrderReport() {
value={FormData.start_time ? moment(FormData.start_time) : null} value={FormData.start_time ? moment(FormData.start_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_monday = moment(date)
.subtract(weekOfday - 1, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
start_time: date
? moment(date).day(1).format("YYYY-MM-DD")
: null,
start_time: date ? last_monday : null,
}); });
} else { } else {
setFormData({ ...FormData, start_time: dateString }); setFormData({ ...FormData, start_time: dateString });
@ -497,11 +506,13 @@ function PreOrderReport() {
value={FormData.end_time ? moment(FormData.end_time) : null} value={FormData.end_time ? moment(FormData.end_time) : null}
onChange={(date, dateString) => { onChange={(date, dateString) => {
if (TimeChange().str == "week") { if (TimeChange().str == "week") {
let weekOfday = moment(date).format("E");
let last_sunday = moment(date)
.add(7 - weekOfday, "days")
.format("YYYY-MM-DD");
setFormData({ setFormData({
...FormData, ...FormData,
end_time: date
? moment(date).day(7).format("YYYY-MM-DD")
: null,
end_time: date ? last_sunday : null,
}); });
} else { } else {
setFormData({ ...FormData, end_time: dateString }); setFormData({ ...FormData, end_time: dateString });

Write Preview
Loading…
Cancel
Save