|
@@ -1207,7 +1207,6 @@
|
|
|
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;
|
|
@@ -1218,10 +1217,6 @@
|
|
|
const supplierList = await storageApi.contactQueryByCategoryIdsAPI({
|
|
const supplierList = await storageApi.contactQueryByCategoryIdsAPI({
|
|
|
categoryIds: res.map((item) => item.id)
|
|
categoryIds: res.map((item) => item.id)
|
|
|
});
|
|
});
|
|
|
- console.log(
|
|
|
|
|
- 'supplierList---------------------------------',
|
|
|
|
|
- supplierList
|
|
|
|
|
- );
|
|
|
|
|
// console.log(supplierList[item.id])
|
|
// console.log(supplierList[item.id])
|
|
|
// 获取包装规格
|
|
// 获取包装规格
|
|
|
let packingSpecification =
|
|
let packingSpecification =
|
|
@@ -1252,10 +1247,7 @@
|
|
|
let measureQuantity = filtersItem.totalCount || 0;
|
|
let measureQuantity = filtersItem.totalCount || 0;
|
|
|
let packingQuantity = filtersItem.totalCount || 0;
|
|
let packingQuantity = filtersItem.totalCount || 0;
|
|
|
let packingUnit = filtersItem.measuringUnit || '';
|
|
let packingUnit = filtersItem.measuringUnit || '';
|
|
|
- console.log(
|
|
|
|
|
- filtersItem.measuringUnit,
|
|
|
|
|
- '77777777777777777777777777777777777777777777'
|
|
|
|
|
- );
|
|
|
|
|
|
|
+
|
|
|
let price = filtersItem.singlePrice || 0;
|
|
let price = filtersItem.singlePrice || 0;
|
|
|
let singleWeight = filtersItem.singleWeight || 0; // 单重重量
|
|
let singleWeight = filtersItem.singleWeight || 0; // 单重重量
|
|
|
let weight = filtersItem.sendTotalWeight || 0;
|
|
let weight = filtersItem.sendTotalWeight || 0;
|
|
@@ -1634,7 +1626,6 @@
|
|
|
status: 2 // 状态(0=未质检 1待检 2已检)
|
|
status: 2 // 状态(0=未质检 1待检 2已检)
|
|
|
};
|
|
};
|
|
|
});
|
|
});
|
|
|
- console.log('this.packingList--------', this.packingList);
|
|
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
@@ -2733,7 +2724,8 @@
|
|
|
this.curDateType = 'productionDate';
|
|
this.curDateType = 'productionDate';
|
|
|
} else if (this.formData.bizType == '2') {
|
|
} else if (this.formData.bizType == '2') {
|
|
|
// 采购入库
|
|
// 采购入库
|
|
|
- purchaseDate = `${obj.year}-${obj.month}-${obj.strDate} ${obj.hour}:${obj.minute}:${obj.second}`;
|
|
|
|
|
|
|
+ // purchaseDate = `${obj.year}-${obj.month}-${obj.strDate} ${obj.hour}:${obj.minute}:${obj.second}`;
|
|
|
|
|
+ purchaseDate = this.formData.storageTime;
|
|
|
this.curDateType = 'purchaseDate';
|
|
this.curDateType = 'purchaseDate';
|
|
|
}
|
|
}
|
|
|
// 判断单位和计量单位是否为不拆物料层规格
|
|
// 判断单位和计量单位是否为不拆物料层规格
|
yijing