diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index a28bbe3d8..ff07da0b7 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -722,13 +722,7 @@ const getGenerateLabelList = async (row) => { item.boxPackaging = item.boxPackaging ? item.boxPackaging : [] item.packUnitInitOptions = item.boxPackaging item.secondPackUnitInitOptions = item.palletPackaging || [] - if (item.convertRate==0 || item.convertRate == 1) { - item.balanceQty = item.qty - item.purchaseStdQty = row.packQty - } else { - item.balanceQty = parseFloat(Decimal(item.qty).mul(Decimal(item.convertRate)).toNumber().toFixed(5)) - item.purchaseStdQty = parseFloat(Decimal(parseFloat(item.packQty)).div(Decimal(parseFloat(item.convertRate))).toNumber().toFixed(5)) - } + let obj = item?.boxPackaging[0] if (obj) { item.packUnit = obj.packUnit @@ -751,6 +745,13 @@ const getGenerateLabelList = async (row) => { } else { item.packUnit = '' item.packQty = '' + } + if (item.convertRate==0 || item.convertRate == 1) { + item.balanceQty = item.qty + item.purchaseStdQty = row.packQty + } else { + item.balanceQty = parseFloat(Decimal(item.qty).mul(Decimal(item.convertRate)).toNumber().toFixed(5)) + item.purchaseStdQty = parseFloat(Decimal(parseFloat(item.packQty)).div(Decimal(parseFloat(item.convertRate))).toNumber()) } // 有托规格显示托规格,没有显示第一条规格 item.secondPackUnit = obj?.parentPackUnit @@ -800,11 +801,6 @@ const formSelectChangeLabel = (field, val, row) => { let obj = row.boxPackaging.find((item) => item.packUnit == val) if (obj) { row.packQty = obj.packQty - if (row.convertRate ==0 || row.convertRate == 1) { - row.purchaseStdQty = row.packQty - } else { - row.purchaseStdQty = parseFloat(Decimal(parseFloat(row.packQty)).div(Decimal(parseFloat(row.convertRate))).toNumber().toFixed(5)) - } // 如果没有数量可以输入 if (!row.packQty) { SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => { @@ -820,6 +816,11 @@ const formSelectChangeLabel = (field, val, row) => { } }) } + if (row.convertRate ==0 || row.convertRate == 1) { + row.purchaseStdQty = row.packQty + } else { + row.purchaseStdQty = parseFloat(Decimal(parseFloat(row.packQty)).div(Decimal(parseFloat(row.convertRate))).toNumber().toFixed(5)) + } // 获取托规格 const params1 = { itemCode: row.itemCode,