From 112ceac7d0d3c1565464638306bb488c951e471e Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Tue, 08 Jun 2021 20:35:12 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html index 8608af7..77b6bba 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html @@ -62,6 +62,16 @@ <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="id" + th:data-url="@{/admin/achieveRule/selectListForm}" + data-param="{pageNum:1,pageSize:1000}"> + <option value=''>请选择业绩规则</option> + </select> + </div> <div class="form-group mr-20"> <label for="isPresent">是否赠送</label> @@ -114,6 +124,7 @@ <th data-field="isPresent">是否赠送</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> -- Gitblit v1.9.1