diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue index 13c5f9200..976973b41 100644 --- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue +++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue @@ -293,7 +293,8 @@ export default { }, ], itemStagingLists:{},//物料相关内容暂存 - supplierStagingLists:{},// 供应商信息暂存 + supplierOnlyStagingLists:{},// 单纯供应商信息暂存 + supplierItemStagingLists:{},// 供应商物品信息暂存 asnStagingLists:{},// 供应商发货通知暂存 locationStagingLists:{},//库位相关内容暂存 packingStagingLists:{},//箱码相关内容暂存 @@ -559,7 +560,9 @@ export default { let _item = this.needNewPackingList[index] let _item_info = this.itemStagingLists[_item.itemCode] let _location_info = this.locationStagingLists[_item.locationCode] - let _supplier_info = this.supplierStagingLists[_item.supplierCode] + let _supplieritem_name = _item.supplierCode + '_' + _item.itemCode + let _supplieritem_info = this.supplierItemStagingLists[_supplieritem_name] + let _supplier_only_info = this.supplierOnlyStagingLists[_item.supplierCode] let _asn_info = this.asnStagingLists[_item.poNumber] let _creatPackData = { itemCode: _item_info.code || null, @@ -589,9 +592,9 @@ export default { specifications: null, supplierBatch: null, supplierName: null, - supplierSimpleName: _supplier_info.supplierSimpleName, - supplierItemCode: _supplier_info.supplierItemCode, - supplierItemName: _supplier_info.itemName, + supplierSimpleName: _supplier_only_info.shortName, + supplierItemCode: _supplieritem_info.supplierItemCode, + supplierItemName: _supplieritem_info.itemName, labelType: 1,//采购标签 planArriveDate: "9999-12-31", remark:null, @@ -671,6 +674,30 @@ export default { console.log('原料',this.addPopData_YL) console.log('混拌料',this.addPopData_HB) }, + updateSupplierOnlyStageByCode(supplierCode){ + this.Loading.appMainLoading = true + // 获取供应商相关信息 + let params = { + Sorting: "", + MaxResultCount: 1000, + SkipCount: 0, + condition: { + filters: [{ + logic: "And", + column: "code", + action: "==", + value: supplierCode + }] + } + } + getPageList(params, "basedata/supplier").then((res)=>{ + this.supplierOnlyStagingLists[supplierCode] = res.items[0] + this.Loading.appMainLoading = false + }) + .catch(err=>{ + this.Loading.appMainLoading = false + }) + }, // 粉碎料下拉 pushFS(data){ if(data[1].prop == "itemCode"){ @@ -686,7 +713,9 @@ export default { this.addPopData_FS[data[3].$index].locationCode = null } if(data[1].prop == "supplierCode"){ - this.supplierStagingLists[data[2]] = data[0] + let _name = data[2] +'_'+ data[0].itemCode + this.supplierItemStagingLists[_name] = data[0] + this.updateSupplierOnlyStageByCode(data[0].supplierCode) } if(data[1].prop == "poNumber"){ this.asnStagingLists[data[2]] = data[0] @@ -778,7 +807,9 @@ export default { this.addPopData_HB[data[3].$index].poNumber = null } if(data[1].prop == "supplierCode"){ - this.supplierStagingLists[data[2]] = data[0] + let _name = data[2] +'_'+ data[0].itemCode + this.supplierItemStagingLists[_name] = data[0] + this.updateSupplierOnlyStageByCode(data[0].supplierCode) } if(data[1].prop == "poNumber"){ this.asnStagingLists[data[2]] = data[0]