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 | 191 +++++++++++++++++++++++++++++++++++------------
1 files changed, 142 insertions(+), 49 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 fedb760..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,10 +467,11 @@
<ul>
<span v-for="(item, index) in payMethods">
<el-popover
- :disabled="item.type != 1"
+ :disabled="item.type != '会员卡'"
placement="bottom"
- trigger="click">
- <el-row><span>选择</span></el-row>
+ trigger="hover"
+ @hide="popoverHide(item)">
+ <el-row style="text-align: center;"><span style="padding: 0 0 10px 0; display: block; font-size: 12px;">选择会员卡支付方式</span></el-row>
<el-tree :data="moneyCards"
show-checkbox
default-expand-all
@@ -474,6 +479,7 @@
ref="tree"
check-strictly
highlight-current
+ @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>
@@ -484,21 +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;">
- <el-col :span="5" style="text-align: right; padding-right: 10px;">微信支付</el-col>
- <el-col :span="8"><el-input></el-input></el-col>
- </el-row>
- <el-row style="line-height: 50px;">
- <el-col :span="5" style="text-align: right; padding-right: 10px;">储值卡</el-col>
- <el-col :span="8"><el-input></el-input></el-col>
- <el-col :span="5" style="margin-left: 10px;">余额：<span class="arrears">¥ 1000</span></el-col>
- </el-row>
- <el-row style="line-height: 50px;">
- <el-col :span="5" style="text-align: right; padding-right: 10px;">欠款</el-col>
- <el-col :span="8"><el-input></el-input></el-col>
+ <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="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>
@@ -508,7 +506,7 @@
</el-row>
<el-row style="text-align: center; margin: 10px 0 0 0">
- <el-button type="primary">确认收款</el-button>
+ <el-button type="primary" @click="submitPay">确认收款</el-button>
</el-row>
</el-dialog>
@@ -557,26 +555,32 @@
vipLoading: false,
payMethods: [{
value: '现金支付',
- isActive: false
+ isActive: false,
+ type: '现金支付'
}, {
value: '微信',
- isActive: false
+ isActive: false,
+ type: '微信'
}, {
value: '支付宝',
- isActive: false
+ isActive: false,
+ type: '支付宝'
}, {
value: '银行卡',
- isActive: false
+ isActive: false,
+ type: '银行卡'
}, {
value: '团购',
- isActive: false
+ isActive: false,
+ type: '团购'
}, {
value: '会员卡',
isActive: false,
- type: 1
+ type: '会员卡'
}, {
value: '欠款',
- isActive: false
+ isActive: false,
+ type: '欠款'
},],
achieveList: [],
//会员可用的充值卡
@@ -602,7 +606,9 @@
defaultProps: {
children: 'children',
label: 'showLable'
- }
+ },
+ treeSelect : [],
+ payMoneys : []
},
@@ -705,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;
}
@@ -857,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;
//匹配业绩
@@ -1125,13 +1153,78 @@
},
payMethodSelect(item, index) {
- this.$nextTick(function () {
- if (item.isActive) {
- Vue.set(item,'isActive',false);
- } else {
- Vue.set(item,'isActive',true);
+ let _this = this;
+ let payMoneys = _this.payMoneys;
+ if (item.type != 6) {
+ this.$nextTick(function () {
+ if (item.isActive) {
+ Vue.set(item,'isActive',false);
+ var index = -1;
+ for (var i = 0; i < payMoneys.length; i++) {
+ let payMoney = payMoneys[i];
+ if (payMoney.value == item.value) {
+ index = i;
+ break;
+ }
+ }
+
+ if (index > -1) {
+ _this.payMoneys.splice(index, 1)
+ }
+ } else {
+ Vue.set(item,'isActive',true);
+ _this.payMoneys.push(item);
+ }
+ });
+ }
+ },
+ popoverHide(item) {
+ if(this.treeSelect.length <= 0) {
+ Vue.set(item, 'isActive', false)
+ } else {
+ Vue.set(item, 'isActive', true)
+ }
+ },
+ handleCheckChange(clickNode, checked) {
+ let _this = this;
+
+ 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;
}
- });
+ }
+
+ // 若点击节点在选中节点中，且已展示支付方式不存在，则添加
+ if (nodes.indexOf(clickNode) > -1 && index === -1) {
+ var node = clickNode;
+ var item = {};
+ 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