From 74d67856476341ad39ec0ba853a530262cd25626 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Wed, 11 Dec 2024 21:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/mixins/JeecgListMixin.js          | 5 +++--
 jshERP-web/src/views/report/AllocationDetail.vue | 5 +++--
 jshERP-web/src/views/report/BuyInReport.vue      | 5 +++--
 jshERP-web/src/views/report/CustomerAccount.vue  | 5 +++--
 jshERP-web/src/views/report/InDetail.vue         | 5 +++--
 jshERP-web/src/views/report/InMaterialCount.vue  | 5 +++--
 jshERP-web/src/views/report/MaterialStock.vue    | 5 +++--
 jshERP-web/src/views/report/OutDetail.vue        | 5 +++--
 jshERP-web/src/views/report/OutMaterialCount.vue | 5 +++--
 jshERP-web/src/views/report/RetailOutReport.vue  | 5 +++--
 jshERP-web/src/views/report/SaleOutReport.vue    | 5 +++--
 jshERP-web/src/views/report/VendorAccount.vue    | 5 +++--
 12 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index d8657ebb2..c253d9bc7 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -103,9 +103,10 @@ export const JeecgListMixin = {
           this.dataSource = res.data.rows
           this.ipagination.total = res.data.total
           this.tableAddTotalRow(this.columns, this.dataSource)
-        }
-        if(res.code===510){
+        } else if(res.code===510){
           this.$message.warning(res.data)
+        } else {
+          this.$message.warning(res.data.message)
         }
         this.loading = false
         this.onClearSelected()
diff --git a/jshERP-web/src/views/report/AllocationDetail.vue b/jshERP-web/src/views/report/AllocationDetail.vue
index 0bebdee9d..7af566ed1 100644
--- a/jshERP-web/src/views/report/AllocationDetail.vue
+++ b/jshERP-web/src/views/report/AllocationDetail.vue
@@ -282,9 +282,10 @@
             this.operNumberTotalStr = res.data.operNumberTotal.toFixed(2)
             this.allPriceTotalStr = res.data.allPriceTotal.toFixed(2)
             this.tableAddTotalRow(this.columns, this.dataSource)
-          }
-          if(res.code===510){
+          } else if(res.code===510){
             this.$message.warning(res.data)
+          } else {
+            this.$message.warning(res.data.message)
           }
           this.loading = false;
         })
diff --git a/jshERP-web/src/views/report/BuyInReport.vue b/jshERP-web/src/views/report/BuyInReport.vue
index 08e4a9ff3..af323a45b 100644
--- a/jshERP-web/src/views/report/BuyInReport.vue
+++ b/jshERP-web/src/views/report/BuyInReport.vue
@@ -249,9 +249,10 @@
             this.ipagination.total = res.data.total;
             this.tableAddTotalRow(this.columns, this.dataSource)
             this.realityPriceTotal = res.data.realityPriceTotal
-          }
-          if(res.code===510){
+          } else if(res.code===510){
             this.$message.warning(res.data)
+          } else {
+            this.$message.warning(res.data.message)
           }
           this.loading = false;
         })
diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue
index ee33f0026..814c7b7d6 100644
--- a/jshERP-web/src/views/report/CustomerAccount.vue
+++ b/jshERP-web/src/views/report/CustomerAccount.vue
@@ -246,9 +246,10 @@
             this.tableAddTotalRow(this.columns, this.dataSource)
             this.firstTotal = '期初应收：' + res.data.firstMoney + "，"
             this.lastTotal = '期末应收：' + res.data.lastMoney
-          }
-          if(res.code===510){
+          } else if(res.code===510){
             this.$message.warning(res.data)
+          } else {
+            this.$message.warning(res.data.message)
           }
           this.loading = false;
         })
diff --git a/jshERP-web/src/views/report/InDetail.vue b/jshERP-web/src/views/report/InDetail.vue
index 5a2031ae9..ac66d035a 100644
--- a/jshERP-web/src/views/report/InDetail.vue
+++ b/jshERP-web/src/views/report/InDetail.vue
@@ -289,9 +289,10 @@
             this.operNumberTotalStr = res.data.operNumberTotal.toFixed(2)
             this.allPriceTotalStr = res.data.allPriceTotal.toFixed(2)
             this.tableAddTotalRow(this.columns, this.dataSource)
-          }
-          if(res.code===510){
+          } else if(res.code===510){
             this.$message.warning(res.data)
+          } else {
+            this.$message.warning(res.data.message)
           }
           this.loading = false;
         })
diff --git a/jshERP-web/src/views/report/InMaterialCount.vue b/jshERP-web/src/views/report/InMaterialCount.vue
index 032dcabb0..fa43b30f3 100644
--- a/jshERP-web/src/views/report/InMaterialCount.vue
+++ b/jshERP-web/src/views/report/InMaterialCount.vue
@@ -245,9 +245,10 @@
             this.numSumTotalStr = res.data.numSumTotal.toFixed(2)
             this.priceSumTotalStr = res.data.priceSumTotal.toFixed(2)
             this.tableAddTotalRow(this.columns, this.dataSource)
-          }
-          if(res.code===510){
+          } else if(res.code===510){
             this.$message.warning(res.data)
+          } else {
+            this.$message.warning(res.data.message)
           }
           this.loading = false;
         })
diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index f9088e381..f130e3656 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -298,9 +298,10 @@
             this.currentStock = res.data.currentStock.toFixed(2)
             this.currentStockPrice = res.data.currentStockPrice.toFixed(2)
             this.currentWeight = res.data.currentWeight.toFixed(2)
-          }
-          if(res.code===510){
+          } else if(res.code===510){
             this.$message.warning(res.data)
+          } else {
+            this.$message.warning(res.data.message)
           }
           this.loading = false;
         })
diff --git a/jshERP-web/src/views/report/OutDetail.vue b/jshERP-web/src/views/report/OutDetail.vue
index fb8a74855..8af6f9695 100644
--- a/jshERP-web/src/views/report/OutDetail.vue
+++ b/jshERP-web/src/views/report/OutDetail.vue
@@ -289,9 +289,10 @@
             this.operNumberTotalStr = res.data.operNumberTotal.toFixed(2)
             this.allPriceTotalStr = res.data.allPriceTotal.toFixed(2)
             this.tableAddTotalRow(this.columns, this.dataSource)
-          }
-          if(res.code===510){
+          } else if(res.code===510){
             this.$message.warning(res.data)
+          } else {
+            this.$message.warning(res.data.message)
           }
           this.loading = false;
         })
diff --git a/jshERP-web/src/views/report/OutMaterialCount.vue b/jshERP-web/src/views/report/OutMaterialCount.vue
index e093b3958..e6ee4fa5b 100644
--- a/jshERP-web/src/views/report/OutMaterialCount.vue
+++ b/jshERP-web/src/views/report/OutMaterialCount.vue
@@ -245,9 +245,10 @@
             this.numSumTotalStr = res.data.numSumTotal.toFixed(2)
             this.priceSumTotalStr = res.data.priceSumTotal.toFixed(2)
             this.tableAddTotalRow(this.columns, this.dataSource)
-          }
-          if(res.code===510){
+          } else if(res.code===510){
             this.$message.warning(res.data)
+          } else {
+            this.$message.warning(res.data.message)
           }
           this.loading = false;
         })
diff --git a/jshERP-web/src/views/report/RetailOutReport.vue b/jshERP-web/src/views/report/RetailOutReport.vue
index 6fa2a6aea..647668bc9 100644
--- a/jshERP-web/src/views/report/RetailOutReport.vue
+++ b/jshERP-web/src/views/report/RetailOutReport.vue
@@ -252,9 +252,10 @@
             this.ipagination.total = res.data.total;
             this.tableAddTotalRow(this.columns, this.dataSource)
             this.realityPriceTotal = res.data.realityPriceTotal
-          }
-          if(res.code===510){
+          } else if(res.code===510){
             this.$message.warning(res.data)
+          } else {
+            this.$message.warning(res.data.message)
           }
           this.loading = false;
         })
diff --git a/jshERP-web/src/views/report/SaleOutReport.vue b/jshERP-web/src/views/report/SaleOutReport.vue
index 1e30e3201..77ecc7a46 100644
--- a/jshERP-web/src/views/report/SaleOutReport.vue
+++ b/jshERP-web/src/views/report/SaleOutReport.vue
@@ -251,9 +251,10 @@
             this.ipagination.total = res.data.total;
             this.tableAddTotalRow(this.columns, this.dataSource)
             this.realityPriceTotal = res.data.realityPriceTotal
-          }
-          if(res.code===510){
+          } else if(res.code===510){
             this.$message.warning(res.data)
+          } else {
+            this.$message.warning(res.data.message)
           }
           this.loading = false;
         })
diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue
index 7db51e282..2afccc764 100644
--- a/jshERP-web/src/views/report/VendorAccount.vue
+++ b/jshERP-web/src/views/report/VendorAccount.vue
@@ -246,9 +246,10 @@
             this.tableAddTotalRow(this.columns, this.dataSource)
             this.firstTotal = '期初应付：' + res.data.firstMoney + "，"
             this.lastTotal = '期末应付：' + res.data.lastMoney
-          }
-          if(res.code===510){
+          } else if(res.code===510){
             this.$message.warning(res.data)
+          } else {
+            this.$message.warning(res.data.message)
           }
           this.loading = false;
         })