From 68defbe491894e01c4402922de33c39633fca091 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Mar 2022 14:25:54 +0800
Subject: [PATCH] 系统名称

---
 zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html
index b2d8c30..3283eb6 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html
@@ -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>
 
@@ -110,6 +118,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>
@@ -136,7 +145,7 @@
         delUrl = basePath + "/admin/shoppinggoods/del";
 
         myGrid = MGrid.initGrid({
-            url: basePath + "/admin/shoppinggoods/showList",
+            url: basePath + "/admin/shoppinggoods/showAllList",
             delUrl: delUrl
         });
     });

--
Gitblit v1.9.1