From d58a5eecbbf9db6a9469801273e537a55bc8e794 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 07 Jan 2021 21:24:58 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 137 ++++++++++++++++++++++++++++-----------------
1 files changed, 85 insertions(+), 52 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 bd53d6f..48a3070 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
@@ -112,6 +112,10 @@
border: 3px solid;
border-color: transparent #4884ff #4884ff transparent;
}
+
+ .el-dialog__body {
+ padding-top: 10px !important;
+ }
</style>
</head>
<body>
@@ -451,9 +455,9 @@
</el-drawer>
<el-dialog title="收款" :visible.sync="dialogSettleVisible">
- <el-row type="flex" align="middle" style="padding: 10px 0;">
+ <el-row type="flex" align="middle" style="padding: 0 0 10px 0;">
<el-col :span="5" style="text-align: center;">应收</el-col>
- <el-col :span="10" style="text-align: center; line-height: 50px;"><span style="color: red;">¥ 80</span></el-col>
+ <el-col :span="10" style="text-align: center; line-height: 50px;"><span style="color: red; font-size: 20px;">¥ {{order.payMoney}}</span></el-col>
</el-row>
<el-row type="flex" align="middle" style="padding: 10px 0;">
@@ -463,7 +467,7 @@
<ul>
<span v-for="(item, index) in payMethods">
<el-popover
- :disabled="item.type != 6"
+ :disabled="item.type != '会员卡'"
placement="bottom"
trigger="hover"
@hide="popoverHide(item)">
@@ -486,13 +490,13 @@
</el-col>
</el-row>
- <el-row type="flex" align="middle" style="padding: 10px 0;">
+ <el-row type="flex" align="middle" style="padding: 10px 0 50px 0;">
<el-col :span="5" style="text-align: center;">支付金额</el-col>
<el-col :span="15">
<el-row style="line-height: 50px;" v-for="(item, index) in payMoneys">
- <el-col :span="5" 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="5" style="margin-left: 10px;" v-if="item.type == 6">余额：<span class="arrears">¥ {{item.balance}}</span></el-col>
+ <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="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>
@@ -552,31 +556,31 @@
payMethods: [{
value: '现金支付',
isActive: false,
- type: 1
+ type: '现金支付'
}, {
value: '微信',
isActive: false,
- type: 2
+ type: '微信'
}, {
value: '支付宝',
isActive: false,
- type: 3
+ type: '支付宝'
}, {
value: '银行卡',
isActive: false,
- type: 4
+ type: '银行卡'
}, {
value: '团购',
isActive: false,
- type: 5
+ type: '团购'
}, {
value: '会员卡',
isActive: false,
- type: 6
+ type: '会员卡'
}, {
value: '欠款',
isActive: false,
- type: 7
+ type: '欠款'
},],
achieveList: [],
//会员可用的充值卡
@@ -707,11 +711,24 @@
contentType: 'application/x-www-form-urlencoded',
url: basePath + '/admin/moneyCardUse/getUseMoneyCard',
callback: function (data) {
- console.log(_this.moneyCards)
if (data.rows.length > 0) {
data.rows.forEach(function (item, index, input) {
- item.showLable = item.cardName + "-余额:" + (item.realMoney + item.giftMoney)
+ item.showLable = item.cardName + "-余额:" + (item.realMoney)
+ item.uuid = MTools.uuid();
+ if (item.giftMoney != 0) {
+ var children = [];
+ var gift = {};
+ gift.id = item.id;
+ gift.giftMoney = item.giftMoney;
+ gift.showLable = item.cardName + '-赠送金额' + item.giftMoney;
+ gift.cardName = item.cardName;
+ gift.isGift = 1;
+ gift.uuid = MTools.uuid();
+ children.push(gift);
+ item.children = children;
+ }
});
+ console.log(data.rows)
_this.moneyCards = data.rows;
}
@@ -859,21 +876,30 @@
//检查支付方式
- let hasPayMethod=true;
- _this.order.items.forEach(item=>{
- if(!item.payMethod){
- hasPayMethod=false;
- return;
+ // let hasPayMethod=true;
+ // _this.order.items.forEach(item=>{
+ // if(!item.payMethod){
+ // hasPayMethod=false;
+ // return;
+ // }
+ // });
+ // if(!hasPayMethod){
+ // this.$message.warning("请选择支付方式");
+ // return false;
+ // }
+
+ let flows = []
+ _this.payMoneys.forEach(item=>{
+ let flow = {};
+ flow.payMethod = item.type;
+ flow.amount = item.money;
+ if (item.type == 6) {
+ flow.isGift = item.isGift;
+ flow.cardId = item.id;
}
- });
- if(!hasPayMethod){
- this.$message.warning("请选择支付方式");
- return false;
- }
-
-
-
-
+ flows.push(flow)
+ })
+ _this.order.flows = flows;
//匹配业绩
@@ -1159,37 +1185,44 @@
Vue.set(item, 'isActive', true)
}
},
- handleCheckChange(click, checked) {
+ handleCheckChange(clickNode, checked) {
let _this = this;
- let selectNodes = checked.checkedNodes;
- this.treeSelect = selectNodes;
- let payMoneys = this.payMoneys;
- for(var i = 0; i < payMoneys.length; i++) {
- if(payMoneys[i].type == 6) {
- _this.payMoneys.splice(i, 1);
+ let nodes = checked.checkedNodes;
+ _this.treeSelect = nodes;
+ var index = -1;
+ // 判断点击节点是否在已展示支付方式中
+ for(var i = 0; i < _this.payMoneys.length; i++) {
+ let node = _this.payMoneys[i];
+ if (node.uuid === clickNode.uuid) {
+ index = i;
+ break;
}
}
- for(var i = 0; i < selectNodes.length; i++) {
- var node = selectNodes[i];
+ // 若点击节点在选中节点中，且已展示支付方式不存在，则添加
+ if (nodes.indexOf(clickNode) > -1 && index === -1) {
+ var node = clickNode;
var item = {};
- item.value = node.cardName;
- item.balance = node.money;
- item.isGift = 0;
- item.type = 6;
- item.id = node.id;
- if (node.giftMoney != 0) {
- var giftItem = {};
- giftItem.value = node.cardName + "赠送金额";
- giftItem.id = node.id;
- giftItem.balance = node.giftMoney;
- giftItem.isGift = 1;
- giftItem.type = 6;
- _this.payMoneys.push(giftItem);
+ if (node.isGift) {
+ item.value = node.cardName;
+ item.balance = node.giftMoney;
+ item.isGift = 1;
+ } else {
+ item.value = node.cardName;
+ item.balance = node.realMoney;
+ item.isGift = 0;
}
+ item.type = '会员卡';
+ item.id = node.id;
+ item.uuid = clickNode.uuid;
_this.payMoneys.push(item);
}
+
+ // 若点击节点不存在选中节点中，且已展示支付方式中存在，则移除
+ if (nodes.indexOf(clickNode) === -1 && index > -1) {
+ _this.payMoneys.splice(index, 1);
+ }
},
submitPay() {
}
--
Gitblit v1.9.1