ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

活动管理-记录发奖列表修改

This commit is contained in:
dy 2021-03-31 14:14:11 +08:00
parent afa0db58c4
commit b9f674e4f8
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sino-activity/src/main/resources/templates/activity/DrawTaskNotify/DrawTaskNotify.html
View File

@ -23,10 +23,10 @@
<input type="text" name="TASKID"/> <input type="text" name="TASKID"/>
</li> </li>
<!-- <li>--> <li>
<!-- <label>可用次数：</label>--> <label>用户标识：</label>
<!-- <input type="text" name="AVAILABLENUMBER"/>--> <input type="text" name="USERID"/>
<!-- </li>--> </li>
<!-- <li>--> <!-- <li>-->
<!-- <label>手机号：</label>--> <!-- <label>手机号：</label>-->
<!-- <input type="text" name="PHONE"/>--> <!-- <input type="text" name="PHONE"/>-->

12
sino-activity/src/main/resources/templates/activity/awardRecord/record.html
View File

@ -40,7 +40,11 @@
<!-- </li>--> <!-- </li>-->
<li> <li>
<label>发奖结果：</label> <label>发奖结果：</label>
<input type="text" name="AWARDRESULT"/> <select name="AWARDRESULT" th:with="type=${@dict.getType('drawResult')}" style="width: 80px">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li> </li>
<!-- <li>--> <!-- <li>-->
<!-- <label>错误码：</label>--> <!-- <label>错误码：</label>-->
@ -143,6 +147,7 @@
var prefix = ctx + "activity/award/record"; var prefix = ctx + "activity/award/record";
var datas = [[${@dict.getType('prizeLevel')}]]; var datas = [[${@dict.getType('prizeLevel')}]];
var prizetypes = [[${@dict.getType('prizeType')}]]; var prizetypes = [[${@dict.getType('prizeType')}]];
var drawResults = [[${@dict.getType('drawResult')}]];
var drawInfoList = [[${@drawInfo.findDrawInfoList()}]]; var drawInfoList = [[${@drawInfo.findDrawInfoList()}]];
var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]]; var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]];
@ -193,7 +198,10 @@
}, },
{ {
field: 'awardresult', field: 'awardresult',
title: '发奖结果' title: '发奖结果',
formatter: function (value, row, index) {
return $.table.selectDictLabel(drawResults, value);
}
}, },
{ {
field: 'awardtime', field: 'awardtime',

12
sino-activity/src/main/resources/templates/activity/record/record.html
View File

@ -32,7 +32,11 @@
<!-- </li>--> <!-- </li>-->
<li> <li>
<label>抽奖结果：</label> <label>抽奖结果：</label>
<input type="text" name="DRAWRESULT"/> <select name="DRAWRESULT" th:with="type=${@dict.getType('drawResult')}" style="width: 80px">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li> </li>
<li> <li>
<label>奖品名称：</label> <label>奖品名称：</label>
@ -127,6 +131,7 @@
var prefix = ctx + "activity/record"; var prefix = ctx + "activity/record";
var datas = [[${@dict.getType('prizeLevel')}]]; var datas = [[${@dict.getType('prizeLevel')}]];
var prizetypes = [[${@dict.getType('prizeType')}]]; var prizetypes = [[${@dict.getType('prizeType')}]];
var drawResults = [[${@dict.getType('drawResult')}]];
var drawInfoList = [[${@drawInfo.findDrawInfoList()}]]; var drawInfoList = [[${@drawInfo.findDrawInfoList()}]];
var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]]; var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]];
@ -167,7 +172,10 @@
}, },
{ {
field: 'drawresult', field: 'drawresult',
title: '抽奖结果' title: '抽奖结果',
formatter: function (value, row, index) {
return $.table.selectDictLabel(drawResults, value);
}
}, },
{ {
field: 'prizecode', field: 'prizecode',