beauty-erp.git - Gitblit

			@@ -175,6 +175,15 @@
			</el-col>
			</el-row>
			<el-row class="vertical ">
			<el-select v-model="goodsType" placeholder="商品类型" style="width: 120px" >
			<el-option
			v-for="item in goodsTypeList"
			:key="item.value"
			:label="item.label"
			:value="item.value"
			>
			</el-option>
			</el-select>
			<el-input class="searchInput" @input="searchGoods()" v-model="queryKey"
			placeholder="搜索添加产品"></el-input>
			<el-button @click="searchGoods()" type="primary">搜索</el-button>
			@@ -582,7 +591,8 @@
			var app = new Vue({
			el: '#app',
			data: {

			goodsType:"",
			goodsTypeList:[{value:"",label:"全部"},{value:"套餐",label:"套餐"},{value:"项目",label:"项目"},{value:"充值卡",label:"充值卡"}],
			//业绩设置框
			drawer: false,
			direction: 'rtl',
			@@ -767,7 +777,7 @@
			commission : 0,
			achieveType : _this.achieveTypeList[0].value,
			isShare: false,
			payMethod:item.payMethod,
			payMethod:"现金",
			});
			});
			_this.order.payMoney = orderPayMoney;
			@@ -901,7 +911,7 @@
			this.achieveList.push({
			orderItem: item,
			staff: this.loginUser,
			saleId: this.loginUser.suId,
			saleId: _this.loginUser.suUserType === 'admin' ? '' : this.loginUser.suId,
			goodsCash: item.payMoney,
			achieveType : _this.achieveTypeList[0].value,
			commission: 0,
			@@ -999,9 +1009,14 @@

			if (this.checkSubmitOrder()) {
			let _this = this;
			//是否全部为储值卡支付
			let isCardPay=true;

			if(submitType == 1) {
			//校验支付方式



			if (_this.payMoneys.length > 0) {
			let flows = []
			var total = 0;
			@@ -1019,6 +1034,8 @@
			if (item.type == '储值卡'){
			flow.isGift = item.isGift;
			flow.cardId = item.id;
			}else{
			isCardPay=false;
			}
			total += parseFloat(item.money);
			flows.push(flow)
			@@ -1028,27 +1045,38 @@
			return false;
			}
			_this.order.flows = flows;




			} else {
			this.$message.warning("请选择支付方式");
			return false;
			}
			}
			console.log("isCardPay",isCardPay);

			//匹配业绩
			_this.order.items.forEach(item=>{
			item.achieveList = [];
			})
			_this.achieveList.forEach(achieve => {
			for (let i = 0; i < _this.order.items.length; i++) {
			let item = _this.order.items[i];
			if (!item.achieveList){
			item.achieveList = [];
			}
			if (item.uuid == achieve.orderItem.uuid) {

			let payMethod=achieve.payMethod;
			if(isCardPay){
			//如果是储值卡支付，则业绩自动切换到划扣金额
			payMethod="划扣";
			}
			let achieveNew = {
			uuid:item.uuid,
			beaultId: achieve.saleId,
			projPercentage: achieve.commission,
			achieveType: achieve.achieveType,
			goodsCash: achieve.goodsCash,
			payMethod: achieve.payMethod,
			payMethod: payMethod,
			};
			item.achieveList.push(achieveNew);
			break;
			@@ -1075,6 +1103,7 @@
			//结算打印提示
			if (submitType == 1) {
			if (_this.printPaper) {
			_this.$message.success(data.info);
			_this.print();
			} else {
			_this.$message.success({
			@@ -1154,9 +1183,9 @@
			*/
			chouseGoods() {
			let _this = this;
			// this.multipleSelection.forEach(item => {
			// _this.pushToSelectGoods(item, BUY_TYPE_NOT_FREE);
			// });
			_this.multipleSelection.forEach(item => {
			_this.pushToSelectGoods(item, BUY_TYPE_NOT_FREE);
			});
			this.closeXm();
			this.calculationTotal();
			},
			@@ -1201,7 +1230,7 @@
			app: _this,
			contentType: 'application/x-www-form-urlencoded',
			//TODO 优化下拉加载
			data: {name: _this.queryKey, limit: pageSize, offset : offset},
			data: {name: _this.queryKey,goodType:_this.goodsType , limit: pageSize, offset : offset},
			url: basePath + "/admin/shoppinggoods/showList",
			callback: function (data) {
			_this.searchTableData = data.rows;
			@@ -1332,7 +1361,7 @@
			title: "打印订单",
			area: ['250px', '550px'],
			maxmin: true,
			content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + this.order.id],
			content: [basePath + '/admin/order/printOrder?id=' + this.order.id],
			cancel: function (index, layero) {
			_this.closeFram();
			}