From e23c8975e6bb0934cb5db46a94d0f83c9739d9ab Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Mar 2022 16:33:17 +0800
Subject: [PATCH] 重构:套餐项目

---
 zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 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 e3e4b38..8211c7b 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
@@ -54,12 +54,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>
 
@@ -105,16 +113,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="goodType" data-sortable="true">类型</th>
                 <th data-field="cateName">分类</th>
-                <th data-field="createTime" data-formatter="MGrid.getTime">创建时间</th>
+                <th data-field="achieveRuleName" >业绩规则</th>
+                <th data-field="createTime"  data-sortable="true" data-formatter="MGrid.getTime">创建时间</th>
             </tr>
             </thead>
         </table>

--
Gitblit v1.9.1