~jiangyouyao/beauty-erp.git

			@@ -19,7 +19,7 @@
			<div class="ibox-content" id="app" v-cloak>
			<el-form label-width="120px" >
			<el-row>
			<p class="el-big-title">分享设置</p>
			<p class="el-big-title">分销设置</p>
			</el-row>
			<el-row style="margin-top: 20px;">
			<el-col>
			@@ -118,7 +118,7 @@


			<el-drawer
			title="业绩设置"
			title="分销产品"
			:visible.sync="drawer"
			:direction="direction"
			size="90%"
			@@ -149,28 +149,32 @@
			width="50">
			</el-table-column>
			<el-table-column
			prop="code"
			label="产品编号"
			width="100">
			prop="id"
			label="ID">
			</el-table-column>

			<el-table-column
			prop="name"

			prop="title"
			label="产品名称">
			</el-table-column>

			<el-table-column
			prop="sealPice"
			label="售价">
			prop="price"
			label="价格">
			</el-table-column>
			<el-table-column
			prop="goodType"
			label="类型">
			prop="score"
			label="积分">
			</el-table-column>
			<el-table-column
			prop="cateName"
			label="分类">
			prop="attrValues"
			label="产品属性">
			</el-table-column>
			<el-table-column
			label="是否上架">
			<template slot-scope="scope">
			<span v-if="scope.row.status == 1">是</span>
			<span v-if="scope.row.status == 2">否</span>
			</template>
			</el-table-column>
			<el-table-column
			width="150"
			@@ -195,37 +199,36 @@
			:stripe="true"
			:border="true"
			:height="tableHeight"
			:data="order.items"
			:data="order"
			style="width: 100%">
			<el-table-column
			type="index"
			width="50">
			</el-table-column>
			<el-table-column
			prop="shoppingGoods.code"
			label="产品编号"
			width="100">
			prop="id"
			width="280"
			label="产品ID">
			</el-table-column>

			<el-table-column
			prop="shoppingGoods.name"
			prop="title"
			width="280"
			label="产品名称">
			</el-table-column>
			<el-table-column
			prop="shoppingGoods.goodType"
			prop="attrValues"
			width="80"
			label="产品类型">
			label="产品属性">
			</el-table-column>
			<el-table-column
			prop="shoppingGoods.sealPice"
			prop="price"
			label="单价">
			</el-table-column>
			<el-table-column
			prop="address"
			label="操作">
			<template slot-scope="scope">
			<el-button type="primary" v-if="order.statu!='欠款'"
			<el-button type="primary"
			size="mini"
			@click="removeItem(scope.$index, scope.row)">删除
			</el-button>
			@@ -265,10 +268,7 @@
			//业绩设置框
			drawer: false,
			direction: 'rtl',
			order: {
			items: [
			],
			},
			order: [],
			tableHeight: 500,
			/***搜索表格数据*******/
			//搜索关键词
			@@ -325,8 +325,7 @@
			}
			_this.shfs = data.mapInfo.shfs;
			_this.sqtj = data.mapInfo.sqtj;
			//_this.order.items = data.mapInfo.order;
			//console.log(_this.order.items);
			_this.order = data.mapInfo.order;
			}
			});
			},
			@@ -342,19 +341,19 @@

			//判断是否被选中
			let selected = false;
			this.order.items.forEach(item => {
			if (item.shoppingGoods.id == goods.id) {
			for(let i = 0; i < this.order.length; i++){
			if (this.order[i].id === goods.id) {
			selected = true;
			return;
			}
			});
			}
			if (!selected) {
			//未选中产品加入列表
			let item = {};
			item.shoppingGoods = goods;
			item.ShopProduct = goods;
			item.goodsId = goods.id;
			item.count = 1;
			this.order.items.push(item);
			this.order.push(item.ShopProduct);
			}

			},
			@@ -372,38 +371,33 @@
			submitOrder(submitType) {
			let _this = this;
			let submitDate ="";
			for (let i = 0; i < _this.order.items.length; i++) {
			let goods = _this.order.items[i];
			let goodsId = goods.goodsId;
			for (let i = 0; i < _this.order.length; i++) {
			let ShopProduct = _this.order[i];
			let goodsId = ShopProduct.id;
			submitDate = submitDate +goodsId+",";
			}
			_this.cpid = submitDate;
			_this.drawer = false
			_this.drawer = false;
			},
			/**
			* 批量选择产品
			*/
			chouseGoods() {
			let _this = this;
			// this.multipleSelection.forEach(item => {
			// _this.pushToSelectGoods(item, BUY_TYPE_NOT_FREE);
			// });
			this.closeXm();
			},
			/**
			* 行点击事件
			*/
			handleClickTableRow(row, event, column) {
			this.$refs.dataTable.toggleRowSelection(row);
			this.pushToSelectGoods(row);
			},
			/**
			* 删除组合产品
			*/
			removeItem(index, row) {
			this.order.items.splice(index, 1);
			this.order.splice(index, 1);
			},


			/**
			* 搜索项目绑定的产品信息
			*/
			@@ -417,7 +411,7 @@
			contentType: 'application/x-www-form-urlencoded',
			//TODO 优化下拉加载
			data: {name: _this.queryKey, limit: 10000},
			url: basePath + "/admin/shoppinggoods/showList",
			url: basePath + "/fenXiao/ruleSetting/selectProduct",
			callback: function (data) {
			_this.searchTableData = data.rows;
			_this.loading = false;