~jiangyouyao/beauty-erp.git

			@@ -75,6 +75,43 @@
			.arrears {
			color: #E6A23C;
			}

			.paymethod ul {
			padding: 0;
			margin: 0;
			height: 50px;
			}
			.paymethod ul li {
			padding: 10px;
			margin: 5px;
			list-style:none;
			float: left;
			display: block;
			cursor: pointer;
			position: relative;
			border: white 1px solid;
			}
			.paymethod ul li:hover {
			border: #409EFF 1px solid;
			}
			.paymethod .active {
			border: #409EFF 1px solid;
			}
			.paymethod .active::after {
			content: '';
			display: block;
			height: 0px;
			width: 0px;
			position: absolute;
			bottom: 0;
			right: 0;
			color:#fff;
			/*对号大小/
			font-size: 10px;
			line-height: 8px;
			border: 3px solid;
			border-color: transparent #4884ff #4884ff transparent;
			}
			</style>
			</head>
			<body>
			@@ -247,51 +284,51 @@
			</template>
			</el-table-column>
			<el-table-column
			label="应付">
			label="小计">
			<template slot-scope="scope">
			{{scope.row.zkPrice * scope.row.count }}
			</template>
			</el-table-column>

			<el-table-column
			label="实付">
			<template slot-scope="scope">
			<el-input @change="calculationTotal(1)" v-model="scope.row.payMoney"></el-input>
			</template>
			</el-table-column>
			<!-- <el-table-column-->
			<!-- label="实付">-->
			<!-- <template slot-scope="scope">-->
			<!-- <el-input @change="calculationTotal(1)" v-model="scope.row.payMoney"></el-input>-->
			<!-- </template>-->
			<!-- </el-table-column>-->

			<el-table-column
			label="支付方式"
			width="130">
			<template slot-scope="scope">
			<el-select @change="changePayMethod(scope.row)" v-model="scope.row.payMethod"
			placeholder="请选择支付方式">
			<el-option
			v-for="item in payMethods"
			:key="item.value"
			:label="item.label"
			:value="item.value"
			:disabled="item.disabled">
			</el-option>
			</el-select>
			</template>
			</el-table-column>
			<!-- <el-table-column-->
			<!-- label="支付方式"-->
			<!-- width="130">-->
			<!-- <template slot-scope="scope">-->
			<!-- <el-select @change="changePayMethod(scope.row)" v-model="scope.row.payMethod"-->
			<!-- placeholder="请选择支付方式">-->
			<!-- <el-option-->
			<!-- v-for="item in payMethods"-->
			<!-- :key="item.value"-->
			<!-- :label="item.label"-->
			<!-- :value="item.value"-->
			<!-- :disabled="item.disabled">-->
			<!-- </el-option>-->
			<!-- </el-select>-->
			<!-- </template>-->
			<!-- </el-table-column>-->


			<el-table-column
			label="会员卡">
			<template slot-scope="scope">
			<el-select :disabled="scope.row.payMethod!='会员卡'" v-model="scope.row.payMethodDetail"
			placeholder="请选择支付卡">
			<el-option
			v-for="item in moneyCards"
			:key="item.id"
			:label="item.showLable"
			:value="item.id">
			</el-option>
			</el-select>
			</template>
			</el-table-column>
			<!-- <el-table-column-->
			<!-- label="会员卡">-->
			<!-- <template slot-scope="scope">-->
			<!-- <el-select :disabled="scope.row.payMethod!='会员卡'" v-model="scope.row.payMethodDetail"-->
			<!-- placeholder="请选择支付卡">-->
			<!-- <el-option-->
			<!-- v-for="item in moneyCards"-->
			<!-- :key="item.id"-->
			<!-- :label="item.showLable"-->
			<!-- :value="item.id">-->
			<!-- </el-option>-->
			<!-- </el-select>-->
			<!-- </template>-->
			<!-- </el-table-column>-->
			<el-table-column
			prop="address"
			label="操作">
			@@ -313,8 +350,9 @@

			<li>订单总金额：{{order.total}}</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>
			<li>整单折扣：<span class="arrears">{{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>
			</div>
			<div class="money">
			@@ -327,7 +365,8 @@
			<el-button type="primary" @click="submitOrder(2)">挂单</el-button>
			<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="confirmSubmit()" class="bigbtn"> 结算</el-button>-->
			<el-button type="success" @click="dialogSettleVisible = true" class="bigbtn">收款</el-button>
			</el-col>
			</el-row>

			@@ -411,6 +450,50 @@
			</el-row>
			</el-drawer>

			<el-dialog title="收款" :visible.sync="dialogSettleVisible">
			<el-row type="flex" align="middle" style="padding: 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-row>

			<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-row>
			<ul>
			<li v-for="(item, index) in payMethods" :class="{active : item.isActive}">{{item.value}}</li>
			</ul>
			</el-row>
			</el-col>
			</el-row>

			<el-row type="flex" align="middle" style="padding: 10px 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>
			</el-col>
			</el-row>

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

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

			</div>
			</body>
			@@ -456,24 +539,27 @@
			currentVipInfo: {},
			vipLoading: false,
			payMethods: [{
			value: '现金',
			label: '现金'
			value: '现金支付',
			isActive: false
			}, {
			value: '微信',
			label: '微信'
			isActive: false
			}, {
			value: '支付宝',
			label: '支付宝'
			isActive: false
			}, {
			value: '银行卡',
			label: '银行卡'
			isActive: false
			}, {
			value: '美团',
			label: '美团'
			value: '团购',
			isActive: false
			}, {
			value: '会员卡',
			label: '会员卡',
			disabled: true,
			isActive: false,
			type: 1
			}, {
			value: '欠款',
			isActive: false
			},],
			achieveList: [],
			//会员可用的充值卡
			@@ -495,6 +581,7 @@
			loading: false,
			/****搜索表格数据END******/

			dialogSettleVisible : true,

			},

			@@ -776,13 +863,15 @@
			_this.achieveList.forEach(achieve => {
			for (let i = 0; i < _this.order.items.length; i++) {
			let item = _this.order.items[i];
			item.achieveList = [];
			if (!item.achaeveList){
			item.achaeveList = [];
			}
			if (item.uuid == achieve.orderItem.uuid) {
			let achieveNew = {
			beaultId: achieve.saleId,
			t1: achieve.achieveMoney
			};
			item.achieveList.push(achieveNew);
			item.achaeveList.push(achieveNew);
			break;
			}
			}
			@@ -818,7 +907,13 @@
			} else {
			_this.$message.success(data.info);
			}
			parent.myGrid.serchData();
			if(parent.myGrid) {
			parent.myGrid.serchData();
			}

			if (parent.app) {
			parent.app.orderQuery();
			}
			}
			});
			}
			@@ -976,7 +1071,7 @@
			callback: function (data) {
			_this.currentVipInfo = data.rows[0];
			_this.order.vipId = _this.currentVipInfo.id;
			_this.getVipMoneyCards();
			// _this.getVipMoneyCards();

			}
			});