记得上下班打卡 | git大法好,push需谨慎

Commit aa01fdfc authored by jiangxiulong's avatar jiangxiulong

搜索

parent 6e8b20b2
...@@ -17,14 +17,11 @@ ...@@ -17,14 +17,11 @@
</li> </li>
<li> <li>
<label>奖品类型:</label> <label>奖品类型:</label>
<select name="prizeType"> <select name="prizeType"
th:with="type=${@dict.getType('zhengzai_sweet_draw_prize_type')}">
<option value="">全部</option> <option value="">全部</option>
<option value="1">谢谢惠顾</option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
<option value="2">积分</option> th:value="${dict.dictValue}"></option>
<option value="3">代金券</option>
<option value="4">满减券</option>
<option value="5">优先购买券</option>
<option value="6">实物</option>
</select> </select>
</li> </li>
<li> <li>
...@@ -33,11 +30,11 @@ ...@@ -33,11 +30,11 @@
</li> </li>
<li> <li>
<label>发放状态:</label> <label>发放状态:</label>
<select name="receivingStatus" <select name="receivingStatus">
th:with="type=${@dict.getType('zhengzai_sweet_draw_receiving_status')}">
<option value="">全部</option> <option value="">全部</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" <option value="1">未发放</option>
th:value="${dict.dictValue}"></option> <option value="2">已发放</option>
<option value="3">无需发放</option>
</select> </select>
</li> </li>
<li> <li>
...@@ -66,7 +63,7 @@ ...@@ -66,7 +63,7 @@
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<script th:inline="javascript"> <script th:inline="javascript">
var receivingStatus = [[${@dict.getType('zhengzai_sweet_draw_receiving_status')}]]; var prizeType = [[${@dict.getType('zhengzai_sweet_draw_prize_type')}]];
var receivingStatusFlag = [[${@permission.hasPermi('sweet:IntegralActivityDraw:receivingStatus')}]]; var receivingStatusFlag = [[${@permission.hasPermi('sweet:IntegralActivityDraw:receivingStatus')}]];
...@@ -86,12 +83,7 @@ ...@@ -86,12 +83,7 @@
field: 'prizeType', field: 'prizeType',
title: '奖品类型', title: '奖品类型',
formatter: function (value, row) { formatter: function (value, row) {
var prizeType = row.prizeType; return $.table.selectDictLabel(prizeType, value);
switch (prizeType) {
case 1:
break;
}
return prizeType;
} }
}, },
{ {
...@@ -118,7 +110,19 @@ ...@@ -118,7 +110,19 @@
field: 'receivingStatus', field: 'receivingStatus',
title: '发放状态', title: '发放状态',
formatter: function (value, row) { formatter: function (value, row) {
return $.table.selectDictLabel(receivingStatus, value); var receivingStatus = row.receivingStatus;
switch (receivingStatus) {
case 1:
receivingStatus = "未发放";
break;
case 2:
receivingStatus = "已发放";
break;
case 2:
receivingStatus = "无需发放";
break;
}
return receivingStatus;
} }
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment