diff --git a/src/pages/Invoice/Invoice/components/AddBankStatementModal.tsx b/src/pages/Invoice/Invoice/components/AddBankStatementModal.tsx index ac199d1..6cf4be3 100644 --- a/src/pages/Invoice/Invoice/components/AddBankStatementModal.tsx +++ b/src/pages/Invoice/Invoice/components/AddBankStatementModal.tsx @@ -24,6 +24,11 @@ export default ({ getRows, onFinish }) => { dataIndex: 'serialNumber', }, { + title: '流水号', + hideInTable: true, + dataIndex: 'serialNumber', + }, + { title: '收款时间', dataIndex: 'collectionDatetime', hideInSearch: true, diff --git a/src/pages/Invoice/Invoice/components/InvoiceVerificationModal.tsx b/src/pages/Invoice/Invoice/components/InvoiceVerificationModal.tsx index a50145b..557f6f3 100644 --- a/src/pages/Invoice/Invoice/components/InvoiceVerificationModal.tsx +++ b/src/pages/Invoice/Invoice/components/InvoiceVerificationModal.tsx @@ -20,7 +20,6 @@ export default ({ invoiceId, setVisible, onClose }) => { const [bankChooseModalVisible, setBankChooseModalVisible] = useState(false); const [invoiceInfo, setInvoiceInfo] = useState({}); const [relationOrderIds, setRelationOrderIds] = useState([]); - const [setRelationBankStatements] = useState([]); const actionRef = useRef<ActionType>(); const loadInvoiceData = async () => { @@ -31,7 +30,6 @@ export default ({ invoiceId, setVisible, onClose }) => { setInvoiceInfo(res.data); setRelationOrderIds(res.data.mainOrderIds); console.log('bs:' + res.data.bankStatementDtos); - setRelationBankStatements(res.data.bankStatementDtos); } }; @@ -117,6 +115,18 @@ export default ({ invoiceId, setVisible, onClose }) => { }, { key: '11', + label: '订单类型', + children: invoiceInfo?.orderTypeText, + span: 12, + }, + { + key: '12', + label: '绑定流水号', + children: invoiceInfo?.serialNumbersTextByOrder, + span: 12, + }, + { + key: '13', label: '备注', children: invoiceInfo?.notes, span: 24, diff --git a/src/pages/Invoice/Invoice/components/invoiceWriteOffModal.tsx b/src/pages/Invoice/Invoice/components/invoiceWriteOffModal.tsx index 0f3ac89..315a1c8 100644 --- a/src/pages/Invoice/Invoice/components/invoiceWriteOffModal.tsx +++ b/src/pages/Invoice/Invoice/components/invoiceWriteOffModal.tsx @@ -30,24 +30,29 @@ export default ({ getData, triggerButton, readOnly }) => { { title: '发票号码', dataIndex: 'invoiceNumber', + ellipsis: true, }, { title: '收款方', dataIndex: 'payeeText', + ellipsis: true, }, { title: '付款方', dataIndex: 'purchaser', + ellipsis: true, }, { title: '金额', dataIndex: 'money', valueType: 'money', + ellipsis: true, }, { title: '日期', dataIndex: 'invoicingTime', valueType: 'date', + ellipsis: true, }, ]; if (!readOnly) { @@ -84,24 +89,29 @@ export default ({ getData, triggerButton, readOnly }) => { { title: '流水号', dataIndex: 'serialNumber', + ellipsis: true, }, { title: '收款方', dataIndex: 'payeeText', + ellipsis: true, }, { title: '付款方', dataIndex: 'payer', + ellipsis: true, }, { title: '金额', dataIndex: 'amount', valueType: 'money', + ellipsis: true, }, { title: '日期', dataIndex: 'collectionDatetime', valueType: 'date', + ellipsis: true, }, ]; columns.push({ diff --git a/src/pages/Invoice/constant.tsx b/src/pages/Invoice/constant.tsx index f49520a..abe6d9c 100644 --- a/src/pages/Invoice/constant.tsx +++ b/src/pages/Invoice/constant.tsx @@ -78,6 +78,43 @@ export const INVOICE_COLUMNS = [ hideInTable: true, }, { + title: '订单状态', + dataIndex: 'orderTypeText', + valueType: 'text', + width: 180, + }, + { + title: '绑定流水号', + dataIndex: 'serialNumbersTextByOrder', + + valueType: 'text', + width: 180, + }, + { + title: '是否预付款', + dataIndex: 'orderIsPrePay', + valueType: 'select', + valueEnum: { + true: { + text: '是', + status: true, + }, + false: { + text: '否', + status: false, + }, + }, + hideInTable: true, + width: 180, + }, + { + title: '绑定流水号', + dataIndex: 'serialNumberLike', + hideInTable: true, + valueType: 'text', + width: 180, + }, + { title: '购买方', dataIndex: 'purchaser', valueType: 'text',