From 428962ee1f8635eafb916ac96223fb484aae2cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 14 May 2023 18:36:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=8A=A5=E8=A1=A8=E5=B1=95=E7=A4=BA=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/report/InOutStockReport.vue | 6 +++---
 jshERP-web/src/views/report/MaterialStock.vue    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue
index b92eda8c..51d09a94 100644
--- a/jshERP-web/src/views/report/InOutStockReport.vue
+++ b/jshERP-web/src/views/report/InOutStockReport.vue
@@ -45,7 +45,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item>
-                  <span>本月总结存数量：{{totalStockStr}}，总结存金额：{{totalCountMoneyStr}}</span>
+                  <span>本月总结存：{{totalStockStr}}，总结存金额：{{totalCountMoneyStr}}</span>
                 </a-form-item>
               </a-col>
               <template v-if="toggleSearchStatus">
@@ -144,7 +144,7 @@
         depotList: [],
         categoryTree:[],
         totalStockStr: '0',
-        totalCountMoneyStr: '0元',
+        totalCountMoneyStr: '0',
         // 表头
         columns: [
           {
@@ -222,7 +222,7 @@
               count = count.substring(0, count.lastIndexOf('.') + 3);
             }
             this.totalStockStr = stock;
-            this.totalCountMoneyStr = count + "元";
+            this.totalCountMoneyStr = count;
           }
         })
       },
diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index 37c58ad4..1091efac 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -238,9 +238,9 @@
             this.dataSource = res.data.rows;
             this.ipagination.total = res.data.total;
             this.tableAddTotalRow(this.columns, this.dataSource)
-            this.currentStock = res.data.currentStock;
-            this.currentStockPrice = res.data.currentStockPrice;
-            this.currentWeight = res.data.currentWeight;
+            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){
             this.$message.warning(res.data)