From 0ca8dfadca896388ce3637bc9a97a3321fc2437e Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Fri, 26 Mar 2021 11:17:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E6=8A=BD?=
 =?UTF-8?q?=E5=A5=96=E6=AC=A1=E6=95=B0=E6=B6=88=E8=B4=B9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/consume/consume.html   | 55 +++++++++++--------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/sino-activity/src/main/resources/templates/activity/consume/consume.html b/sino-activity/src/main/resources/templates/activity/consume/consume.html
index 7be681b1c..352c7241e 100644
--- a/sino-activity/src/main/resources/templates/activity/consume/consume.html
+++ b/sino-activity/src/main/resources/templates/activity/consume/consume.html
@@ -18,32 +18,35 @@
                                 <label>任务流水：</label>
                                 <input type="text" name="TASKID"/>
                             </li>
+<!--                            <li>-->
+<!--                                <label>用户标识：</label>-->
+<!--                                <input type="text" name="USERID"/>-->
+<!--                            </li>-->
                             <li>
-                                <label>用户标识：</label>
-                                <input type="text" name="USERID"/>
-                            </li>
-                            <li>
-                                <label>赠送次数类型：</label>
-                                <select name="TYPE">
+                                <label>次数类型：</label>
+                                <select name="TYPE" th:with="type=${@dict.getType('drawType')}">
                                     <option value="">所有</option>
-                                    <option value="-1">代码生成请选择字典属性</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
-                            <li>
-                                <label>使用次数：</label>
-                                <input type="text" name="CONSUMENUMBER"/>
-                            </li>
-                            <li>
-                                <label>使用流水：</label>
-                                <input type="text" name="TRANSEQNO"/>
-                            </li>
-                            <li>
-                                <label>使用主键：</label>
-                                <input type="text" name="TRADEORDERID"/>
-                            </li>
+<!--                            <li>-->
+<!--                                <label>使用次数：</label>-->
+<!--                                <input type="text" name="CONSUMENUMBER"/>-->
+<!--                            </li>-->
+<!--                            <li>-->
+<!--                                <label>使用流水：</label>-->
+<!--                                <input type="text" name="TRANSEQNO"/>-->
+<!--                            </li>-->
+<!--                            <li>-->
+<!--                                <label>使用主键：</label>-->
+<!--                                <input type="text" name="TRADEORDERID"/>-->
+<!--                            </li>-->
                             <li>
                                 <label>状态：</label>
-                                <input type="text" name="STATE"/>
+                                <select name="STATE" th:with="type=${@dict.getType('status')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -78,6 +81,8 @@
         var editFlag = [[${@permission.hasPermi('activity:consume:edit')}]];
         var removeFlag = [[${@permission.hasPermi('activity:consume:remove')}]];
         var prefix = ctx + "activity/consume";
+        var drawTypes = [[${@dict.getType('drawType')}]];
+        var STATEDatas = [[${@dict.getType('status')}]];
 
         $(function() {
             var options = {
@@ -113,7 +118,10 @@
                 },
                 {
                     field: 'type',
-                    title: '赠送次数类型'
+                    title: '赠送次数类型',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(drawTypes, value);
+                    }
                 },
                 {
                     field: 'consumenumber',
@@ -129,7 +137,10 @@
                 },
                 {
                     field: 'state',
-                    title: '状态'
+                    title: '状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(STATEDatas, value);
+                    }
                 },
                 // {
                 //     field: 'createtimestamp',