From 39b5aa730edf14c9215935a5fc836be8e8345e1c Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 26 Jan 2021 21:20:54 +0800
Subject: [PATCH] 划扣bug
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html
index 66b5414..76320e7 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html
@@ -85,7 +85,6 @@
<el-row style="line-height: 50px;" v-for="(item, index) in payMoneys">
<el-col :span="6" style="text-align: right; padding-right: 10px; font-size: 12px;">{{item.value}}</el-col>
<el-col :span="8"><el-input v-model="item.money"></el-input></el-col>
- <el-col :span="6" style="margin-left: 10px;" v-if="item.type == '储值卡'">{{item.isGift == 1 ? '赠送余额' : '余额' }}：<span class="arrears">¥ {{item.balance}}</span></el-col>
</el-row>
</el-col>
</el-row>
@@ -211,7 +210,6 @@
let _this = this;
this.cardInfo = /*[[${obj}]]*/
- this.cardInfo.vipId = vipId;
//获取用户列表
AjaxProxy.requst({
app: _this,
@@ -265,7 +263,7 @@
total += item.money;
flows.push(flow);
})
- if (total == _this.rechargeMoney) {
+ if (total != _this.rechargeMoney) {
this.$message.warning("付款金额应等于充值金额");
return false;
}
@@ -275,9 +273,21 @@
return false;
}
- _this.cardInfo.bjMoney = _this.rechargeMoney;
+ let achaeveList = [];
+ _this.achieveList.forEach(achieve => {
+ let achieveNew = {
+ beaultId: achieve.saleId,
+ t1: achieve.achieveMoney,
+ t3: '现金业绩',
+ projPercentage: achieve.commission,
+ };
+ achaeveList.push(achieveNew);
+ })
+ _this.cardInfo.bjmoney = _this.rechargeMoney;
+ _this.cardInfo.achaeveList = achaeveList;
let url = basePath + "/admin/moneyCardUse/cz";
+ console.log(_this.cardInfo);
AjaxProxy.requst({
app: _this,
data: _this.cardInfo,
@@ -292,7 +302,7 @@
}
if (parent.app) {
- parent.app.orderQuery();
+ parent.app.vipInfoFn();
}
_this.closeFrame();
@@ -356,7 +366,7 @@
for(var i = 0; i < payMoneys.length; i++) {
hasAmount += parseFloat(payMoneys[i].money);
}
- if (_this.order.arrears - hasAmount > 0) {
+ if (_this.rechargeMoney - hasAmount > 0) {
Vue.set(item, 'money', _this.rechargeMoney - hasAmount);
}
_this.payMoneys.push(item);
--
Gitblit v1.9.1