From 34bd9d503b4701f51a1e0c44710e4db91b1384ae Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 26 Jan 2021 16:54:06 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 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 1c21de3..5d91b37 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
@@ -382,7 +382,7 @@
title="业绩设置"
:visible.sync="drawer"
:direction="direction"
- size="50%"
+ size="90%"
>
<el-row>
<el-col :span="24">
@@ -516,7 +516,7 @@
<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-col :span="8" 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>
@@ -835,17 +835,29 @@
}
item.count = 1;
-
- //加入业绩
- this.achieveList.push({
- orderItem: item,
- staff: this.loginUser,
- saleId: this.loginUser.suId,
- achieveMoney: item.payMoney,
- t3 : '现金业绩',
- commission : 0,
- isShare: false,
- });
+ if (this.staffUser.suId) {
+ //加入业绩
+ this.achieveList.push({
+ orderItem: item,
+ staff: this.staffUser,
+ saleId: this.staffUser.suId,
+ achieveMoney: item.payMoney,
+ t3: '现金业绩',
+ commission: 0,
+ isShare: false,
+ });
+ } else {
+ //加入业绩
+ this.achieveList.push({
+ orderItem: item,
+ staff: this.loginUser,
+ saleId: this.loginUser.suId,
+ achieveMoney: item.payMoney,
+ t3: '现金业绩',
+ commission: 0,
+ isShare: false,
+ });
+ }
this.order.items.push(item);
}
@@ -887,7 +899,14 @@
item.payMoney = zkPrice * count;
}
_this.order.payMoney += parseFloat(item.payMoney);
+
+ _this.achieveList.forEach(achieve=>{
+ if(achieve.orderItem==item){
+ achieve.achieveMoney=item.payMoney;
+ }
+ })
});
+ _this.order.payMoney = _this.order.payMoney.toFixed(2);
//计算欠款
// _this.order.arrears = _this.order.zkTotal - _this.order.payMoney;
// if (_this.order.arrears < 0) {
--
Gitblit v1.9.1