From b556c39d0e87fe13fda6e31e44b5d0ddafa0db41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 26 Apr 2023 10:17:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E8=B0=83=E5=8F=96=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=8E=B7=E5=8F=96=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beforeGroundingReturnNote.vue             |  2 +-
 .../purchaseOnShelves/PutawayNote.vue         | 18 ++++++++-------
 .../PurchaseReceiptRequest.vue                | 23 +++++++++++--------
 .../purchaseReturn/returnNote.vue             |  2 +-
 4 files changed, 25 insertions(+), 20 deletions(-)

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 => {