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/orderXq-form.html | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 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 45d6218..be177b0 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
@@ -108,7 +108,8 @@
</el-col>
<el-col :span="14" style="text-align: right;">
<label>¥ {{order.total}}</label>
- <label>¥ {{(order.zkTotal - order.total).toFixed(2)}}</label>
+ <!-- 退款订单不能显示为负数 -->
+ <label>¥ {{(order.zkTotal - order.total>0?order.zkTotal - order.total:0).toFixed(2)}}</label>
<label>¥ {{order.zkTotal}}</label>
<label>¥ {{order.arrears}}</label>
<label>¥ {{order.repay}}</label>
@@ -256,11 +257,15 @@
label="收款">
</el-table-column>
<el-table-column
- prop="t3"
+ prop="payMethod"
+ label="支付方式">
+ </el-table-column>
+ <el-table-column
+ prop="achieveType"
label="业绩类型">
</el-table-column>
<el-table-column
- prop="t1"
+ prop="goodsCash"
label="原业绩">
</el-table-column>
<el-table-column
@@ -664,6 +669,10 @@
}
_this.data.items = dataItems;
+ _this.data.zkTotal = _this.refundMoney;
+ _this.data.total = _this.total;
+
+
AjaxProxy.requst({
app: _this,
data: _this.data,
@@ -717,6 +726,7 @@
let _this = this;
let items = this.orderItems;
_this.refundMoney = 0;
+ _this.total = 0;
for(var i = 0; i < items.length; i++) {
let item = items[i]
@@ -732,6 +742,8 @@
}
_this.refundMoney += parseFloat(item.refundPrice * item.refundCount);
+ //记录一下未优惠之前的价格
+ _this.total += parseFloat(item.price * item.refundCount);
}
}
@@ -742,7 +754,7 @@
_this.dialogSettleVisible = true;
},
calOrderTotalFormatter(row, column) {
- return row.count * row.price;
+ return row.count * row.zkPrice;
},
getVipMoneyCards() {
let _this = this;
@@ -903,7 +915,8 @@
console.log("校验业绩是否大于订单收款金额");
let jsqMap={};
let isOk=true;
- this.achieveItems.forEach(achieve=>{
+ for(let i=0 ; i< this.achieveItems.length; i++){
+ let achieve=this.achieveItems[i];
if(!isNaN(achieve.goodsCash) ){
key=achieve.achieveType+achieve.orderItemId;
if(!jsqMap[key]){
@@ -914,14 +927,14 @@
if(jsqMap[key]>achieve.zkTotal) {
this.$message.error("【"+achieve.goodsName + "】业绩分配金额大于支付金额");
isOk = false;
- return;
+ break;
}
}else{
this.$message.error("【"+achieve.goodsName + "】业绩分配金额请填写数字");
isOk=false;
- return;
+ break;
}
- });
+ }
console.log("isOk",isOk);
return isOk;
},
--
Gitblit v1.9.1