From 473399b0dec33a6690701d947303e88fc2e25dca Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Tue, 19 Jan 2021 01:59:03 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 2 +-
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html | 2 +-
2 files changed, 2 insertions(+), 2 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 e738a10..8acd0ec 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
@@ -116,7 +116,7 @@
}
function zkAmountFormat(value, row, index) {
- return row.shouldPay + row.refund - row.arrears - row.totalPay;
+ return row.shouldPay + row.refund - row.totalPay;
}
function footCountTitle(data) {
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index 195139c..55bf9b2 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -995,7 +995,7 @@
if (_this.printPaper) {
_this.print();
}
- _this.closeFram();
+ // _this.closeFram();
// _this.$confirm('结算成功，是否立刻打印小票?', '提示', {
// confirmButtonText: '打印',
// cancelButtonText: '取消',
--
Gitblit v1.9.1