|
|
@@ -1058,7 +1058,7 @@
|
|
|
<span>{{ qualityStatus[row.status] }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
+
|
|
|
</el-table> -->
|
|
|
</div>
|
|
|
</el-card>
|
|
|
@@ -1624,6 +1624,10 @@
|
|
|
warehouseIds.push(this.form.warehouseId);
|
|
|
warehouseNames.push(this.form.warehouseName);
|
|
|
}
|
|
|
+ if (this.bizType == 4) {
|
|
|
+ warehouseIds.push(this.form.warehouseId);
|
|
|
+ warehouseNames.push(this.form.warehouseName);
|
|
|
+ }
|
|
|
if (this.isMoreProduct) {
|
|
|
this.formData.extInfo.assetType = [];
|
|
|
res.map((item) => {
|
|
|
@@ -1734,7 +1738,10 @@
|
|
|
categoryModel: item.modelType, // 物品型号
|
|
|
specification: item.specification, // 规格
|
|
|
brandNum: item.brandNum, // 牌号
|
|
|
- batchNo: this.bizType == 1 ? this.detailList[0]?.batchNo || batchNo : batchNo, // 批次号
|
|
|
+ batchNo:
|
|
|
+ this.bizType == 1
|
|
|
+ ? this.detailList[0]?.batchNo || batchNo
|
|
|
+ : batchNo, // 批次号
|
|
|
supplierListOptions: supplierList[item.id], // 供应商列表
|
|
|
supplierId: '', // 供应商id
|
|
|
supplierCode: item.supplierCode,
|
|
|
@@ -3588,10 +3595,13 @@
|
|
|
(packingItem) => packingItem.packageNo == onlyCode
|
|
|
);
|
|
|
this.$set(this.packingList[index], 'measureQuantity', remainder);
|
|
|
- if(row.singleWeight){
|
|
|
- this.$set(this.packingList[index], 'weight', row.singleWeight*remainder);
|
|
|
+ if (row.singleWeight) {
|
|
|
+ this.$set(
|
|
|
+ this.packingList[index],
|
|
|
+ 'weight',
|
|
|
+ row.singleWeight * remainder
|
|
|
+ );
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
// 单独点击保存并插入对应位置(物料)
|