~jiangyouyao/beauty-erp.git

			@@ -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"
			@@ -202,30 +206,29 @@
			width="50">
			</el-table-column>
			<el-table-column
			prop="shoppingGoods.code"
			label="产品编号"
			width="100">
			prop="ShopProduct.id"
			width="280"
			label="产品ID">
			</el-table-column>

			<el-table-column
			prop="shoppingGoods.name"
			prop="ShopProduct.title"
			width="280"
			label="产品名称">
			</el-table-column>
			<el-table-column
			prop="shoppingGoods.goodType"
			prop="ShopProduct.attrValues"
			width="80"
			label="产品类型">
			label="产品属性">
			</el-table-column>
			<el-table-column
			prop="shoppingGoods.sealPice"
			prop="ShopProduct.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>
			@@ -343,7 +346,7 @@
			//判断是否被选中
			let selected = false;
			this.order.items.forEach(item => {
			if (item.shoppingGoods.id == goods.id) {
			if (item.ShopProduct.id == goods.id) {
			selected = true;
			return;
			}
			@@ -351,7 +354,7 @@
			if (!selected) {
			//未选中产品加入列表
			let item = {};
			item.shoppingGoods = goods;
			item.ShopProduct = goods;
			item.goodsId = goods.id;
			item.count = 1;
			this.order.items.push(item);
			@@ -374,11 +377,12 @@
			let submitDate ="";
			for (let i = 0; i < _this.order.items.length; i++) {
			let goods = _this.order.items[i];
			let goodsId = goods.goodsId;
			let goodsId = goods.id;
			submitDate = submitDate +goodsId+",";
			}
			alert(submitDate);
			_this.cpid = submitDate;
			_this.drawer = false
			_this.drawer = false;
			},
			/**
			* 批量选择产品
			@@ -394,7 +398,7 @@
			* 行点击事件
			*/
			handleClickTableRow(row, event, column) {
			this.$refs.dataTable.toggleRowSelection(row);
			this.pushToSelectGoods(row);
			},
			/**
			* 删除组合产品
			@@ -417,7 +421,8 @@
			contentType: 'application/x-www-form-urlencoded',
			//TODO 优化下拉加载
			data: {name: _this.queryKey, limit: 10000},
			url: basePath + "/admin/shoppinggoods/showList",
			//url: basePath + "/admin/shoppinggoods/showList",
			url: basePath + "/fenXiao/ruleSetting/selectProduct",
			callback: function (data) {
			_this.searchTableData = data.rows;
			_this.loading = false;