~jiangyouyao/beauty-erp.git

			@@ -482,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">
			@@ -502,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>
			@@ -575,30 +575,37 @@
			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: '欠款'
			},],
			@@ -674,7 +681,7 @@
			item.payMoney = item.zkPrice;
			}
			orderPayMoney += item.payMoney;

			item.uuid = MTools.uuid();
			//业绩设置
			_this.achieveList.push({
			orderItem: item,
			@@ -868,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("支付金额不能大于应收金额");
			// }
			}
			})
			}
			@@ -916,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) {
			@@ -944,17 +951,30 @@
			}
			if (item.uuid == achieve.orderItem.uuid) {
			let achieveNew = {
			uuid:item.uuid,
			beaultId: achieve.saleId,
			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";
			@@ -1215,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);
			}
			});