~jiangyouyao/beauty-erp.git

			@@ -35,10 +35,18 @@
			<input autocomplete="off" id="search-text" name="title" placeholder="输入查询关键词"
			type="text" class="form-control">
			</div>

			<div class="form-group">
			<label class="control-label">积分抵扣</label>
			<select style="width:100px;" class="form-control select2" size="1"
			name="ableScorePay" >
			<option value="">请选择</option>
			<option value="1">可抵扣</option>
			<option value="2">不可抵扣</option>
			</select>
			</div>
			<div class="form-group">
			<label class="control-label">是否上架</label>
			<select style="width:200px;" class="form-control select2" size="1"
			<select style="width:100px;" class="form-control select2" size="1"
			name="status"
			id="status">
			<option value="">请选择</option>
			@@ -47,10 +55,10 @@
			</select>
			</div>
			<div class="form-group">
			<label class="control-label">是否为服务</label>
			<select style="width:200px;" class="form-control select2" size="1"
			name="isService"
			id="isService">
			<label class="control-label">是否可分销</label>
			<select style="width:100px;" class="form-control select2" size="1"
			name="ableSales"
			id="ableSales">
			<option value="">请选择</option>
			<option value="1">是</option>
			<option value="2">否</option>
			@@ -114,12 +122,13 @@
			<tr>
			<th data-checkbox="true"></th>
			<th data-formatter="MGrid.indexfn" data-align="center">序号</th>
			<th data-field="id" data-align="center">产品ID</th>
			<th data-field="id" data-align="center" >ID</th>
			<th data-field="ableScorePay" data-align="center" data-formatter="ableScorePay">积分抵扣</th>
			<th data-field="title" data-align="center">产品名称</th>
			<th data-field="imgMobile" data-align="center" data-formatter="MGrid.getImage">产品图片</th>
			<th data-field="attrValues" data-align="center" data-formatter="formatAttr">产品属性</th>
			<th data-field="price" data-align="center">价格</th>
			<th data-field="score" data-align="center">积分</th>
			<th data-field="scorePrice" data-align="center">兑换所需积分</th>
			<th data-field="status" data-align="center" data-formatter="isStatus">是否上架</th>
			<th data-field="rsVolume" data-align="center">真实销量</th>

			@@ -275,7 +284,7 @@
			//初始化属性下拉选
			function initAttrsSeclect(seler, def) {
			console.log(1);
			$.AjaxProxy().invoke(basePath + "/admin/shopProductAttribute/showSonAttribute?attrCode=cpfl",
			$.AjaxProxy().invoke(basePath + "/admin/shopProductAttribute/showSonAttribute?attrCode=productColumn",
			function (loj) {
			$(seler).createSelectTree(
			loj.attr("result").rows,
			@@ -290,6 +299,16 @@
			});
			}

			function ableScorePay(value, row, index) {
			var html = "";
			if (value ==1) {
			html="可抵扣"
			}else{
			html="不可抵扣"
			}
			return html;
			}

			/**
			* 格式化属性
			*/