beauty-erp.git - Gitblit

			@@ -55,12 +55,20 @@
			</div>
			<div class="form-group mr-20">
			<label for="staus">状态</label>
			<select class="form-control autoFull" name="staus" nullmsg="状态不能为空" dataType="*" id="staus"
			<select class="form-control " name="staus" nullmsg="状态不能为空" dataType="*" id="staus">
			<option value=''>全部</option>
			<option value='上架' selected ="selected ">上架</option>
			<option value=''>下架</option>
			</select>
			</div>
			<div class="form-group mr-20">
			<label for="staus">业绩规则</label>
			<select class="form-control autoFull" name="achieveRuleId"
			data-filed="name"
			data-value="name"
			th:data-url="@{/admin/dataDictionary/showDataDictionary}"
			data-param="{type:'项目状态'}">
			<option value=''>请选择项目状态</option>
			data-value="id"
			th:data-url="@{/admin/achieveRule/selectListForm}"
			data-param="{pageNum:1,pageSize:1000}">
			<option value=''>请选择业绩规则</option>
			</select>
			</div>

			@@ -101,16 +109,17 @@
			<tr>
			<th data-checkbox="true"></th>
			<th data-formatter="MGrid.indexfn" data-align="center" data-width="30px">序号</th>
			<th data-field="code">商品编号</th>
			<th data-field="name">商品名称</th>
			<th data-field="sealPice">售价/(本金)</th>
			<th data-field="code" data-sortable="true">商品编号</th>
			<th data-field="name" data-sortable="true">商品名称</th>
			<th data-field="sealPice" data-sortable="true">售价/(本金)</th>
			<th data-field="giftMoney">赠送金额</th>
			<th data-field="realSealCount">真实销量</th>
			<th data-field="staus">状态</th>
			<th data-field="realSealCount" data-sortable="true">真实销量</th>
			<th data-field="staus" data-sortable="true">状态</th>
			<th data-field="isPresent">是否赠送</th>
			<th data-field="goodType">类型</th>
			<th data-field="cateName">分类</th>
			<th data-field="createTime" data-formatter="MGrid.getTime">创建时间</th>
			<th data-field="goodType" data-sortable="true">类型</th>
			<th data-field="cateName" >分类</th>
			<th data-field="achieveRuleName" >业绩规则</th>
			<th data-field="createTime" data-sortable="true" data-formatter="MGrid.getTime">创建时间</th>
			</tr>
			</thead>
			</table>