diff --git a/src/pages/Invoice/constant.tsx b/src/pages/Invoice/constant.tsx index e75c725..c7f05fd 100644 --- a/src/pages/Invoice/constant.tsx +++ b/src/pages/Invoice/constant.tsx @@ -45,6 +45,13 @@ export const INVOICE_COLUMNS = [ width: 100, }, { + dataIndex: 'mainOrderId', + title: '主订单id', + valueType: 'text', + width: 160, + hideInTable: true, + }, + { dataIndex: 'invoiceStatus', title: '发票类型', valueType: 'select', diff --git a/src/pages/Order/Order/components/InvoicingDrawerForm.tsx b/src/pages/Order/Order/components/InvoicingDrawerForm.tsx index 3f72899..fc53a97 100644 --- a/src/pages/Order/Order/components/InvoicingDrawerForm.tsx +++ b/src/pages/Order/Order/components/InvoicingDrawerForm.tsx @@ -10,7 +10,13 @@ import { postServiceInvoiceQueryCompanyInfo, postServiceInvoiceWaitReissueInvoices, } from '@/services'; -import { FloatAdd, FloatSub, enum2ReverseSelect, enumToSelect } from '@/utils'; +import { + FloatAdd, + FloatMul, + FloatSub, + enum2ReverseSelect, + enumToSelect, +} from '@/utils'; import { convertCurrency } from '@/utils/numberUtil'; import { DrawerForm, @@ -99,7 +105,7 @@ export default ({ dataList, setVisible, mainOrder, onClose }) => { if (invoiceDetails && invoiceDetails[index]) { const quantity = invoiceDetails[index].quantity || 0; const price = invoiceDetails[index].price || 0; - const totalPrice = quantity * price; + const totalPrice = FloatMul(quantity, price); const newInvoiceDetails = [...invoiceDetails]; newInvoiceDetails[index] = { ...newInvoiceDetails[index], totalPrice }; form.setFieldsValue({ invoiceDetails: newInvoiceDetails }); @@ -534,6 +540,12 @@ export default ({ dataList, setVisible, mainOrder, onClose }) => { ]} placeholder="请输入名称" /> + <ProFormText + key={'unit' + listMeta.index} + name="unit" + label="单位" + placeholder="请输入名称" + /> <ProFormDigit key={'quantity' + listMeta.index} label="数量"