Skip to content

M
merchant-manage-ui
Commit acd971b0 authored by guang.wu's avatar guang.wu
Browse files
Options

fix: 修改选择生成付款单判断

parent 127640b9
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 34 deletions
src/pages/SettlementSheet/index.jsx
View file @ acd971b0
......@@ -52,41 +52,43 @@ const SettlementSheet = props => {
return false;
};
// 检查帐期周期是否连续
const checkedTime = data => {
const minTime = data[0]?.billPeriodStart;
const maxTime = data[0]?.billPeriodEnd;
let minTimeNum = new Date(minTime).getTime();
let maxTimeNum = new Date(maxTime).getTime();
if (data.length < 2) {
return true;
}
for (let i = 1; i < data.length; i += 1) {
const startTime = data[i]?.billPeriodStart;
const endTime = data[i]?.billPeriodEnd;
const startTimeNum = new Date(startTime).getTime();
const endTimeNum = new Date(endTime).getTime();
if (startTimeNum > maxTimeNum && maxTimeNum + 24 * 3600 * 1000 === startTimeNum) {
maxTimeNum = endTimeNum;
} else if (minTimeNum > endTimeNum && endTimeNum + 24 * 3600 * 1000 === minTimeNum) {
minTimeNum = startTimeNum;
}
}
const endRulstTime = data[data.length - 1]?.billPeriodEnd;
const endRulstTimeNum = new Date(endRulstTime).getTime();
if (endRulstTimeNum <= maxTimeNum && minTimeNum <= endRulstTimeNum) {
return true;
}
notification.error({ message: '账单周期不连续' });
return false;
};
// const checkedTime = data => {
// const minTime = data[0]?.billPeriodStart;
// const maxTime = data[0]?.billPeriodEnd;
// let minTimeNum = new Date(minTime).getTime();
// let maxTimeNum = new Date(maxTime).getTime();
// if (data.length < 2) {
// return true;
// }
// for (let i = 1; i < data.length; i += 1) {
// const startTime = data[i]?.billPeriodStart;
// const endTime = data[i]?.billPeriodEnd;
// const startTimeNum = new Date(startTime).getTime();
// const endTimeNum = new Date(endTime).getTime();
// if (startTimeNum > maxTimeNum && maxTimeNum + 24 * 3600 * 1000 === startTimeNum) {
// maxTimeNum = endTimeNum;
// } else if (minTimeNum > endTimeNum && endTimeNum + 24 * 3600 * 1000 === minTimeNum) {
// minTimeNum = startTimeNum;
// }
// }
// const endRulstTime = data[data.length - 1]?.billPeriodEnd;
// const endRulstTimeNum = new Date(endRulstTime).getTime();
// if (endRulstTimeNum <= maxTimeNum && minTimeNum <= endRulstTimeNum) {
// return true;
// }
// notification.error({ message: '账单周期不连续' });
// return false;
// };
const onSelectChange = (selectedRowKeys, selectedRows) => {
if (selectedRowsList.length > selectedRows.length) {
setselectedRowKeys(selectedRowKeys);
setselectedRowsList(selectedRows);
} else if (checkedTime(selectedRows)) {
setselectedRowKeys(selectedRowKeys);
setselectedRowsList(selectedRows);
}
// if (selectedRowsList.length > selectedRows.length) {
// setselectedRowKeys(selectedRowKeys);
// setselectedRowsList(selectedRows);
// } else if (checkedTime(selectedRows)) {
// setselectedRowKeys(selectedRowKeys);
// setselectedRowsList(selectedRows);
// }
setselectedRowKeys(selectedRowKeys);
setselectedRowsList(selectedRows);
};
const paymentOrder = async () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment