From 53939e0ceb528f45c4906c86ce499ecb864f7af8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 15 Mar 2021 14:38:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 794b871..f6d935e 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
@@ -985,7 +985,8 @@
let flows = []
var total = 0;
let isPayMethodOk=true;
- _this.payMoneys.forEach(item => {
+ for(let i=0; i<_this.payMoneys.length;i++){
+ let item = _this.payMoneys[i];
let flow = {};
flow.payMethod = item.type;
if (!item.money) {
@@ -1000,11 +1001,7 @@
}
total += parseFloat(item.money);
flows.push(flow)
- })
- if(!isPayMethodOk){
- return ;
}
-
if (total != _this.order.payMoney) {
this.$message.warning("输入付款总金额与应付金额不符");
return false;
@@ -1266,7 +1263,8 @@
console.log("校验业绩是否大于订单收款金额");
let jsqMap={};
let isOk=true;
- this.achieveList.forEach(achieve=>{
+ for(let i=0 ; i< this.achieveList.length; i++){
+ let achieve=this.achieveList[i];
if(!isNaN(achieve.goodsCash) ){
key=achieve.achieveType+achieve.orderItem.uuid;
if(!jsqMap[key]){
@@ -1284,7 +1282,7 @@
isOk=false;
return;
}
- });
+ };
console.log("isOk",isOk);
return isOk;
},
@@ -1399,6 +1397,10 @@
return false;
}
+ if(!this.checkAchieveMoney()){
+ return ;
+ }
+
_this.dialogSettleVisible = true;
}
}
--
Gitblit v1.9.1