|
@@ -3125,7 +3125,7 @@
|
|
|
} else if (this.formData.bizType == '2') {
|
|
} else if (this.formData.bizType == '2') {
|
|
|
// 采购入库
|
|
// 采购入库
|
|
|
const defaultTime = '00:00:00';
|
|
const defaultTime = '00:00:00';
|
|
|
- purchaseDate = this.form.purchaseDate||`${this.form.receiveDate} ${defaultTime}`;
|
|
|
|
|
|
|
+ purchaseDate = this.form.purchaseDate||`${this.form.receiveDate} ${defaultTime}`;
|
|
|
this.curDateType = 'purchaseDate';
|
|
this.curDateType = 'purchaseDate';
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -3357,7 +3357,7 @@
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
- measureQuantity = row.measureQuantity / packingCodeList.length;
|
|
|
|
|
|
|
+ measureQuantity = row.packingSpecificationOption[1].packageCell;
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
console.log('4 拆--------');
|
|
console.log('4 拆--------');
|
|
@@ -3452,7 +3452,7 @@
|
|
|
// 第二层条件: packingBoolen
|
|
// 第二层条件: packingBoolen
|
|
|
if (packingBoolen) {
|
|
if (packingBoolen) {
|
|
|
// 空值保护: 确保 filterArr[0] 存在
|
|
// 空值保护: 确保 filterArr[0] 存在
|
|
|
- item.packingUnit = filterArr?.[1]?.conversionUnit;
|
|
|
|
|
|
|
+ item.packingUnit = row.packingSpecificationOption[1].conversionUnit;
|
|
|
} else {
|
|
} else {
|
|
|
// 第三层条件: measureBoolen
|
|
// 第三层条件: measureBoolen
|
|
|
if (measureBoolen) {
|
|
if (measureBoolen) {
|
|
@@ -3462,17 +3462,11 @@
|
|
|
row.packingSpecificationOption?.[0];
|
|
row.packingSpecificationOption?.[0];
|
|
|
item.packingUnit = option?.conversionUnit;
|
|
item.packingUnit = option?.conversionUnit;
|
|
|
} else {
|
|
} else {
|
|
|
- item.packingUnit = packingUnit;
|
|
|
|
|
|
|
+ item.packingUnit = row.packingSpecificationOption[1].conversionUnit;
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- } else {
|
|
|
|
|
- // 第二层条件: packingBoolen (isUnpack 为 false 时的分支)
|
|
|
|
|
- if (packingBoolen) {
|
|
|
|
|
- item.packingUnit = filterArr?.[0]?.conversionUnit;
|
|
|
|
|
- } else {
|
|
|
|
|
- item.packingUnit = row.packingUnit;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
let outBoolen = !!this.getDict('不拆物料层规格', item.measureUnit)
|
|
let outBoolen = !!this.getDict('不拆物料层规格', item.measureUnit)
|
|
|
.dictValue;
|
|
.dictValue;
|
|
|
if (outBoolen) {
|
|
if (outBoolen) {
|