~jiangyouyao/beauty-erp.git

			@@ -142,9 +142,9 @@
			<el-row>
			<el-button size="mini" type="primary" @click="openPayMoneyDialog" v-if="isRefund">提交退款</el-button>
			<el-button size="mini" type="danger" @click="isRefund = false" v-if="isRefund">取消</el-button>
			<el-button size="mini" type="primary" @click="isRefund = true" v-else>退款</el-button>
			<el-button size="mini" type="primary" @click="isRefund = true" v-if="order.statu == '已付款' && !isRefund">退款</el-button>
			</el-row>
			<el-row v-if="!isRefund">
			<el-row v-show="!isRefund">
			<el-table
			:data="orderItems"
			style="width: 100%">
			@@ -182,7 +182,7 @@
			</el-table-column>
			</el-table>
			</el-row>
			<el-row v-if="isRefund">
			<el-row v-show="isRefund">
			<el-table
			:data="orderItems"
			style="width: 100%">
			@@ -214,12 +214,17 @@
			</el-table-column>
			<el-table-column label="退款单价">
			<template slot-scope="scope">
			<el-input v-model="scope.row.refundPrice"></el-input>
			<el-input v-model="scope.row.refundPrice" v-if="scope.row.count > 0"></el-input>
			</template>
			</el-table-column>
			<el-table-column label="退款数量">
			<template slot-scope="scope">
			<el-input v-model.number="scope.row.refundCount"></el-input>
			<el-input v-model.number="scope.row.refundCount" v-if="scope.row.count > 0"></el-input>
			</template>
			</el-table-column>
			<el-table-column label="是否退库存" align="center">
			<template slot-scope="scope">
			<el-checkbox v-model="scope.row.returnStore" v-if="scope.row.type == '家居产品' && scope.row.count > 0"></el-checkbox>
			</template>
			</el-table-column>
			</el-table>
			@@ -262,12 +267,12 @@
			</el-table-column>
			<el-table-column label="业绩">
			<template slot-scope="scope">
			<el-input v-model="scope.row.returnAchieve"></el-input>
			<el-input v-model="scope.row.returnAchieve" v-if="scope.row.zkTotal != 0"></el-input>
			</template>
			</el-table-column>
			<el-table-column label="提成">
			<template slot-scope="scope">
			<el-input v-model="scope.row.returnCommission"></el-input>
			<el-input v-model="scope.row.returnCommission" v-if="scope.row.zkTotal != 0"></el-input>
			</template>
			</el-table-column>
			<el-table-column
			@@ -279,7 +284,7 @@
			</el-tab-pane>
			<el-tab-pane label="业绩设置" name="second">
			<el-row>
			<el-button size="mini" type="primary" @click="saveAchieve">保存</el-button>
			<el-button size="mini" type="primary" @click="saveAchieve" v-if="order.statu == '已付款'">保存</el-button>
			</el-row>
			<el-table
			:data="achieveItems"
			@@ -467,6 +472,7 @@
			var app = new Vue({
			el : "#app",
			data : {
			orderParam : "",
			vipInfo : "",
			order : "",
			activeName : "first",
			@@ -522,26 +528,43 @@
			treeSelect : [],
			payMoneys : [],
			printPaper : true,
			refundMoney : "",
			refundMoney : 0,
			data : {},

			},
			created : function() {
			let _this = this;
			this.vipInfo = /[[${vipInfo}]]/
			this.order = /[[${order}]]/
			this.orderItems = /[[${orderItems}]]/
			this.payMethodItems = /[[${payMethods}]]/
			this.achieveItems = /[[${achieveList}]]/
			this.flowItems = this.order.flows;
			this.orderParam = /[[${orderParam}]]/
			this.queryOrderDetailData(this.orderParam);

			this.checkAchieveIsDel(this.achieveItems);
			this.order.orderTime = moment(this.order.orderTime).format("YYYY-MM-DD HH:mm");
			},
			methods : {
			queryOrderDetailData(param) {
			let _this = this;
			AjaxProxy.requst({
			app: _this,
			data: {id: param, orderNo:param},
			contentType: 'application/x-www-form-urlencoded',
			url: basePath + '/admin/order/findOrderDetailByIdOrNo',
			callback: function (data) {
			console.log(data);
			var mapInfo = data.mapInfo;
			_this.vipInfo = mapInfo.vipInfo;
			_this.order = mapInfo.order;
			_this.orderItems = mapInfo.orderItems;
			_this.payMethodItems = mapInfo.payMethodItems;
			_this.achieveItems = mapInfo.achieveList;

			_this.flowItems = _this.order.flows;

			_this.checkAchieveIsDel(_this.achieveItems);
			_this.order.orderTime = moment(_this.order.orderTime).format("YYYY-MM-DD HH:mm");

			var arrears = 0;
			var refund = 0;
			var repay = 0;
			for(var i = 0; i < this.flowItems.length; i++) {
			var item = this.flowItems[i];
			for(var i = 0; i < _this.flowItems.length; i++) {
			var item = _this.flowItems[i];
			if (item.payMethod === '欠款') {
			arrears += item.amount;
			}
			@@ -554,9 +577,9 @@
			refund += item.amount;
			}
			}
			this.order.arrears = arrears;
			this.order.refund = refund;
			this.order.repay = repay;
			_this.order.arrears = arrears;
			_this.order.refund = refund;
			_this.order.repay = repay;

			//获取用户列表
			AjaxProxy.requst({
			@@ -567,18 +590,105 @@
			}
			});
			_this.getVipMoneyCards();
			}
			});
			},
			confirmSubmit() {
			let _this = this;
			_this.data.oldOrderId = _this.order.id;
			_this.data.vipId = _this.vipInfo.id;

			if(!_this.payMethodFlow()) {
			return;
			}

			let orderItems = _this.orderItems;
			let dataItems = [];
			for(var i = 0; i < orderItems.length; i++) {
			let item = orderItems[i];
			if (item.refundPrice && item.refundCount) {
			let achieveList = []
			if (_this.isReturnAchieve) {
			for(var j = 0; j < _this.achieveItems.length; j++) {
			let achieveItem = _this.achieveItems[j];
			if (achieveItem.returnAchieve \|\| achieveItem.returnCommission) {
			achieveItem.t1 = achieveItem.returnAchieve ? achieveItem.returnAchieve : 0;
			achieveItem.projPercentage = achieveItem.returnCommission ? achieveItem.returnCommission : 0;
			achieveList.push(achieveItem);
			}
			}

			item.achaeveList = achieveList;
			}
			if (item.returnStore) {
			item.isReturnStore = 'Y';
			} else {
			item.isReturnStore = 'N';
			}

			item.preCount = item.count;
			item.count = item.refundCount;
			item.zkPrice = item.refundPrice;
			item.cashPay = 0;
			item.cardPay = 0;
			item.oldItemId = item.id;
			dataItems.push(item);
			}
			}

			_this.data.items = dataItems;
			AjaxProxy.requst({
			app: _this,
			data: _this.data,
			contentType: 'application/json',
			url: basePath + '/admin/order/refundOrder',
			callback: function (data) {
			_this.isRefund = false;
			_this.dialogSettleVisible = false;
			_this.queryOrderDetailData(_this.data.oldOrderId);
			}
			});

			},
			methods : {
			payMethodFlow() {
			let _this = this;
			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 = parseFloat(item.money);
			if (item.type == '储值卡'){
			flow.isGift = item.isGift;
			flow.cardId = item.id;
			}
			total += parseFloat(item.money);
			flows.push(flow)
			})
			if (total != _this.refundMoney) {
			this.$message.warning("输入付款总金额与应付金额不符");
			return false;
			}
			_this.data.flows = flows;
			return true;
			} else {
			this.$message.warning("请选择支付方式");
			return false;
			}
			},
			openPayMoneyDialog() {
			let _this = this;
			let items = this.orderItems;
			_this.refundMoney = 0;

			for(var i = 0; i < items.length; i++) {
			let item = items[i]
			if (item.refundPrice && item.refundCount) {
			_this.refundMoney += (item.refundPrice * item.refundCount);
			} else {
			if (!item.refundPrice > 0 && !item.refundCount > 0) {
			_this.$message.error("退款金额或退款数量须大于0");
			return;
			@@ -589,9 +699,13 @@
			return;
			}

			_this.$message.error("退款单价或退款数量不能为空");
			return;
			_this.refundMoney += parseFloat(item.refundPrice * item.refundCount);
			}
			}

			if (_this.refundMoney == 0) {
			_this.$message.error("请输入退款金额或退款数量");
			return;
			}
			_this.dialogSettleVisible = true;
			},
			@@ -704,9 +818,6 @@
			},
			closeFrame() {
			parent.layer.close(parent.layer.getFrameIndex(window.name));
			},
			confirmSubmit() {

			},
			saveAchieve() {
			let _this = this;