Skip to content

M
merchant-manage-ui
Commit 194cfcfe authored by lxd's avatar lxd
Browse files
Options

faet: 问题修复

parent 5de0c276
Hide whitespace changes
Inline Side-by-side
Showing with 216 additions and 168 deletions
src/pages/PaymentMange/data.js
View file @ 194cfcfe
...@@ -21,12 +21,17 @@ export const redInvoiceState = { ...@@ -21,12 +21,17 @@ export const redInvoiceState = {
1: { text: '是', actionValue: 2 }, 1: { text: '是', actionValue: 2 },
2: { text: '否', actionValue: 1 }, 2: { text: '否', actionValue: 1 },
}; };
export const onChangeActiveState = async ({ channelId, activeState }) => {
console.log(channelId, activeState);
};
export function columns(res) { export function columns(res, pages) {
const { current, pageSize } = pages;
return [ return [
{
title: '序号',
dataIndex: 'index',
hideInSearch: true,
width: '50px',
render: (text, record, index) => (current - 1) * pageSize + index + 1,
},
{ {
title: '供应商名称', title: '供应商名称',
dataIndex: 'supplierName', dataIndex: 'supplierName',
...@@ -150,7 +155,7 @@ export function columns(res) { ...@@ -150,7 +155,7 @@ export function columns(res) {
</Button> </Button>
<Button <Button
type="primary" type="primary"
disabled={row.blueInvoiceState === 1} disabled={row.blueInvoiceState === 1 && row.payState !== 1}
className={styles.button} className={styles.button}
onClick={() => res.edit(2, row)} onClick={() => res.edit(2, row)}
> >
......
src/pages/PaymentMange/index.jsx
View file @ 194cfcfe
...@@ -24,6 +24,7 @@ const PaymentMange = () => { ...@@ -24,6 +24,7 @@ const PaymentMange = () => {
const [toExamineData, settoExamineData] = useState({}); const [toExamineData, settoExamineData] = useState({});
const [loading, setloading] = useState(false); const [loading, setloading] = useState(false);
const [status, setstatus] = useState(1); const [status, setstatus] = useState(1);
const [pages, setpages] = useState({});
const [toExamineModalVisibel, setToExamineModalVisibel] = useState(false); const [toExamineModalVisibel, setToExamineModalVisibel] = useState(false);
const reload = () => { const reload = () => {
...@@ -131,6 +132,7 @@ const PaymentMange = () => { ...@@ -131,6 +132,7 @@ const PaymentMange = () => {
onClick={() => { onClick={() => {
// eslint-disable-next-line no-unused-expressions // eslint-disable-next-line no-unused-expressions
form?.resetFields(); form?.resetFields();
reload();
}} }}
> >
{resetText} {resetText}
...@@ -154,8 +156,12 @@ const PaymentMange = () => { ...@@ -154,8 +156,12 @@ const PaymentMange = () => {
<ProTable <ProTable
actionRef={actionRef} actionRef={actionRef}
formRef={formRef} formRef={formRef}
request={params => query({ ...params })} request={params => {
columns={columns(res)} const { current, pageSize } = params;
setpages({ current, pageSize });
return query({ ...params });
}}
columns={columns(res, pages)}
rowKey={r => r.id} rowKey={r => r.id}
search={{ search={{
collapsed: false, collapsed: false,
......
src/pages/PaymentMange/service.js
View file @ 194cfcfe
...@@ -35,12 +35,21 @@ export async function qiniuToken() { ...@@ -35,12 +35,21 @@ export async function qiniuToken() {
} }
// 付款单导出 // 付款单导出
export async function selfPaymentExport(params) { export async function selfPaymentExport(params) {
console.log(params?.dateTimeRange?.[0]);
const queryParams = { const queryParams = {
payBatchNo: params?.payBatchNo, payBatchNo: params?.payBatchNo,
payBeginDate: params?.dateTimeRange?.[0], payBeginDate: params?.dateTimeRange?.[0]
payEndDate: params?.dateTimeRange?.[1], ? moment(params?.dateTimeRange?.[0]).format('yyyy-MM-DD')
paidBeginDate: params?.payTimeRange?.[0], : '',
paidEndDate: params?.payTimeRange?.[1], payEndDate: params?.dateTimeRange?.[1]
? moment(params?.dateTimeRange?.[1]).format('yyyy-MM-DD')
: '',
paidBeginDate: params?.payTimeRange?.[0]
? moment(params?.payTimeRange?.[1]).format('yyyy-MM-DD')
: '',
paidEndDate: params?.payTimeRange?.[1]
? moment(params?.payTimeRange?.[1]).format('yyyy-MM-DD')
: '',
redInvoiceState: params?.redInvoiceState, redInvoiceState: params?.redInvoiceState,
blueInvoiceState: params?.blueInvoiceState, blueInvoiceState: params?.blueInvoiceState,
payState: params?.payState, payState: params?.payState,
......
src/pages/ReconciliationQuery/data.js
View file @ 194cfcfe
...@@ -12,70 +12,73 @@ export const orderStateNum = { ...@@ -12,70 +12,73 @@ export const orderStateNum = {
3: { text: '已生成结算单' }, 3: { text: '已生成结算单' },
}; };
export const columns = [ export function columns(pages) {
{ const { current, pageSize } = pages;
title: '序号', return [
dataIndex: 'index', {
hideInSearch: true, title: '序号',
width: '50px', dataIndex: 'index',
render: (text, record, index) => `${index + 1}`, hideInSearch: true,
}, width: '50px',
{ render: (text, record, index) => (current - 1) * pageSize + index + 1,
title: '供应商名称', },
dataIndex: 'supplierName', {
width: '150px', title: '供应商名称',
hideInSearch: true, dataIndex: 'supplierName',
}, width: '150px',
{ hideInSearch: true,
title: '结算单批次号', },
dataIndex: 'settleBatchNo', {
width: '160px', title: '结算单批次号',
}, dataIndex: 'settleBatchNo',
{ width: '160px',
title: '账单日期', },
key: 'dateTimeRange', {
dataIndex: 'createdAtRange', title: '账单日期',
valueType: 'dateRange', key: 'dateTimeRange',
width: '120px', dataIndex: 'createdAtRange',
hideInTable: true, valueType: 'dateRange',
initialValue: [], width: '120px',
align: 'center', hideInTable: true,
}, initialValue: [],
{ align: 'center',
title: '账单日期', },
dataIndex: 'billDateStr', {
key: 'billDateStr', title: '账单日期',
hideInSearch: true, dataIndex: 'billDateStr',
align: 'center', key: 'billDateStr',
width: '160px', hideInSearch: true,
}, align: 'center',
{ width: '160px',
title: '账单类型', },
dataIndex: 'billType', {
valueEnum: activeStateEnum, title: '账单类型',
width: '120px', dataIndex: 'billType',
filters: false, valueEnum: activeStateEnum,
}, width: '120px',
{ filters: false,
title: '金额', },
dataIndex: 'amount', {
width: '100px', title: '金额',
hideInSearch: true, dataIndex: 'amount',
}, width: '100px',
{ hideInSearch: true,
title: '笔数', },
dataIndex: 'quantity', {
width: '100px', title: '笔数',
hideInSearch: true, dataIndex: 'quantity',
}, width: '100px',
{ hideInSearch: true,
title: '状态', },
dataIndex: 'status', {
valueEnum: orderStateNum, title: '状态',
width: '100px', dataIndex: 'status',
filters: false, valueEnum: orderStateNum,
}, width: '100px',
]; filters: false,
},
];
}
export const toolBarRender = gather => { export const toolBarRender = gather => {
const { onDownload, confirmAction } = gather; const { onDownload, confirmAction } = gather;
......
src/pages/ReconciliationQuery/index.jsx
View file @ 194cfcfe
...@@ -13,6 +13,8 @@ const ReconciliationQuery = () => { ...@@ -13,6 +13,8 @@ const ReconciliationQuery = () => {
const [selectedRowKeys, setselectedRowKeys] = useState([]); const [selectedRowKeys, setselectedRowKeys] = useState([]);
const [selectedRows, setselectedRows] = useState([]); const [selectedRows, setselectedRows] = useState([]);
const [loading, setloading] = useState(false); const [loading, setloading] = useState(false);
const [pages, setpages] = useState({});
const [billName, setbillName] = useState('');
const reload = () => { const reload = () => {
if (actionRef.current) { if (actionRef.current) {
...@@ -25,10 +27,12 @@ const ReconciliationQuery = () => { ...@@ -25,10 +27,12 @@ const ReconciliationQuery = () => {
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 < 32) {
const billName = billType === '10' ? '销售' : '售后';
setbillName(billName);
return true; return true;
} }
if (sameData.length > 31) { if (sameData.length > 31) {
notification.error({ message: '最多选择31条数据账单' }); notification.error({ message: '一次最多选择31个账单批次' });
return false; return false;
} }
notification.error({ message: '不同账单类型不可批量操作' }); notification.error({ message: '不同账单类型不可批量操作' });
...@@ -42,7 +46,7 @@ const ReconciliationQuery = () => { ...@@ -42,7 +46,7 @@ const ReconciliationQuery = () => {
return true; return true;
} }
if (!sameData.length && !data.length) { if (!sameData.length && !data.length) {
notification.error({ message: '请选择数据账单' }); notification.error({ message: '请选择1~31条账单批次' });
return false; return false;
} }
notification.error({ message: '只有待确认账单可以确认' }); notification.error({ message: '只有待确认账单可以确认' });
...@@ -77,13 +81,13 @@ const ReconciliationQuery = () => { ...@@ -77,13 +81,13 @@ const ReconciliationQuery = () => {
setloading(true); setloading(true);
const data = await downloadSelfBillDetail(selectedRowKeys); const data = await downloadSelfBillDetail(selectedRowKeys);
const blob = new Blob([data]); const blob = new Blob([data]);
saveAs(blob, `付款单导出数据-${format(new Date(), 'yyyyMMddHHmmss')}.xlsx`); saveAs(blob, `${billName}-${format(new Date(), 'yyyyMMddHHmmss')}.xlsx`);
setloading(false); setloading(false);
setselectedRowKeys([]); setselectedRowKeys([]);
setselectedRows([]); setselectedRows([]);
reload(); reload();
} else { } else {
notification.error({ message: '最少下载1条数据账单或最多下载31条数据账单' }); notification.error({ message: '请选择1~31条账单批次' });
setloading(false); setloading(false);
} }
}; };
...@@ -118,6 +122,7 @@ const ReconciliationQuery = () => { ...@@ -118,6 +122,7 @@ const ReconciliationQuery = () => {
onClick={() => { onClick={() => {
// eslint-disable-next-line no-unused-expressions // eslint-disable-next-line no-unused-expressions
form?.resetFields(); form?.resetFields();
reload();
}} }}
> >
{resetText} {resetText}
...@@ -128,8 +133,12 @@ const ReconciliationQuery = () => { ...@@ -128,8 +133,12 @@ const ReconciliationQuery = () => {
<PageHeaderWrapper> <PageHeaderWrapper>
<ProTable <ProTable
actionRef={actionRef} actionRef={actionRef}
request={params => query({ ...params })} request={params => {
columns={columns} const { current, pageSize } = params;
setpages({ current, pageSize });
return query({ ...params });
}}
columns={columns(pages)}
rowKey={r => r.id} rowKey={r => r.id}
search={{ search={{
collapsed: false, collapsed: false,
......
src/pages/SettlementSheet/data.js
View file @ 194cfcfe
...@@ -18,91 +18,101 @@ export const paymentStateEnum = { ...@@ -18,91 +18,101 @@ export const paymentStateEnum = {
false: { text: '否' }, false: { text: '否' },
}; };
export const columns = [ export function columns(pages) {
{ const { current, pageSize } = pages;
title: '供应商名称', return [
dataIndex: 'supplierName', {
width: '150px', title: '序号',
hideInSearch: true, dataIndex: 'index',
}, hideInSearch: true,
{ width: '50px',
title: '付款单批次号', render: (text, record, index) => (current - 1) * pageSize + index + 1,
dataIndex: 'payBatchNo', },
width: '160px', {
}, title: '供应商名称',
{ dataIndex: 'supplierName',
title: '结算单批次号', width: '150px',
dataIndex: 'settleBatchNo', hideInSearch: true,
width: '150px', },
}, {
{ title: '付款单批次号',
title: '结算单生成日期', dataIndex: 'payBatchNo',
key: 'dateTimeRange', width: '160px',
dataIndex: 'createdAtRange', },
valueType: 'dateRange', {
width: '120px', title: '结算单批次号',
hideInTable: true, dataIndex: 'settleBatchNo',
initialValue: [], width: '150px',
align: 'center', },
}, {
{ title: '结算单生成日期',
title: '帐单确认周期', key: 'dateTimeRange',
dataIndex: 'createdAtRange', dataIndex: 'createdAtRange',
key: 'createdAtRange', valueType: 'dateRange',
hideInSearch: true, width: '120px',
align: 'center', hideInTable: true,
width: '160px', initialValue: [],
render: (text, record) => `${record.billPeriodStart}-${record.billPeriodEnd}`, align: 'center',
}, },
{ {
title: '账期', title: '帐单确认周期',
dataIndex: 'billPeriodType', dataIndex: 'createdAtRange',
valueEnum: dateStateEnum, key: 'createdAtRange',
width: '120px', hideInSearch: true,
hideInSearch: true, align: 'center',
filters: false, width: '160px',
}, render: (text, record) => `${record.billPeriodStart}-${record.billPeriodEnd}`,
{ },
title: '结算单生成日期', {
dataIndex: 'createdAt', title: '账期',
key: 'createdAt', dataIndex: 'billPeriodType',
hideInSearch: true, valueEnum: dateStateEnum,
align: 'center', width: '120px',
width: '160px', hideInSearch: true,
}, filters: false,
{ },
title: '销售金额', {
dataIndex: 'saleAmount', title: '结算单生成日期',
width: '100px', dataIndex: 'createdAt',
hideInSearch: true, key: 'createdAt',
}, hideInSearch: true,
{ align: 'center',
title: '退款金额', width: '160px',
dataIndex: 'refundAmount', },
width: '100px', {
hideInSearch: true, title: '销售金额',
}, dataIndex: 'saleAmount',
{ width: '100px',
title: '结算金额', hideInSearch: true,
dataIndex: 'payableAmount', },
width: '130px', {
hideInSearch: true, title: '退款金额',
}, dataIndex: 'refundAmount',
{ width: '100px',
title: '结算状态', hideInSearch: true,
dataIndex: 'settleState', },
valueEnum: orderStateNum, {
width: '100px', title: '结算金额',
initialValue: 0, dataIndex: 'payableAmount',
filters: false, width: '130px',
}, hideInSearch: true,
{ },
title: '是否生成付款单', {
dataIndex: 'isCreatePaymentBill', title: '结算状态',
valueEnum: paymentStateEnum, dataIndex: 'settleState',
hideInTable: true, valueEnum: orderStateNum,
}, width: '100px',
]; initialValue: 0,
filters: false,
},
{
title: '是否生成付款单',
dataIndex: 'isCreatePaymentBill',
valueEnum: paymentStateEnum,
hideInTable: true,
},
];
}
export const toolBarRender = paymentOrder => () => [ export const toolBarRender = paymentOrder => () => [
<Button type="primary" onClick={paymentOrder}> <Button type="primary" onClick={paymentOrder}>
......
src/pages/SettlementSheet/index.jsx
View file @ 194cfcfe
...@@ -13,6 +13,7 @@ const SettlementSheet = () => { ...@@ -13,6 +13,7 @@ const SettlementSheet = () => {
const [selectedRowKeys, setselectedRowKeys] = useState([]); const [selectedRowKeys, setselectedRowKeys] = useState([]);
const [selectedRowsList, setselectedRowsList] = useState([]); const [selectedRowsList, setselectedRowsList] = useState([]);
const [loading, setloading] = useState(false); const [loading, setloading] = useState(false);
const [pages, setpages] = useState({});
const reload = () => { const reload = () => {
if (actionRef.current) { if (actionRef.current) {
...@@ -127,6 +128,7 @@ const SettlementSheet = () => { ...@@ -127,6 +128,7 @@ const SettlementSheet = () => {
onClick={() => { onClick={() => {
// eslint-disable-next-line no-unused-expressions // eslint-disable-next-line no-unused-expressions
form?.resetFields(); form?.resetFields();
reload();
}} }}
> >
{resetText} {resetText}
...@@ -137,8 +139,12 @@ const SettlementSheet = () => { ...@@ -137,8 +139,12 @@ const SettlementSheet = () => {
<PageHeaderWrapper> <PageHeaderWrapper>
<ProTable <ProTable
actionRef={actionRef} actionRef={actionRef}
request={params => query({ ...params })} request={params => {
columns={columns} const { current, pageSize } = params;
setpages({ current, pageSize });
return query({ ...params });
}}
columns={columns(pages)}
rowKey={r => r.settleBatchNo} rowKey={r => r.settleBatchNo}
search={{ search={{
collapsed: false, collapsed: false,
......
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