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