From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距,和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/resources/templates/views/admin/hive/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/statistics/daily-sale-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sale-list.html
index 9d71abc..7541632 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sale-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/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