beauty-erp.git - Gitblit

			@@ -247,51 +247,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 +313,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 +328,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 +413,35 @@
			</el-row>
			</el-drawer>

			<el-dialog title="收款" :visible.sync="dialogSettleVisible">
			<el-row>
			<el-col :span="5">应收</el-col>
			<el-col :span="15"><span style="color: red;">¥ 80</span></el-col>
			</el-row>

			<el-row>
			<el-col :span="5">收款方式</el-col>
			<el-col :span="15"></el-col>
			</el-row>

			<el-row>
			<el-col :span="5">支付金额</el-col>
			<el-col :span="15">
			<el-row>
			<el-col :span="5">微信支付</el-col>
			<el-col :span="5"><el-input></el-input></el-col>
			</el-row>
			<el-row>
			<el-col :span="5">微信支付</el-col>
			<el-col :span="5"><el-input></el-input></el-col>
			</el-row>
			<el-row>
			<el-col :span="5">微信支付</el-col>
			<el-col :span="5"><el-input></el-input></el-col>
			</el-row>
			</el-col>
			</el-row>
			</el-dialog>

			</div>
			</body>
			@@ -495,6 +526,7 @@
			loading: false,
			/****搜索表格数据END******/

			dialogSettleVisible : false,

			},