From b74479652326a0094e4a7957cff4a4ce644ec338 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 21:16:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E9=94=80=E5=AD=98=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0=E4=BC=98=E5=8C=96=EF=BC=8C=E4=BF=9D=E7=95=99=E4=B8=A4?=
 =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=95=B0=EF=BC=8C=E5=9B=9B=E8=88=8D=E4=BA=94?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue
index 51d09a94..f3424a42 100644
--- a/jshERP-web/src/views/report/InOutStockReport.vue
+++ b/jshERP-web/src/views/report/InOutStockReport.vue
@@ -213,16 +213,8 @@
         param.monthTime = this.queryParam.monthTime;
         getAction(this.url.totalCountMoney, param).then((res)=>{
           if(res && res.code === 200) {
-            let stock = res.data.totalStock.toString();
-            let count = res.data.totalCount.toString();
-            if (stock.lastIndexOf('.') > -1) {
-              stock = stock.substring(0, stock.lastIndexOf('.') + 3);
-            }
-            if (count.lastIndexOf('.') > -1) {
-              count = count.substring(0, count.lastIndexOf('.') + 3);
-            }
-            this.totalStockStr = stock;
-            this.totalCountMoneyStr = count;
+            this.totalStockStr = res.data.totalStock.toFixed(2)
+            this.totalCountMoneyStr = res.data.totalCount.toFixed(2)
           }
         })
       },
diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index 1091efac..467ecad9 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.toFixed(2);
-            this.currentStockPrice = res.data.currentStockPrice.toFixed(2);
-            this.currentWeight = res.data.currentWeight.toFixed(2);
+            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)