From d1bb177d31edc15dba595d6a14dadfd73f99e7a7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 25 Mar 2021 11:28:43 +0800
Subject: [PATCH] 分销设置自购返佣
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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..63aaa8b 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
@@ -306,7 +306,7 @@
<el-table-column
label="小计">
<template slot-scope="scope">
- {{scope.row.zkPrice * scope.row.count }}
+ {{(scope.row.zkPrice * scope.row.count).toFixed(2) }}
</template>
</el-table-column>
@@ -370,7 +370,7 @@
<li>订单总金额：{{order.total}}</li>
- <li>整单折扣：<span class="arrears" v-if="order.zkTotal != null">{{order.total - order.zkTotal}}</span></li>
+ <li>整单折扣：<span class="arrears" v-if="order.zkTotal != null">{{(order.total - order.zkTotal).toFixed(2)}}</span></li>
<!-- <li v-if="order.arrears>0">订单欠款：<span class="arrears">{{order.arrears}}</span></li>-->
<!-- <li v-if="order.arrears<0">找零：<span class="arrears">{{order.arrears}}</span></li>-->
</ul>
@@ -916,8 +916,8 @@
callback: function (data) {
let order = data.rows[0];
console.log("order", order);
- _this.order.zkTotal = order.zkTotal;
- _this.order.total = order.total;
+ _this.order.zkTotal = order.zkTotal.toFixed(2);
+ _this.order.total = order.total.toFixed(2);
//支付金额计算
_this.order.items.forEach(item => {
@@ -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