~jiangyouyao/beauty-erp.git

			@@ -83,6 +83,19 @@
			</el-form-item>
			</el-col>

			<el-col :offset="2" :span="10" v-if="form.goodType!='家居产品'">
			<el-form-item label="业绩规则" prop="achieveRuleId">
			<el-select v-model="form.achieveRuleId" filterable placeholder="请选择业绩规则">
			<el-option
			v-for="item in achieveRulsList"
			:key="item.id"
			:label="item.name"
			:value="item.id">
			</el-option>
			</el-select>
			</el-form-item>
			</el-col>


			</el-row>
			<el-row>
			@@ -209,8 +222,8 @@
			<el-col :span="10">
			<el-form-item label="充值卡使用范围" label-width="150px" prop="isCourse">
			<el-radio-group v-model="form.carIsAll">
			<el-radio label="是">所有产品</el-radio>
			<el-radio label="否">部分产品（设置部分产品则充值卡内的金额只能消费指定范围的产品）</el-radio>
			<el-radio label="是" value="是">所有产品</el-radio>
			<el-radio label="否" value="是">部分产品（设置部分产品则充值卡内的金额只能消费指定范围的产品）</el-radio>
			</el-radio-group>
			</el-form-item>
			</el-col>
			@@ -1097,7 +1110,8 @@
			loading_zhk: false,
			/****综合卡表格数据END******/


			//提成规则
			achieveRulsList:[],

			//默认充值卡选中项
			defaultCates: [],
			@@ -1145,6 +1159,8 @@
			useDateNum : '',
			buyDateNum : '',
			payMethods : '',
			achieveRuleId:'',

			},
			submitUrl: '/admin/shoppinggoods/addShoppingGoods',
			modifySubmitUrl: '/admin/shoppinggoods/modifyShoppingGoods',
			@@ -1153,14 +1169,7 @@
			name: [{required: true, message: '请输入商品名称', trigger: 'blur'}],
			code: [{required: true, message: '请输入商品编码', trigger: 'blur'}],
			cateId: [{required: true, message: '请选择商品分类', trigger: 'blur'}],
			goodsSortId: [{required: true, message: '请选择库存分类', trigger: 'blur'}],
			unit: [{required: true, message: '请填写规格', trigger: 'change'}],
			volume: [{required: true, message: '请填写容量', trigger: 'blur'}],
			measure: [{required: true, message: '请填写单位', trigger: 'change'}],
			isCourse: [{required: true, message: '请选择套餐类型', trigger: 'change'}],
			sealPice: [{required: true, message: '请填写售价', trigger: 'blur'}],
			timeLength: [{required: true, message: '请填写服务时长', trigger: 'blur'}],
			isNum : [{ type : 'number', message: '请输入数字', trigger: 'blur' }],
			},

			},
			@@ -1174,6 +1183,7 @@
			this.getGoodstype();
			this.getDictionary();
			this.getShopInfo();
			this.getAchieveRule();
			if(goodType=='家居产品'){
			this.getSupplierList();
			}
			@@ -1192,6 +1202,21 @@
			},

			methods: {

			/**
			* 获取规则
			*/
			getAchieveRule(){
			let _this = this;
			AjaxProxy.requst({
			app: _this,
			data: {pageNum:1,pageSize:1000},
			url: basePath + "/admin/achieveRule/selectList",
			callback: function (data) {
			_this.achieveRulsList=data.rows;
			}
			});
			},

			/**
			* 商品分类树形组件格式化
			@@ -1564,7 +1589,7 @@
			if (this.validFormData()) {

			this.$refs[formName].validate((valid) => {

			console.log(valid);
			if (valid) {