|
|
@@ -873,18 +873,18 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
v-if="formData.bizType == 2 || formData.bizType == 1"
|
|
|
- label="重量1"
|
|
|
+ label="重量"
|
|
|
prop="weight"
|
|
|
width="100"
|
|
|
>
|
|
|
<template slot-scope="{ row }">
|
|
|
<el-input
|
|
|
v-if="!row.isPack"
|
|
|
- v-model.number="row.weight"
|
|
|
+ v-model="row.weight"
|
|
|
@input="
|
|
|
(value) => {
|
|
|
const newValue = value.replace(/^(0+)|[^\d]+/g, '');
|
|
|
- row.weight = parseInt(newValue, 10); // 转换为数字类型
|
|
|
+ row.weight = parseFloat(newValue, 10); // 转换为数字类型
|
|
|
}
|
|
|
"
|
|
|
></el-input>
|
|
|
@@ -1233,6 +1233,7 @@
|
|
|
let resultArray = [];
|
|
|
list.forEach((item) => {
|
|
|
for (let i = 1; i <= Number(item.minPackingCount); i++) {
|
|
|
+ console.log('item', item);
|
|
|
resultArray.push({
|
|
|
onlyCode: item.onlyCode,
|
|
|
no: item.onlyCode + i.toString().padStart(4, '0'),
|
|
|
@@ -1243,7 +1244,7 @@
|
|
|
measuringUnit: item.measuringUnit,
|
|
|
materielCode: item.materielCode,
|
|
|
clientCode: item.clientCode,
|
|
|
- weight: item.netWeight,
|
|
|
+ weight: item.weight / Number(item.minPackingCount),
|
|
|
weightUnit: item.weightUnit
|
|
|
});
|
|
|
}
|