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

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

This commit is contained in:
dy 2021-03-31 13:53:45 +08:00
parent cd5f52c1b5
commit afa0db58c4
7 changed files with 233 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sino-activity/src/main/resources/templates/activity/awardRecord/add.html
View File

@ -14,7 +14,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">奖品代码：</label> <label class="col-sm-3 control-label">奖品名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="PRIZECODE" class="form-control" type="text"> <input name="PRIZECODE" class="form-control" type="text">
</div> </div>

2
sino-activity/src/main/resources/templates/activity/awardRecord/edit.html
View File

@ -15,7 +15,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">奖品代码：</label> <label class="col-sm-3 control-label">奖品名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="PRIZECODE" th:field="*{PRIZECODE}" class="form-control" type="text"> <input name="PRIZECODE" th:field="*{PRIZECODE}" class="form-control" type="text">
</div> </div>

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

@ -1,184 +1,203 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('记录发奖信息列表')" /> <th:block th:include="include :: header('记录发奖信息列表')"/>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>活动代码：</label> <label>活动代码：</label>
<input type="text" name="DRAWCODE"/> <select name="DRAWCODE" th:with="drawinfo=${@drawInfo.findDrawInfoList()}">
</li> <option value="">所有</option>
<!-- <li>--> <option th:each="drawInfo : ${drawinfo}" th:text="${drawInfo.DRAWNAME}"
<!-- <label>奖品代码：</label>--> th:value="${drawInfo.DRAWCODE}"></option>
<!-- <input type="text" name="PRIZECODE"/>--> </select>
<!-- </li>--> </li>
<!-- <li>--> <li>
<!-- <label>用户标识：</label>--> <label>奖品名称：</label>
<!-- <input type="text" name="USERID"/>--> <select name="PRIZECODE" th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
<!-- </li>--> <option value="">所有</option>
<!-- <li>--> <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
<!-- <label>抽奖记录标识：</label>--> th:value="${drawPrize.PRIZECODE}"></option>
<!-- <input type="text" name="DRAWRECORDID"/>--> </select>
<!-- </li>--> </li>
<li> <li>
<label>发奖时间：</label> <label>用户标识：</label>
<input type="text" class="time-input" placeholder="请选择发奖时间" name="AWARDTIME"/> <input type="text" name="USERID"/>
</li> </li>
<!-- <li>--> <!-- <li>-->
<!-- <label>发奖结果：</label>--> <!-- <label>抽奖记录标识：</label>-->
<!-- <input type="text" name="AWARDRESULT"/>--> <!-- <input type="text" name="DRAWRECORDID"/>-->
<!-- </li>--> <!-- </li>-->
<!-- <li>--> <!-- <li>-->
<!-- <label>错误码：</label>--> <!-- <label>发奖时间：</label>-->
<!-- <input type="text" name="RETURNCODE"/>--> <!-- <input type="text" class="time-input" placeholder="请选择发奖时间" name="AWARDTIME"/>-->
<!-- </li>--> <!-- </li>-->
<!-- <li>--> <li>
<!-- <label>错误信息：</label>--> <label>发奖结果：</label>
<!-- <input type="text" name="RETURNMESSAGE"/>--> <input type="text" name="AWARDRESULT"/>
<!-- </li>--> </li>
<li> <!-- <li>-->
<label>手机号：</label> <!-- <label>错误码：</label>-->
<input type="text" name="PHONE"/> <!-- <input type="text" name="RETURNCODE"/>-->
</li> <!-- </li>-->
<li> <!-- <li>-->
<label>用户名：</label> <!-- <label>错误信息：</label>-->
<input type="text" name="USERNAME"/> <!-- <input type="text" name="RETURNMESSAGE"/>-->
</li> <!-- </li>-->
<!-- <li>--> <li>
<!-- <label>抽奖流水：</label>--> <label>手机号：</label>
<!-- <input type="text" name="DRAWTRANSEQNO"/>--> <input type="text" name="PHONE"/>
<!-- </li>--> </li>
<!-- <li>--> <li>
<!-- <label>发奖流水：</label>--> <label>用户名：</label>
<!-- <input type="text" name="AWARDTRANSEQNO"/>--> <input type="text" name="USERNAME"/>
<!-- </li>--> </li>
<li> <!-- <li>-->
<label>奖品等级：</label> <!-- <label>抽奖流水：</label>-->
<select name="PRIZELEVEL" th:with="type=${@dict.getType('prizeLevel')}" style="width: 80px"> <!-- <input type="text" name="DRAWTRANSEQNO"/>-->
<option value="">所有</option> <!-- </li>-->
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <!-- <li>-->
</select> <!-- <label>发奖流水：</label>-->
</li> <!-- <input type="text" name="AWARDTRANSEQNO"/>-->
<li> <!-- </li>-->
<label>奖品类型：</label> <li>
<select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}" style="width: 80px"> <label>奖品等级：</label>
<option value="">所有</option> <select name="PRIZELEVEL" th:with="type=${@dict.getType('prizeLevel')}" style="width: 80px">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option value="">所有</option>
</select> <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
</li> th:value="${dict.dictValue}"></option>
<!-- <li>--> </select>
<!-- <label>商户号：</label>--> </li>
<!-- <input type="text" name="MERCHANTCODE"/>--> <li>
<!-- </li>--> <label>奖品类型：</label>
<!-- <li>--> <select name="PRIZETYPE" th:with="type=${@dict.getType('prizeType')}" style="width: 80px">
<!-- <label>商户系统号：</label>--> <option value="">所有</option>
<!-- <input type="text" name="MERCHANTSYSCODE"/>--> <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
<!-- </li>--> th:value="${dict.dictValue}"></option>
<!-- <li>--> </select>
<!-- <label>渠道：</label>--> </li>
<!-- <input type="text" name="CHANNEL"/>--> <!-- <li>-->
<!-- </li>--> <!-- <label>商户号：</label>-->
<!-- <li>--> <!-- <input type="text" name="MERCHANTCODE"/>-->
<!-- <label>业务领域：</label>--> <!-- </li>-->
<!-- <input type="text" name="BUSINESSAREA"/>--> <!-- <li>-->
<!-- </li>--> <!-- <label>商户系统号：</label>-->
<!-- <li>--> <!-- <input type="text" name="MERCHANTSYSCODE"/>-->
<!-- <label>城市：</label>--> <!-- </li>-->
<!-- <input type="text" name="CITY"/>--> <!-- <li>-->
<!-- </li>--> <!-- <label>渠道：</label>-->
<!-- <li>--> <!-- <input type="text" name="CHANNEL"/>-->
<!-- <label>扩展：</label>--> <!-- </li>-->
<!-- <input type="text" name="EXTID"/>--> <!-- <li>-->
<!-- </li>--> <!-- <label>业务领域：</label>-->
<li> <!-- <input type="text" name="BUSINESSAREA"/>-->
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <!-- </li>-->
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <!-- <li>-->
</li> <!-- <label>城市：</label>-->
</ul> <!-- <input type="text" name="CITY"/>-->
</div> <!-- </li>-->
</form> <!-- <li>-->
</div> <!-- <label>扩展：</label>-->
<!-- <input type="text" name="EXTID"/>-->
<!-- </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>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group"> <div class="btn-group-sm" id="toolbar" role="group">
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:record:add">--> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activity:record:add">-->
<!-- <i class="fa fa-plus"></i> 添加--> <!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:record:edit">--> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activity:record:edit">-->
<!-- <i class="fa fa-edit"></i> 修改--> <!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>--> <!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:record:remove">--> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activity:record:remove">-->
<!-- <i class="fa fa-remove"></i> 删除--> <!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>--> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:record:export"> <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activity:record:export">
<i class="fa fa-download"></i> 导出 <i class="fa fa-download"></i> 导出
</a> </a>
</div> </div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div>
</div> </div>
</div> </div>
<th:block th:include="include :: footer" /> </div>
<script th:inline="javascript"> <th:block th:include="include :: footer"/>
var editFlag = [[${@permission.hasPermi('activity:record:edit')}]]; <script th:inline="javascript">
var removeFlag = [[${@permission.hasPermi('activity:record:remove')}]]; var editFlag = [[${@permission.hasPermi('activity:record:edit')}]];
var prefix = ctx + "activity/award/record"; var removeFlag = [[${@permission.hasPermi('activity:record:remove')}]];
var datas = [[${@dict.getType('prizeLevel')}]]; var prefix = ctx + "activity/award/record";
var prizetypes = [[${@dict.getType('prizeType')}]]; var datas = [[${@dict.getType('prizeLevel')}]];
var prizetypes = [[${@dict.getType('prizeType')}]];
var drawInfoList = [[${@drawInfo.findDrawInfoList()}]];
var drawPrizeList = [[${@drawPrize.findDrawPrizeInfoList()}]];
$(function() { $(function () {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
modalName: "记录发奖信息", modalName: "记录发奖信息",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
{ {
field: 'awardrecordid', field: 'awardrecordid',
title: '主键', title: '主键',
visible: false visible: false
}, },
{
field: 'drawcode',
title: '抽奖活动代码'
},
{
field: 'prizecode',
title: '奖品代码'
},
{ {
field: 'userid', field: 'userid',
title: '用户标识' title: '用户标识'
}, },
{ {
field: 'drawrecordid', field: 'username',
title: '抽奖记录标识' title: '用户名'
}, },
{ {
field: 'awardtime', field: 'drawcode',
title: '发奖时间' title: '活动名称',
formatter: function (value, row, index) {
return $.table.selectDrawname(drawInfoList, value);
}
},
{
field: 'prizecode',
title: '奖品名称',
formatter: function (value, row, index) {
return $.table.selectprivename(drawPrizeList, value);
}
},
{
field: 'prizetype',
title: '奖品类型',
formatter: function (value, row, index) {
return $.table.selectDictLabel(prizetypes, value);
}
}, },
{ {
field: 'awardresult', field: 'awardresult',
title: '发奖结果' title: '发奖结果'
}, },
{ {
field: 'returncode', field: 'awardtime',
title: '错误码' title: '发奖时间'
},
{
field: 'returnmessage',
title: '错误信息'
}, },
{ {
field: 'phone', field: 'phone',
@ -189,9 +208,22 @@
title: '地址' title: '地址'
}, },
{ {
field: 'username', field: 'drawrecordid',
title: '用户名' title: '抽奖记录标识',
visible: false
}, },
{
field: 'returncode',
title: '错误码',
visible: false
},
{
field: 'returnmessage',
title: '错误信息',
visible: false
},
// { // {
// field: 'createtimestamp', // field: 'createtimestamp',
// title: '创建时间' // title: '创建时间'
@ -202,50 +234,53 @@
// }, // },
{ {
field: 'drawtranseqno', field: 'drawtranseqno',
title: '抽奖流水' title: '抽奖流水',
visible: false
}, },
{ {
field: 'awardtranseqno', field: 'awardtranseqno',
title: '发奖流水' title: '发奖流水',
visible: false
}, },
{ {
field: 'prizelevel', field: 'prizelevel',
title: '奖品等级', title: '奖品等级',
formatter: function(value, row, index) { visible: false,
formatter: function (value, row, index) {
return $.table.selectDictLabel(datas, value); return $.table.selectDictLabel(datas, value);
} }
}, },
{ {
field: 'prizetype', field: 'merchantcode',
title: '奖品类型', title: '商户号',
formatter: function(value, row, index) { visible: false
return $.table.selectDictLabel(prizetypes, value); },
} {
field: 'merchantsyscode',
title: '商户系统号',
visible: false
},
{
field: 'channel',
title: '渠道',
visible: false
},
{
field: 'businessarea',
title: '业务领域',
visible: false
}, },
// {
// field: 'merchantcode',
// title: '商户号'
// },
// {
// field: 'merchantsyscode',
// title: '商户系统号'
// },
// {
// field: 'channel',
// title: '渠道'
// },
// {
// field: 'businessarea',
// title: '业务领域'
// },
{ {
field: 'city', field: 'city',
title: '城市' title: '城市',
visible: false
},
{
field: 'extid',
title: '扩展',
visible: false
}, },
// {
// field: 'extid',
// title: '扩展'
// },
// { // {
// title: '操作', // title: '操作',
// align: 'center', // align: 'center',
@ -256,10 +291,10 @@
// return actions.join(''); // return actions.join('');
// } // }
// } // }
] ]
}; };
$.table.init(options); $.table.init(options);
}); });
</script> </script>
</body> </body>
</html> </html>

4
sino-activity/src/main/resources/templates/activity/prizeInfo/info.html
View File

@ -11,7 +11,7 @@
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <li>
<label>奖品代码：</label> <label>奖品名称：</label>
<input type="text" name="PRIZECODE"/> <input type="text" name="PRIZECODE"/>
</li> </li>
<li> <li>
@ -101,7 +101,7 @@
}, },
{ {
field: 'prizecode', field: 'prizecode',
title: '奖品代码' title: '奖品名称'
}, },
{ {
field: 'prizename', field: 'prizename',

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

@ -41,7 +41,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">奖品代码：</label> <label class="col-sm-3 control-label">奖品名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="PRIZECODE" class="form-control" type="text"> <input name="PRIZECODE" class="form-control" type="text">
</div> </div>

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

@ -42,7 +42,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">奖品代码：</label> <label class="col-sm-3 control-label">奖品名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="PRIZECODE" th:field="*{PRIZECODE}" class="form-control" type="text"> <input name="PRIZECODE" th:field="*{PRIZECODE}" class="form-control" type="text">
</div> </div>

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

@ -35,7 +35,7 @@
<input type="text" name="DRAWRESULT"/> <input type="text" name="DRAWRESULT"/>
</li> </li>
<li> <li>
<label>奖品代码：</label> <label>奖品名称：</label>
<select name="PRIZECODE" th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"> <select name="PRIZECODE" th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}" <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
@ -160,7 +160,7 @@
}, },
{ {
field: 'drawcode', field: 'drawcode',
title: '抽奖活动代码', title: '活动名称',
formatter: function (value, row, index) { formatter: function (value, row, index) {
return $.table.selectDrawname(drawInfoList, value); return $.table.selectDrawname(drawInfoList, value);
} }