~jiangyouyao/beauty-erp.git

			@@ -108,7 +108,8 @@
			</el-col>
			<el-col :span="14" style="text-align: right;">
			<label>¥ {{order.total}}</label>
			<label>¥ {{(order.zkTotal - order.total).toFixed(2)}}</label>
			<!-- 退款订单不能显示为负数 -->
			<label>¥ {{(order.zkTotal - order.total>0?order.zkTotal - order.total:0).toFixed(2)}}</label>
			<label>¥ {{order.zkTotal}}</label>
			<label>¥ {{order.arrears}}</label>
			<label>¥ {{order.repay}}</label>
			@@ -313,9 +314,22 @@
			prop="zkTotal"
			label="收款">
			</el-table-column>

			<el-table-column
			prop="payMethod"
			label="支付方式">
			label="支付方式"
			width="130">
			<template slot-scope="scope">
			<el-select v-model="scope.row.payMethod"
			placeholder="请选择支付方式">
			<el-option
			v-for="item in itemSimplePayMethods"
			:key="item.value"
			:label="item.label"
			:value="item.value"
			:disabled="item.disabled">
			</el-option>
			</el-select>
			</template>
			</el-table-column>
			<el-table-column
			prop="t3"
			@@ -500,6 +514,13 @@
			isRefund : false,
			isReturnAchieve : false,
			totalRefund : "",
			itemSimplePayMethods:[{
			value: '现金',
			label:'现金',
			},{
			value: '划扣',
			label:'划扣',
			}],
			payMethods: [{
			value: '现金支付',
			img: '/images/pay/cash.png',
			@@ -548,7 +569,16 @@
			created : function() {
			let _this = this;
			this.orderParam = /[[${orderParam}]]/
			this.queryOrderDetailData(this.orderParam);
			var orderId = /[[${orderId}]]/
			var orderNo = /[[${orderNo}]]/

			var param = {};
			if(orderId) {
			param.id = orderId;
			} else {
			param.orderNo = orderNo;
			}
			this.queryOrderDetailData(param);
			// 业绩类型
			AjaxProxy.requst({
			app: _this,
			@@ -574,7 +604,7 @@
			let _this = this;
			AjaxProxy.requst({
			app: _this,
			data: {id: param, orderNo:param},
			data: param,
			contentType: 'application/x-www-form-urlencoded',
			url: basePath + '/admin/order/findOrderDetailByIdOrNo',
			callback: function (data) {
			@@ -668,6 +698,10 @@
			}

			_this.data.items = dataItems;
			_this.data.zkTotal = _this.refundMoney;
			_this.data.total = _this.total;


			AjaxProxy.requst({
			app: _this,
			data: _this.data,
			@@ -676,7 +710,9 @@
			callback: function (data) {
			_this.isRefund = false;
			_this.dialogSettleVisible = false;
			_this.queryOrderDetailData(_this.data.oldOrderId);
			var param = {};
			param.id = _this.data.oldOrderId;
			_this.queryOrderDetailData(param);
			}
			});

			@@ -721,6 +757,7 @@
			let _this = this;
			let items = this.orderItems;
			_this.refundMoney = 0;
			_this.total = 0;

			for(var i = 0; i < items.length; i++) {
			let item = items[i]
			@@ -736,6 +773,8 @@
			}

			_this.refundMoney += parseFloat(item.refundPrice * item.refundCount);
			//记录一下未优惠之前的价格
			_this.total += parseFloat(item.price * item.refundCount);
			}
			}

			@@ -746,7 +785,7 @@
			_this.dialogSettleVisible = true;
			},
			calOrderTotalFormatter(row, column) {
			return row.count * row.price;
			return row.count * row.zkPrice;
			},
			getVipMoneyCards() {
			let _this = this;