From c4dfb5bb045d651f2d30d0982a238ef192cde115 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Fri, 26 Mar 2021 11:05:00 +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=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/record/record.html     | 71 +++++++++++--------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/sino-activity/src/main/resources/templates/activity/record/record.html b/sino-activity/src/main/resources/templates/activity/record/record.html
index 82151272f..4d3f1adbb 100644
--- a/sino-activity/src/main/resources/templates/activity/record/record.html
+++ b/sino-activity/src/main/resources/templates/activity/record/record.html
@@ -15,17 +15,17 @@
                                 <input type="text" name="DRAWTRANSEQNO"/>
                             </li>
                             <li>
-                                <label>抽奖活动代码：</label>
+                                <label>活动代码：</label>
                                 <input type="text" name="DRAWCODE"/>
                             </li>
-                            <li>
-                                <label>用户标识：</label>
-                                <input type="text" name="USERID"/>
-                            </li>
-                            <li>
-                                <label>抽奖时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择抽奖时间" name="DRAWTIME"/>
-                            </li>
+<!--                            <li>-->
+<!--                                <label>用户标识：</label>-->
+<!--                                <input type="text" name="USERID"/>-->
+<!--                            </li>-->
+<!--                            <li>-->
+<!--                                <label>抽奖时间：</label>-->
+<!--                                <input type="text" class="time-input" placeholder="请选择抽奖时间" name="DRAWTIME"/>-->
+<!--                            </li>-->
                             <li>
                                 <label>抽奖结果：</label>
                                 <input type="text" name="DRAWRESULT"/>
@@ -36,15 +36,15 @@
                             </li>
                             <li>
                                 <label>奖品类型：</label>
-                                <select name="PRIZETYPE">
+                                <select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}">
                                     <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" class="time-input" placeholder="请选择账务日期" name="CHECKINGDATE"/>
-                            </li>
+<!--                            <li>-->
+<!--                                <label>账务日期：</label>-->
+<!--                                <input type="text" class="time-input" placeholder="请选择账务日期" name="CHECKINGDATE"/>-->
+<!--                            </li>-->
 <!--                            <li>-->
 <!--                                <label>创建时间：</label>-->
 <!--                                <input type="text" class="time-input" placeholder="请选择创建时间" name="CREATETIMESTAMP"/>-->
@@ -53,26 +53,29 @@
 <!--                                <label>最后修改时间：</label>-->
 <!--                                <input type="text" class="time-input" placeholder="请选择最后修改时间" name="LASTUPDATETIMESTAMP"/>-->
 <!--                            </li>-->
-                            <li>
-                                <label>渠道：</label>
-                                <input type="text" name="CHANNEL"/>
-                            </li>
+<!--                            <li>-->
+<!--                                <label>渠道：</label>-->
+<!--                                <input type="text" name="CHANNEL"/>-->
+<!--                            </li>-->
                             <li>
                                 <label>用户名：</label>
                                 <input type="text" name="USERNAME"/>
                             </li>
                             <li>
                                 <label>奖品等级：</label>
-                                <input type="text" name="PRIZELEVEL"/>
-                            </li>
-                            <li>
-                                <label>奖品项目编码：</label>
-                                <input type="text" name="PROJECTCODE"/>
-                            </li>
-                            <li>
-                                <label>请求来源：</label>
-                                <input type="text" name="SOURCE"/>
+                                <select name="PRIZELEVEL" th:with="type=${@dict.getType('prizeLevel')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
                             </li>
+<!--                            <li>-->
+<!--                                <label>奖品项目编码：</label>-->
+<!--                                <input type="text" name="PROJECTCODE"/>-->
+<!--                            </li>-->
+<!--                            <li>-->
+<!--                                <label>请求来源：</label>-->
+<!--                                <input type="text" name="SOURCE"/>-->
+<!--                            </li>-->
                             <li>
                                 <label>手机号：</label>
                                 <input type="text" name="PHONE"/>
@@ -110,6 +113,8 @@
         var editFlag = [[${@permission.hasPermi('activity:record:edit')}]];
         var removeFlag = [[${@permission.hasPermi('activity:record:remove')}]];
         var prefix = ctx + "activity/record";
+        var datas = [[${@dict.getType('prizeLevel')}]];
+        var prizetypes = [[${@dict.getType('prizeType')}]];
 
         $(function() {
             var options = {
@@ -153,7 +158,10 @@
                 },
                 {
                     field: 'prizetype',
-                    title: '奖品类型'
+                    title: '奖品类型',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(prizetypes, value);
+                    }
                 },
                 {
                     field: 'CHECKINGDATE',
@@ -177,7 +185,10 @@
                 },
                 {
                     field: 'prizelevel',
-                    title: '奖品等级'
+                    title: '奖品等级',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(datas, value);
+                    }
                 },
                 {
                     field: 'projectcode',