From 9080f16e29363b99f7d9e659ceb7d236aa36bafa Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 08 Mar 2021 08:31:36 +0800
Subject: [PATCH] 修改数据库

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
index be9c9d9..03c03f0 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
@@ -669,6 +669,7 @@
 
                 _this.data.items = dataItems;
                 _this.data.zkTotal =  _this.refundMoney;
+                _this.data.total =  _this.total;
 
 
                 AjaxProxy.requst({
@@ -739,6 +740,8 @@
                         }
 
                         _this.refundMoney += parseFloat(item.refundPrice * item.refundCount);
+                        //记录一下未优惠之前的价格
+                        _this.total += parseFloat(item.price * item.refundCount);
                     }
                 }
 
@@ -749,7 +752,7 @@
                 _this.dialogSettleVisible = true;
             },
             calOrderTotalFormatter(row, column) {
-                return row.count * row.price;
+                return row.count * row.zkPrice;
             },
             getVipMoneyCards() {
                 let _this = this;

--
Gitblit v1.9.1