From c57c5f9843dcd99d908aa3b6bddb0c3793ebf3e9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 20 Apr 2021 11:52:07 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

---
 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html
index 8acd0ec..010a1a8 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html
@@ -93,8 +93,6 @@
 				url : basePath+"/admin/sysBusinessData/findDailySaleData",
 				showExport : true,
 				showFooter : false,
-				height:'auto',
-				width:'auto',
 				exportDataType : "basic", //basic', 'all', 'selected'.
 				exportTypes : [ 'excel', 'xlsx' ], //导出类型
 				exportOptions : {
@@ -116,7 +114,8 @@
 		}
 
 		function zkAmountFormat(value, row, index) {
-			return row.shouldPay + row.refund - row.totalPay;
+			var result = row.shouldPay + row.refund - row.arrears - row.totalPay;
+			return result.toFixed(2);
 		}
 
 		function footCountTitle(data) {

--
Gitblit v1.9.1