|
@@ -1238,8 +1238,6 @@
|
|
|
} else {
|
|
} else {
|
|
|
this.$message.warning('未获取到物品类型!');
|
|
this.$message.warning('未获取到物品类型!');
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- console.log('this.detailList---------', this.detailList);
|
|
|
|
|
if (this.sourceBizNo != null && this.sourceBizNo != '') {
|
|
if (this.sourceBizNo != null && this.sourceBizNo != '') {
|
|
|
this.formData.sourceBizNo = this.sourceBizNo;
|
|
this.formData.sourceBizNo = this.sourceBizNo;
|
|
|
} else {
|
|
} else {
|
|
@@ -1254,14 +1252,13 @@
|
|
|
|
|
|
|
|
// this.formData.extInfo.supplierName = this.form.supplierName;
|
|
// this.formData.extInfo.supplierName = this.form.supplierName;
|
|
|
// this.formData.extInfo.supplierId = this.form.supplierId;
|
|
// this.formData.extInfo.supplierId = this.form.supplierId;
|
|
|
- console.log('this.saleProductList---------', this.saleProductList);
|
|
|
|
|
|
|
+
|
|
|
if (this.saleProductList?.length > 0) {
|
|
if (this.saleProductList?.length > 0) {
|
|
|
// 物品列表
|
|
// 物品列表
|
|
|
let codeList = this.saleProductList.map((item) => {
|
|
let codeList = this.saleProductList.map((item) => {
|
|
|
return item.productCode;
|
|
return item.productCode;
|
|
|
});
|
|
});
|
|
|
storageApi.getListByNameOrModeType({ codeList }).then(async (res) => {
|
|
storageApi.getListByNameOrModeType({ codeList }).then(async (res) => {
|
|
|
- console.log('res---------', res);
|
|
|
|
|
if (res.length <= 0) {
|
|
if (res.length <= 0) {
|
|
|
this.$message.warning('未获取到物品信息!');
|
|
this.$message.warning('未获取到物品信息!');
|
|
|
return;
|
|
return;
|
|
@@ -1735,7 +1732,7 @@
|
|
|
},
|
|
},
|
|
|
// 赋值入库时间
|
|
// 赋值入库时间
|
|
|
getNowFormatDate() {
|
|
getNowFormatDate() {
|
|
|
- if (this.bizType == '2') {
|
|
|
|
|
|
|
+ if (this.bizType == '2' || this.bizType == '6') {
|
|
|
let time = '00:00:00';
|
|
let time = '00:00:00';
|
|
|
this.formData.storageTime = this.form.receiveDate + ' ' + time;
|
|
this.formData.storageTime = this.form.receiveDate + ' ' + time;
|
|
|
} else {
|
|
} else {
|
|
@@ -1953,10 +1950,6 @@
|
|
|
_workOrderId = this.detailProductList[0]?.workOrderId;
|
|
_workOrderId = this.detailProductList[0]?.workOrderId;
|
|
|
_taskId = this.detailProductList[0]?.taskId;
|
|
_taskId = this.detailProductList[0]?.taskId;
|
|
|
}
|
|
}
|
|
|
- // workOrderId: this.detailProductList[0]?.workOrderId,
|
|
|
|
|
- // taskId: this.detailProductList[0]?.taskId,
|
|
|
|
|
- // taskId: this.detailList[0]?.taskId,
|
|
|
|
|
- // workOrderId: this.detailList[0]?.workOrderId,
|
|
|
|
|
return {
|
|
return {
|
|
|
...packingItem,
|
|
...packingItem,
|
|
|
workOrderId: _workOrderId,
|
|
workOrderId: _workOrderId,
|
|
@@ -2347,7 +2340,6 @@
|
|
|
};
|
|
};
|
|
|
});
|
|
});
|
|
|
this.productList = this.productList.concat(productList);
|
|
this.productList = this.productList.concat(productList);
|
|
|
- console.log('this.productList--------', this.productList);
|
|
|
|
|
},
|
|
},
|
|
|
// 物品保存验证表单(批量)
|
|
// 物品保存验证表单(批量)
|
|
|
validateForm() {
|
|
validateForm() {
|
|
@@ -2798,7 +2790,7 @@
|
|
|
let num = row.packingQuantity;
|
|
let num = row.packingQuantity;
|
|
|
let filterArr = [];
|
|
let filterArr = [];
|
|
|
// 处理单位为KG类的情况
|
|
// 处理单位为KG类的情况
|
|
|
-
|
|
|
|
|
|
|
+ console.log(packingBoolen, 'packingBoolenpackingBoolen');
|
|
|
if (packingBoolen) {
|
|
if (packingBoolen) {
|
|
|
filterArr = row.packingSpecificationOption.filter((item) => {
|
|
filterArr = row.packingSpecificationOption.filter((item) => {
|
|
|
return (
|
|
return (
|
|
@@ -2836,8 +2828,9 @@
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
|
|
+ console.log(row, 'row123');
|
|
|
// num = row.packingQuantity;
|
|
// num = row.packingQuantity;
|
|
|
- num = this.productList.length;
|
|
|
|
|
|
|
+ num = 1;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
for (let index = 0; index < num; index++) {
|
|
for (let index = 0; index < num; index++) {
|