From cc74efb36fd1f1de56b3acb2ba59d4b416eaed4f Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Tue, 19 Jan 2021 00:23:21 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 94 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 78 insertions(+), 16 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 351359d..195139c 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
@@ -414,14 +414,34 @@
prop="orderItem.payMoney"
label="收款">
</el-table-column>
+
<el-table-column
- label="业绩">
+ label="业绩类型" width="150">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.t3" placeholder="请选择业绩类型">
+ <el-option
+ v-for="item in achieveTypeList"
+ :key="item.key"
+ :label="item.value"
+ :value="item.key">
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="业绩" width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.achieveMoney"></el-input>
</template>
</el-table-column>
<el-table-column
- label="员工">
+ label="提成">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.commission"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="员工" width="130">
<template slot-scope="scope">
<el-select v-model="scope.row.saleId" placeholder="请选择员工">
<el-option
@@ -434,7 +454,7 @@
</template>
</el-table-column>
<el-table-column
- width="200"
+ width="150"
label="操作">
<template slot-scope="scope">
<el-button type="primary" v-if="scope.row.isShare"
@@ -462,7 +482,7 @@
<el-row type="flex" align="middle" style="padding: 10px 0;">
<el-col :span="5" style="text-align: center;">收款方式</el-col>
- <el-col class="paymethod" :span="15">
+ <el-col class="paymethod" :span="18">
<el-row>
<ul>
<span v-for="(item, index) in payMethods">
@@ -482,7 +502,7 @@
@check="(click, checked,$item)=>{handleCheckChange(click, checked,$item)}"
:props="defaultProps">
</el-tree>
- <li :class="{active : item.isActive}" slot="reference" @click="payMethodSelect(item, index)">{{item.value}}</li>
+ <li :class="{active : item.isActive}" slot="reference" @click="payMethodSelect(item, index)"><div style=" height:30px; line-height: 30px; display: flex; align-items: center"><img style="width: 25px; height: 25px; align-items: center;" :src="item.img"><span style="margin-left: 5px;">{{item.value}}</span></div></li>
</el-popover>
</span>
</ul>
@@ -495,7 +515,7 @@
<el-col :span="15">
<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.number="item.money"></el-input></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>
@@ -555,34 +575,50 @@
vipLoading: false,
payMethods: [{
value: '现金支付',
+ img: '/images/pay/cash.png',
isActive: false,
type: '现金支付'
}, {
value: '微信',
+ img: '/images/pay/wechat.png',
isActive: false,
type: '微信'
}, {
value: '支付宝',
+ img: '/images/pay/zhifubao.png',
isActive: false,
type: '支付宝'
}, {
value: '银行卡',
+ img: '/images/pay/yinlian.png',
isActive: false,
type: '银行卡'
}, {
value: '团购',
+ img: '/images/pay/tuan.png',
isActive: false,
type: '团购'
}, {
value: '储值卡',
+ img: '/images/pay/card.png',
isActive: false,
type: '储值卡'
- }, {
+ },{
value: '欠款',
+ img: '/images/pay/qian.png',
isActive: false,
type: '欠款'
},],
achieveList: [],
+ achieveTypeList : [
+ {
+ "key" : "现金业绩",
+ "value" : "现金业绩"
+ },{
+ "key" : "划扣业绩",
+ "value" : "划扣业绩"
+ },
+ ],
//会员可用的充值卡
moneyCards: [],
//门店信息
@@ -645,13 +681,15 @@
item.payMoney = item.zkPrice;
}
orderPayMoney += item.payMoney;
-
+ item.uuid = MTools.uuid();
//业绩设置
_this.achieveList.push({
orderItem: item,
staff: _this.loginUser,
saleId: _this.loginUser.suId,
achieveMoney: item.payMoney,
+ commission : 0,
+ t3 : '现金业绩',
isShare: false,
});
});
@@ -790,6 +828,8 @@
staff: this.loginUser,
saleId: this.loginUser.suId,
achieveMoney: item.payMoney,
+ t3 : '现金业绩',
+ commission : 0,
isShare: false,
});
this.order.items.push(item);
@@ -835,10 +875,10 @@
_this.order.payMoney += parseFloat(item.payMoney);
});
//计算欠款
- _this.order.arrears = _this.order.zkTotal - _this.order.payMoney;
- if (_this.order.arrears < 0) {
- _this.$message.error("支付金额不能大于应收金额");
- }
+ // _this.order.arrears = _this.order.zkTotal - _this.order.payMoney;
+ // if (_this.order.arrears < 0) {
+ // _this.$message.error("支付金额不能大于应收金额");
+ // }
}
})
}
@@ -883,12 +923,12 @@
this.$message.warning("请输入" + item.type + "的付款金额");
return false;
}
- flow.amount = item.money;
+ flow.amount = parseFloat(item.money);
if (item.type == '储值卡'){
flow.isGift = item.isGift;
flow.cardId = item.id;
}
- total += item.money;
+ total += parseFloat(item.money);
flows.push(flow)
})
if (total != _this.order.payMoney) {
@@ -911,15 +951,30 @@
}
if (item.uuid == achieve.orderItem.uuid) {
let achieveNew = {
+ uuid:item.uuid,
beaultId: achieve.saleId,
- t1: achieve.achieveMoney
+ t1: achieve.achieveMoney,
+ t3: achieve.t3,
+ projPercentage: achieve.commission,
};
- item.achaeveList.push(achieveNew);
+
+ var flag = true;
+ for(var j = 0; j < item.achaeveList.length; j++) {
+ if(item.achaeveList[j].uuid == achieveNew.uuid && item.achaeveList[j].beaultId == achieveNew.beaultId) {
+ flag = false;
+ break;
+ }
+ }
+
+ if (flag) {
+ item.achaeveList.push(achieveNew);
+ }
break;
}
}
})
+ console.log(_this.order);
//校验业绩金额
if (_this.checkAchieve()) {
let url = basePath + "/admin/order/payOrder";
@@ -1180,6 +1235,13 @@
}
} else {
Vue.set(item,'isActive',true);
+ var hasAmount = 0;
+ for(var i = 0; i < payMoneys.length; i++) {
+ hasAmount += parseFloat(payMoneys[i].money);
+ }
+ if (_this.order.payMoney - hasAmount > 0) {
+ Vue.set(item, 'money', _this.order.payMoney - hasAmount);
+ }
_this.payMoneys.push(item);
}
});
--
Gitblit v1.9.1