diff --git a/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue b/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue index 827967b3f..03570b091 100644 --- a/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue +++ b/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue @@ -109,7 +109,7 @@ export default { if(val == 'print'){ if((this.propsData.supplierCode) && (!this.propsData.supplierShortName)){ getOneSupplierInfoByCode(this.propsData.supplierCode).then(res => { - this.propsData.supplierShortName = res.shortName || res.name + if(res){this.propsData.supplierShortName = res.shortName || res.name} let data = initPrintAllData(this.propsData,'thd.rdlx','UnqualifiedReason'); this.Print(data) }).catch(err => { diff --git a/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue b/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue index b0177186c..d232a8aab 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseOnShelves/PutawayNote.vue @@ -111,15 +111,17 @@ export default { getInventoryLabelByCodes(_ids).then(res => { this.Loading.appMainLoading = false; let _printData = JSON.parse(JSON.stringify(this.propsData)) - _printData.supplierCode = res[0].supplierCode; - _printData.supplierSimpleName = res[0].supplierSimpleName; - res.forEach((item)=>{ - _printData.details.forEach((item2)=>{ - if(item.itemCode == item2.itemCode){ - item2.supplierItemCode = item.supplierItemCode - } + if(res && res.length > 0){ + _printData.supplierCode = res[0].supplierCode; + _printData.supplierSimpleName = res[0].supplierSimpleName; + res.forEach((item)=>{ + _printData.details.forEach((item2)=>{ + if(item.itemCode == item2.itemCode){ + item2.supplierItemCode = item.supplierItemCode + } + }) }) - }) + } let data = initPrintAllData(_printData,'ysd.rdlx'); this.Print(data) }).catch(err => { diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue index 0916f7e74..f3b33321d 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue @@ -117,16 +117,19 @@ export default { this.Loading.appMainLoading = true; getInventoryLabelByCodes(_ids).then(res => { this.Loading.appMainLoading = false; - let _printData = { - supplierSimpleName:res[0].supplierSimpleName || "", - supplierCode:res[0].supplierCode || "", - contacts:res[0].contacts || "", - customerAddressCode:res[0].customerAddressCode || "", - remark:res[0].remark || "", - planArriveDate:res[0].planArriveDate || "", - poNumber:res[0].poNumber || "", - asnNumber:res[0].asnNumber || "", - details:[], + let _printData = {details:[]} + if(res && res.length > 0){ + _printData = { + supplierSimpleName:res[0].supplierSimpleName || "", + supplierCode:res[0].supplierCode || "", + contacts:res[0].contacts || "", + customerAddressCode:res[0].customerAddressCode || "", + remark:res[0].remark || "", + planArriveDate:res[0].planArriveDate || "", + poNumber:res[0].poNumber || "", + asnNumber:res[0].asnNumber || "", + details:[], + } } res.forEach(item=>{ item.packingCode = item.code diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue index c8108dd4a..75146da89 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue @@ -109,7 +109,7 @@ export default { if(val == 'print'){ if((this.propsData.supplierCode) && (!this.propsData.supplierShortName)){ getOneSupplierInfoByCode(this.propsData.supplierCode).then(res => { - this.propsData.supplierShortName = res.shortName || res.name + if(res){this.propsData.supplierShortName = res.shortName || res.name} let data = initPrintAllData(this.propsData,'thd.rdlx','PurReturnReason'); this.Print(data) }).catch(err => {