From 0de4720110cc7ce35d1565bdd5706d6b9a0b3982 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Jun 2021 22:10:24 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
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 ffc1769..16d0557 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
@@ -947,7 +947,7 @@
// if (optionType != 1) {
//直接修改支付金额不重置支付金额
- item.payMoney =( zkPrice * count).toFixed(2);
+ item.payMoney = (zkPrice * count).toFixed(2);
// }
_this.order.payMoney += parseFloat(item.payMoney);
@@ -999,9 +999,14 @@
if (this.checkSubmitOrder()) {
let _this = this;
+ //是否全部为储值卡支付
+ let isCardPay=true;
if(submitType == 1) {
//校验支付方式
+
+
+
if (_this.payMoneys.length > 0) {
let flows = []
var total = 0;
@@ -1019,6 +1024,8 @@
if (item.type == '储值卡'){
flow.isGift = item.isGift;
flow.cardId = item.id;
+ }else{
+ isCardPay=false;
}
total += parseFloat(item.money);
flows.push(flow)
@@ -1028,6 +1035,10 @@
return false;
}
_this.order.flows = flows;
+
+
+
+
} else {
this.$message.warning("请选择支付方式");
return false;
@@ -1042,6 +1053,12 @@
item.achieveList = [];
}
if (item.uuid == achieve.orderItem.uuid) {
+
+ if(isCardPay){
+ //如果是储值卡支付，则业绩自动切换到划扣金额
+ achieve.payMethod="划扣";
+ }
+
let achieveNew = {
uuid:item.uuid,
beaultId: achieve.saleId,
--
Gitblit v1.9.1