diff --git a/src/views/stockIn/StockInByCharge/index.vue b/src/views/stockIn/StockInByCharge/index.vue index ca89aa6..06d1e8e 100644 --- a/src/views/stockIn/StockInByCharge/index.vue +++ b/src/views/stockIn/StockInByCharge/index.vue @@ -650,21 +650,27 @@ function handleQuery() { return } getStoreDetail(state.queryParams).then((res: any)=> { - state.MATERIALPACKINGLIST = res.resultObj.storeCharge - state.MATERIALRECEIVEACT = res.resultObj.storeDetail - if (state.MATERIALPACKINGLISTS != '') { - for (const element of state.MATERIALRECEIVEACT) { - if ( - element.MATERIALSPECNAME == state.MATERIALPACKINGLISTS.MATERIALSPECNAME && - element.DESC_CN == state.MATERIALPACKINGLISTS.DESC_CN - ) { - element.ERPLOCATION = state.MATERIALPACKINGLISTS.ERPLOCATION - element.ERPLOCATION2 = state.MATERIALPACKINGLISTS.ERPLOCATION2 - element.LOCATIONNAME = state.MATERIALPACKINGLISTS.LOCATIONNAME - element.LOCATIONNAME2 = state.MATERIALPACKINGLISTS.LOCATIONNAME2 + if (res.resultObj) { + state.MATERIALPACKINGLIST = res.resultObj.storeCharge + state.MATERIALRECEIVEACT = res.resultObj.storeDetail + if (state.MATERIALPACKINGLISTS != '') { + for (const element of state.MATERIALRECEIVEACT) { + if ( + element.MATERIALSPECNAME == state.MATERIALPACKINGLISTS.MATERIALSPECNAME && + element.DESC_CN == state.MATERIALPACKINGLISTS.DESC_CN + ) { + element.ERPLOCATION = state.MATERIALPACKINGLISTS.ERPLOCATION + element.ERPLOCATION2 = state.MATERIALPACKINGLISTS.ERPLOCATION2 + element.LOCATIONNAME = state.MATERIALPACKINGLISTS.LOCATIONNAME + element.LOCATIONNAME2 = state.MATERIALPACKINGLISTS.LOCATIONNAME2 + } } + state.MATERIALPACKINGLISTS } - state.MATERIALPACKINGLISTS + } else { + ElMessageBox.alert(res.message, '提醒框', { + confirmButtonText: 'OK' + }) } }).catch((error: any) => { ElMessageBox.alert(error.message, '提醒框', {