~jiangyouyao/beauty-erp.git

			@@ -320,9 +320,9 @@


			<!-- <el-table-column-->
			<!-- label="会员卡">-->
			<!-- label="储值卡">-->
			<!-- <template slot-scope="scope">-->
			<!-- <el-select :disabled="scope.row.payMethod!='会员卡'" v-model="scope.row.payMethodDetail"-->
			<!-- <el-select :disabled="scope.row.payMethod!='储值卡'" v-model="scope.row.payMethodDetail"-->
			<!-- placeholder="请选择支付卡">-->
			<!-- <el-option-->
			<!-- v-for="item in moneyCards"-->
			@@ -354,7 +354,7 @@

			<li>订单总金额：{{order.total}}</li>

			<li>整单折扣：<span class="arrears">{{order.total - order.zkTotal}}</span></li>
			<li>整单折扣：<span class="arrears" v-if="order.zkTotal != null">{{order.total - order.zkTotal}}</span></li>
			<!-- <li v-if="order.arrears>0">订单欠款：<span class="arrears">{{order.arrears}}</span></li>-->
			<!-- <li v-if="order.arrears<0">找零：<span class="arrears">{{order.arrears}}</span></li>-->
			</ul>
			@@ -370,7 +370,7 @@
			<el-button type="primary" @click="print()">打印</el-button>
			<el-button type="primary" @click="drawer = true">业绩设置</el-button>
			<!-- <el-button type="success" @click="confirmSubmit()" class="bigbtn"> 结算</el-button>-->
			<el-button type="success" @click="dialogSettleVisible = true" class="bigbtn">收款</el-button>
			<el-button type="success" @click="openPayMoney" class="bigbtn">收款 ¥{{order.payMoney}}</el-button>
			</el-col>
			</el-row>

			@@ -467,11 +467,11 @@
			<ul>
			<span v-for="(item, index) in payMethods">
			<el-popover
			:disabled="item.type != '会员卡'"
			:disabled="item.type != '储值卡'"
			placement="bottom"
			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-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
			@@ -496,17 +496,17 @@
			<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-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>

			<el-row style="text-align: center; margin: 20px 0 10px 0">
			<el-checkbox>打印小票</el-checkbox>
			<el-checkbox v-model="printPaper">打印小票</el-checkbox>
			</el-row>

			<el-row style="text-align: center; margin: 10px 0 0 0">
			<el-button type="primary" @click="submitPay">确认收款</el-button>
			<el-button type="primary" @click="confirmSubmit">确认收款</el-button>
			</el-row>
			</el-dialog>

			@@ -574,9 +574,9 @@
			isActive: false,
			type: '团购'
			}, {
			value: '会员卡',
			value: '储值卡',
			isActive: false,
			type: '会员卡'
			type: '储值卡'
			}, {
			value: '欠款',
			isActive: false,
			@@ -602,13 +602,14 @@
			loading: false,
			/****搜索表格数据END******/

			dialogSettleVisible : true,
			dialogSettleVisible : false,
			defaultProps: {
			children: 'children',
			label: 'showLable'
			},
			treeSelect : [],
			payMoneys : []
			payMoneys : [],
			printPaper : true,

			},

			@@ -697,7 +698,7 @@

			changePayMethod(item) {
			console.log("changePayMethod", item);
			if (item.payMethod != '会员卡') {
			if (item.payMethod != '储值卡') {
			item.payMethodDetail = '';
			}
			},
			@@ -868,39 +869,38 @@
			*/
			submitOrder(submitType) {




			if (this.checkSubmitOrder()) {
			let _this = this;


			//检查支付方式
			// 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(submitType == 1) {
			if (_this.payMoneys.length > 0) {
			let flows = []
			var total = 0;
			_this.payMoneys.forEach(item => {
			let flow = {};
			flow.payMethod = item.type;
			if (!item.money) {
			this.$message.warning("请输入" + item.type + "的付款金额");
			return false;
			}
			flow.amount = item.money;
			if (item.type == '储值卡'){
			flow.isGift = item.isGift;
			flow.cardId = item.id;
			}
			total += item.money;
			flows.push(flow)
			})
			if (total != _this.order.payMoney) {
			this.$message.warning("输入付款总金额与应付金额不符");
			return false;
			}
			_this.order.flows = flows;
			} else {
			this.$message.warning("请选择支付方式");
			return false;
			}
			flows.push(flow)
			})
			_this.order.flows = flows;

			}

			//匹配业绩
			_this.achieveList.forEach(achieve => {
			@@ -937,16 +937,20 @@
			_this.order.orderNo = order.orderNo;
			//结算打印提示
			if (submitType == 1) {
			_this.$confirm('结算成功，是否立刻打印小票?', '提示', {
			confirmButtonText: '打印',
			cancelButtonText: '取消',
			type: 'warning'
			}).then(() => {
			if (_this.printPaper) {
			_this.print();

			}).catch(() => {
			_this.closeFram();
			});
			}
			_this.closeFram();
			// _this.$confirm('结算成功，是否立刻打印小票?', '提示', {
			// confirmButtonText: '打印',
			// cancelButtonText: '取消',
			// type: 'warning'
			// }).then(() => {
			// _this.print();
			//
			// }).catch(() => {
			// _this.closeFram();
			// });
			} else {
			_this.$message.success(data.info);
			}
			@@ -969,7 +973,7 @@
			*/
			checkAchieve() {
			/*
			//TODO 前端展示不检测，因为考虑到会员卡支付问题
			//TODO 前端展示不检测，因为考虑到储值卡支付问题
			let _this = this;
			for (let i = 0; i < _this.order.items.length; i++) {
			if (_this.achieveList.length > 0) {
			@@ -1008,10 +1012,10 @@
			this.$message.warning("折扣单价填写不正确");
			return false;
			}
			if (!(MTools.isRealNum(item.payMoney) && item.payMoney >= 0)) {
			this.$message.warning("实付金额填写不正确");
			return false;
			}
			// if (!(MTools.isRealNum(item.payMoney) && item.payMoney >= 0)) {
			// this.$message.warning("实付金额填写不正确");
			// return false;
			// }
			})
			} else {
			this.$message.warning("请选择要购买的产品");
			@@ -1051,6 +1055,9 @@
			}
			});
			this.achieveList = achieveListNew;
			this.order.zkTotal = 0;
			this.order.total = 0;
			this.order.payMoney = 0;
			this.calculationTotal();
			},

			@@ -1155,7 +1162,7 @@
			payMethodSelect(item, index) {
			let _this = this;
			let payMoneys = _this.payMoneys;
			if (item.type != 6) {
			if (item.type != '储值卡') {
			this.$nextTick(function () {
			if (item.isActive) {
			Vue.set(item,'isActive',false);
			@@ -1207,13 +1214,13 @@
			if (node.isGift) {
			item.value = node.cardName;
			item.balance = node.giftMoney;
			item.isGift = 1;
			item.isGift = 'Y';
			} else {
			item.value = node.cardName;
			item.balance = node.realMoney;
			item.isGift = 0;
			item.isGift = 'N';
			}
			item.type = '会员卡';
			item.type = '储值卡';
			item.id = node.id;
			item.uuid = clickNode.uuid;
			_this.payMoneys.push(item);
			@@ -1224,7 +1231,14 @@
			_this.payMoneys.splice(index, 1);
			}
			},
			submitPay() {
			openPayMoney() {
			let _this = this;
			if (!_this.order.items.length > 0) {
			this.$message.warning("请选择要购买的产品");
			return false;
			}

			_this.dialogSettleVisible = true;
			}
			}