From 0fa5078e4e6a769f10b2f5f615c1ccde25e88046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 29 Jul 2024 11:48:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E4=B8=8A=E6=9E=B6?=
 =?UTF-8?q?=E5=89=8D/=E5=90=8E=E9=80=80=E8=B4=A7=EF=BC=8C=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E5=8D=95=E6=8D=AE=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beforeGroundingReturn/beforeGroundingReturnNote.vue     | 6 +++++-
 .../views/rawMaterialManage/purchaseReturn/returnNote.vue   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

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)
         }