From f4d45fc43d6428176fd9b1bddf83680efcd0a7d6 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Fri, 26 Mar 2021 11:13:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=AC=A1=E6=95=B0=E8=AE=B0=E5=BD=95=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

---
 .../DrawTaskNotify/DrawTaskNotify.html        | 65 ++++++++++---------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html
index d6653103c..46a7cf3c1 100644
--- a/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html
+++ b/sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html
@@ -19,44 +19,47 @@
                                 <input type="text" name="TASKID"/>
                             </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="ADDNUMBER"/>
-                            </li>
+<!--                            <li>-->
+<!--                                <label>赠送次数：</label>-->
+<!--                                <input type="text" name="ADDNUMBER"/>-->
+<!--                            </li>-->
                             <li>
                                 <label>状态：</label>
-                                <input type="text" name="STATE"/>
-                            </li>
-                            <li>
-                                <label>可用次数：</label>
-                                <input type="text" name="AVAILABLENUMBER"/>
+                                <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>-->
+<!--                                <label>可用次数：</label>-->
+<!--                                <input type="text" name="AVAILABLENUMBER"/>-->
+<!--                            </li>-->
                             <li>
                                 <label>手机号：</label>
                                 <input type="text" name="PHONE"/>
                             </li>
-                            <li>
-                                <label>身份认证状态：</label>
-                                <input type="text" name="VSTATE"/>
-                            </li>
+<!--                            <li>-->
+<!--                                <label>身份认证状态：</label>-->
+<!--                                <input type="text" name="VSTATE"/>-->
+<!--                            </li>-->
                             <li>
                                 <label>用户等级：</label>
                                 <input type="text" name="ULEVEL"/>
                             </li>
-                            <li>
-                                <label>请求来源：</label>
-                                <input type="text" name="SOURCE"/>
-                            </li>
-                            <li>
-                                <label>是否白名单：</label>
-                                <input type="text" name="ISSPECIALFLAG"/>
-                            </li>
+<!--                            <li>-->
+<!--                                <label>请求来源：</label>-->
+<!--                                <input type="text" name="SOURCE"/>-->
+<!--                            </li>-->
+<!--                            <li>-->
+<!--                                <label>是否白名单：</label>-->
+<!--                                <input type="text" name="ISSPECIALFLAG"/>-->
+<!--                            </li>-->
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -91,6 +94,7 @@
         var removeFlag = [[${@permission.hasPermi('activity:DrawTaskNotify:remove')}]];
         var STATEDatas = [[${@dict.getType('status')}]];
         var prefix = ctx + "activity/DrawTaskNotify";
+        var drawTypes = [[${@dict.getType('drawType')}]];
 
         $(function() {
             var options = {
@@ -103,10 +107,10 @@
                 columns: [{
                     checkbox: true
                 },
-                {
-                    field: 'tasknotifyid',
-                    title: '业务主键'
-                },
+                // {
+                //     field: 'tasknotifyid',
+                //     title: '业务主键'
+                // },
                 {
                     field: 'drawcode',
                     title: '活动代码'
@@ -122,7 +126,10 @@
                 },
                 {
                     field: 'type',
-                    title: '赠送次数类型'
+                    title: '赠送次数类型',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(drawTypes, value);
+                    }
                 },
                 {
                     field: 'addnumber',