From 2d237fcda803edfef34bea3a47673e6237541aa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 30 Apr 2020 23:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/home.html                         | 34 +++++++++--------------
 erp_web/pages/reports/account_report.html |  4 +--
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/erp_web/home.html b/erp_web/home.html
index 00878f77..d1dff68f 100644
--- a/erp_web/home.html
+++ b/erp_web/home.html
@@ -25,7 +25,7 @@
                     <span class="info-box-icon bg-aqua"><i class="fa fa-shopping-bag"></i></span>
                     <div class="info-box-content">
                         <span class="info-box-text">今日累计销售</span>
-                        <span id="todaySale" class="info-box-number">0元</span>
+                        <span id="todaySale" class="info-box-number"></span>
                     </div>
                 </div>
             </div>
@@ -34,7 +34,7 @@
                     <span class="info-box-icon bg-red"><i class="fa fa-shopping-cart"></i></span>
                     <div class="info-box-content">
                         <span class="info-box-text">本月累计销售</span>
-                        <span id="thisMonthSale" class="info-box-number">0元</span>
+                        <span id="thisMonthSale" class="info-box-number"></span>
                     </div>
                 </div>
             </div>
@@ -44,16 +44,16 @@
                     <span class="info-box-icon bg-green"><i class="fa fa-shopping-basket"></i></span>
                     <div class="info-box-content">
                         <span class="info-box-text">本月累计进货</span>
-                        <span id="thisMonthBuy" class="info-box-number">0元</span>
+                        <span id="thisMonthBuy" class="info-box-number"></span>
                     </div>
                 </div>
             </div>
             <div class="col-md-3 col-sm-6 col-xs-12">
                 <div class="info-box">
-                    <span class="info-box-icon bg-yellow"><i class="fa fa-users"></i></span>
+                    <span class="info-box-icon bg-yellow"><i class="fa fa-rmb"></i></span>
                     <div class="info-box-content">
-                        <span class="info-box-text">用户数量</span>
-                        <span id="thisUserSum" class="info-box-number">0</span>
+                        <span class="info-box-text">本月利润(含财务部分)</span>
+                        <span id="thisMonthAmount" class="info-box-number"></span>
                     </div>
                 </div>
             </div>
@@ -130,9 +130,9 @@
             success: function (res) {
                 if(res && res.code === 200) {
                     if(res.data) {
-                        $("#todaySale").text(res.data.todaySale);
-                        $("#thisMonthSale").text(res.data.thisMonthSale);
-                        $("#thisMonthBuy").text(res.data.thisMonthBuy);
+                        $("#todaySale").text((res.data.todaySale).toFixed(2));
+                        $("#thisMonthSale").text((res.data.thisMonthSale).toFixed(2));
+                        $("#thisMonthBuy").text((res.data.thisMonthBuy).toFixed(2));
                     }
                 }
             },
@@ -145,20 +145,12 @@
     $(function () {
         $.ajax({
             type: "get",
-            url: "/user/list",
+            url: "/account/getStatistics",
             dataType: "json",
-            data: ({
-                search: JSON.stringify({
-                    userName: "",
-                    loginName: ""
-                }),
-                currentPage: 1,
-                pageSize: 10
-            }),
             success: function (res) {
-                if(res && res.code === 200) {
-                    if(res.data && res.data.page) {
-                        $("#thisUserSum").text(res.data.page.total);
+                if (res && res.code === 200) {
+                    if(res.data) {
+                        $("#thisMonthAmount").text((res.data.allMonthAmount-0).toFixed(2));
                     }
                 }
             },
diff --git a/erp_web/pages/reports/account_report.html b/erp_web/pages/reports/account_report.html
index 4aea21d2..739c66fd 100644
--- a/erp_web/pages/reports/account_report.html
+++ b/erp_web/pages/reports/account_report.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>结算账户查询</title>
+    <title>账户统计</title>
     <meta charset="utf-8">
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
@@ -22,7 +22,7 @@
 </head>
 <body>
 <!-- 数据显示table -->
-<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="结算账户列表" iconCls="icon-list">
+<div id="tablePanel" class="easyui-panel" data-options="fit:true" style="padding:1px;top:300px;" title="账户统计列表" iconCls="icon-list">
     <div class="box-body form-inline">
         <div class="form-group">
             <label class="control-label">名称：</label>