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

Commit aa01fdfc authored by jiangxiulong's avatar jiangxiulong

搜索

parent 6e8b20b2
......@@ -17,14 +17,11 @@
</li>
<li>
<label>奖品类型:</label>
<select name="prizeType">
<select name="prizeType"
th:with="type=${@dict.getType('zhengzai_sweet_draw_prize_type')}">
<option value="">全部</option>
<option value="1">谢谢惠顾</option>
<option value="2">积分</option>
<option value="3">代金券</option>
<option value="4">满减券</option>
<option value="5">优先购买券</option>
<option value="6">实物</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
......@@ -33,11 +30,11 @@
</li>
<li>
<label>发放状态:</label>
<select name="receivingStatus"
th:with="type=${@dict.getType('zhengzai_sweet_draw_receiving_status')}">
<select name="receivingStatus">
<option value="">全部</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
<option value="1">未发放</option>
<option value="2">已发放</option>
<option value="3">无需发放</option>
</select>
</li>
<li>
......@@ -66,7 +63,7 @@
</div>
<th:block th:include="include :: footer"/>
<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')}]];
......@@ -86,12 +83,7 @@
field: 'prizeType',
title: '奖品类型',
formatter: function (value, row) {
var prizeType = row.prizeType;
switch (prizeType) {
case 1:
break;
}
return prizeType;
return $.table.selectDictLabel(prizeType, value);
}
},
{
......@@ -118,7 +110,19 @@
field: 'receivingStatus',
title: '发放状态',
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