Commit b6f3fcb8 authored by 何洋's avatar 何洋

fix: 采购订单编辑bug

parent 32332819
......@@ -43,7 +43,7 @@ const config: any = {
// layout: {},
esbuild: {},
// 打开msfu会导致样式异常, 无法获得正常的样式变量
mfsu: {},
// mfsu: {},
antd: {},
locale: {
default: 'zh-CN',
......
......@@ -356,7 +356,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
mergeArr = mergeArr.map((item) => ({
...item,
// 兼容之前订单物料数据
logistics: contractValue.deliveryType,
logistics: item.deliveryType,
memberId: contractValue.partyBMemberId,
memberRoleId: contractValue.partyBRoleId,
amount: +(item.price * item.quantity).toFixed(2), // 这里应该会出现计算不准的问题
......
......@@ -17,7 +17,7 @@ export const convertOrderMaterialData = (dataSource: OrderMaterialsConfirmValue[
unit: dataSource.unit,
tax: dataSource.isHasTax === 1,
taxRate: dataSource.taxRate,
deliveryType: undefined,
deliveryType: dataSource.deliveryType,
price: dataSource.price,
stock: dataSource.supplierInventory,
quantity: dataSource.requisitionList?.reduce((pre, now) => (now as any).orderQuantity + pre, 0) || 0,
......
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