diff --git a/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue b/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue index 51c83c326..38b98f73d 100644 --- a/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue +++ b/fe/PC/src/views/rawMaterialManage/beforeGroundingReturn/beforeGroundingReturnNote.vue @@ -109,13 +109,17 @@ export default { if(val == 'print'){ if((this.propsData.supplierCode) && (!this.propsData.supplierShortName)){ getOneSupplierInfoByCode(this.propsData.supplierCode).then(async res => { - if(res){this.propsData.supplierShortName = res.shortName || res.name} + if(res){ + this.propsData.supplierShortName = res.shortName || res.name + this.tableDataDetails.supplierShortName = JSON.parse(JSON.stringify(this.propsData.supplierShortName)); + } let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','UnqualifiedReason'); this.Print(data) }).catch(err => { console.log(err) }) }else{ + this.tableDataDetails.supplierShortName = JSON.parse(JSON.stringify(this.propsData.supplierShortName)); let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','UnqualifiedReason'); this.Print(data) } diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue index 32b1fa517..e91a8644e 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReturn/returnNote.vue @@ -109,13 +109,17 @@ export default { if(val == 'print'){ if((this.propsData.supplierCode) && (!this.propsData.supplierShortName)){ getOneSupplierInfoByCode(this.propsData.supplierCode).then(async res => { - if(res){this.propsData.supplierShortName = res.shortName || res.name} + if(res){ + this.propsData.supplierShortName = res.shortName || res.name + this.tableDataDetails.supplierShortName = JSON.parse(JSON.stringify(this.propsData.supplierShortName)); + } let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); this.Print(data) }).catch(err => { console.log(err) }) }else{ + this.tableDataDetails.supplierShortName = JSON.parse(JSON.stringify(this.propsData.supplierShortName)); let data = await initPrintAllData(this.tableDataDetails,'thd.rdlx','PurReturnReason'); this.Print(data) }