Commit 79379b6d authored by 刘世达's avatar 刘世达

Merge branch 'feat-reconciliationQuery-0411' into 'master'

Feat reconciliation query 0411

See merge request !119
parents a974d7db 40fdd03c
...@@ -31,13 +31,13 @@ const ReconciliationQuery = props => { ...@@ -31,13 +31,13 @@ const ReconciliationQuery = props => {
const checkedBillType = data => { const checkedBillType = data => {
const billType = data[0]?.billType; const billType = data[0]?.billType;
const sameData = data.filter(item => item.billType === billType); const sameData = data.filter(item => item.billType === billType);
if (data.length === sameData.length && sameData.length < 32) { if (data.length === sameData.length && sameData.length < 101) {
const billName = billType === 10 ? '销售' : '售后'; const billName = billType === 10 ? '销售' : '售后';
setbillName(billName); setbillName(billName);
return true; return true;
} }
if (sameData.length > 31) { if (sameData.length > 100) {
notification.error({ message: '一次最多选择31个账单批次' }); notification.error({ message: '一次最多选择100个账单批次' });
return false; return false;
} }
notification.error({ message: '不同账单类型不可批量操作' }); notification.error({ message: '不同账单类型不可批量操作' });
...@@ -51,7 +51,7 @@ const ReconciliationQuery = props => { ...@@ -51,7 +51,7 @@ const ReconciliationQuery = props => {
return true; return true;
} }
if (!sameData.length && !data.length) { if (!sameData.length && !data.length) {
notification.error({ message: '请选择1~31条账单批次' }); notification.error({ message: '请选择1~100条账单批次' });
return false; return false;
} }
notification.error({ message: '只有待确认账单可以确认' }); notification.error({ message: '只有待确认账单可以确认' });
...@@ -92,7 +92,7 @@ const ReconciliationQuery = props => { ...@@ -92,7 +92,7 @@ const ReconciliationQuery = props => {
}; };
const onDownload = async () => { const onDownload = async () => {
if (selectedRowKeys.length && selectedRowKeys.length < 32) { if (selectedRowKeys.length && selectedRowKeys.length < 101) {
setloading(true); setloading(true);
const data = await downloadSelfBillDetail(selectedRowKeys); const data = await downloadSelfBillDetail(selectedRowKeys);
const blob = new Blob([data]); const blob = new Blob([data]);
...@@ -102,7 +102,7 @@ const ReconciliationQuery = props => { ...@@ -102,7 +102,7 @@ const ReconciliationQuery = props => {
setselectedRows([]); setselectedRows([]);
reload(); reload();
} else { } else {
notification.error({ message: '请选择1~31条账单批次' }); notification.error({ message: '请选择1~100条账单批次' });
setloading(false); setloading(false);
} }
}; };
...@@ -165,6 +165,9 @@ const ReconciliationQuery = props => { ...@@ -165,6 +165,9 @@ const ReconciliationQuery = props => {
bordered bordered
toolBarRender={onToolBarRender} toolBarRender={onToolBarRender}
scroll={{ x: '100%', y: 400 }} scroll={{ x: '100%', y: 400 }}
pagination={{
pageSize: 100,
}}
/> />
</PageHeaderWrapper> </PageHeaderWrapper>
</Spin> </Spin>
......
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