|
|
@@ -2,6 +2,7 @@
|
|
|
<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 :: bootstrap-select-css" />
|
|
|
</head>
|
|
|
<body class="gray-bg">
|
|
|
<div class="container-div">
|
|
|
@@ -10,40 +11,39 @@
|
|
|
<form id="formId">
|
|
|
<div class="select-list">
|
|
|
<ul>
|
|
|
- <li>
|
|
|
- <p>是否删除：</p>
|
|
|
- <input type="text" name="isDelete"/>
|
|
|
- </li>
|
|
|
+ <!--<li>-->
|
|
|
+ <!--<p>是否删除：</p>-->
|
|
|
+ <!--<input type="text" name="isDelete"/>-->
|
|
|
+ <!--</li>-->
|
|
|
<li>
|
|
|
<p>内容：</p>
|
|
|
- <input type="text" name="content"/>
|
|
|
+ <input type="text" name="content" maxlength="30"/>
|
|
|
</li>
|
|
|
<li class="select-time">
|
|
|
<p>开始时间：</p>
|
|
|
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginStartTime]"/>
|
|
|
- <span>-</span>
|
|
|
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endStartTime]"/>
|
|
|
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="startTime"/>
|
|
|
+ <!--<span>-</span>-->
|
|
|
+ <!--<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endStartTime]"/>-->
|
|
|
</li>
|
|
|
<li class="select-time">
|
|
|
<p>结束时间：</p>
|
|
|
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginEndTime]"/>
|
|
|
- <span>-</span>
|
|
|
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endEndTime]"/>
|
|
|
- </li>
|
|
|
- <li>
|
|
|
- <p>0 立邦员工 1经销商：</p>
|
|
|
- <select name="userType" th:with="type=${@dict.getType('')}">
|
|
|
- <option value="">所有</option>
|
|
|
- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
|
|
- </select>
|
|
|
+ <!--<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginEndTime]"/>-->
|
|
|
+ <!--<span>-</span>-->
|
|
|
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
|
|
|
</li>
|
|
|
<li>
|
|
|
- <p>磁贴：</p>
|
|
|
- <select name="tile" th:with="type=${@dict.getType('')}">
|
|
|
- <option value="">所有</option>
|
|
|
+ <p>公告人员：</p>
|
|
|
+ <select title="请选择" class="selectpicker" name="userType" th:with="type=${@dict.getType('sys_lantern_permission')}" multiple>
|
|
|
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
|
|
</select>
|
|
|
</li>
|
|
|
+ <!--<li>-->
|
|
|
+ <!--<p>磁贴：</p>-->
|
|
|
+ <!--<select name="tile" th:with="type=${@dict.getType('')}">-->
|
|
|
+ <!--<option value="">请选择</option>-->
|
|
|
+ <!--<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
|
|
|
+ <!--</select>-->
|
|
|
+ <!--</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>
|
|
|
@@ -63,9 +63,9 @@
|
|
|
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:lantern:remove">
|
|
|
<i class="fa fa-remove"></i> 删除
|
|
|
</a>
|
|
|
- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:lantern:export">
|
|
|
- <i class="fa fa-download"></i> 导出
|
|
|
- </a>
|
|
|
+ <!--<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:lantern:export">-->
|
|
|
+ <!--<i class="fa fa-download"></i> 导出-->
|
|
|
+ <!--</a>-->
|
|
|
</div>
|
|
|
<div class="col-sm-12 select-table table-striped">
|
|
|
<table id="bootstrap-table"></table>
|
|
|
@@ -73,6 +73,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<th:block th:include="include :: footer" />
|
|
|
+ <th:block th:include="include :: bootstrap-select-js" />
|
|
|
<script th:inline="javascript">
|
|
|
var editFlag = [[${@permission.hasPermi('system:lantern:edit')}]];
|
|
|
var removeFlag = [[${@permission.hasPermi('system:lantern:remove')}]];
|
|
|
@@ -94,13 +95,14 @@
|
|
|
title : 'null',
|
|
|
visible: false
|
|
|
},
|
|
|
- {
|
|
|
- field : 'isDelete',
|
|
|
- title : '是否删除'
|
|
|
- },
|
|
|
+ // {
|
|
|
+ // field : 'isDelete',
|
|
|
+ // title : '是否删除'
|
|
|
+ // },
|
|
|
{
|
|
|
field : 'content',
|
|
|
- title : '内容'
|
|
|
+ title : '内容',
|
|
|
+ width : '200'
|
|
|
},
|
|
|
{
|
|
|
field : 'startTime',
|
|
|
@@ -112,12 +114,23 @@
|
|
|
},
|
|
|
{
|
|
|
field : 'userType',
|
|
|
- title : '0 立邦员工 1经销商'
|
|
|
- },
|
|
|
- {
|
|
|
- field : 'tile',
|
|
|
- title : '磁贴'
|
|
|
+ title : '公告人员',
|
|
|
+ formatter: function(value, row, index) {
|
|
|
+ if (value.indexOf('1') != -1 && value.indexOf('0') != -1){
|
|
|
+ return '立邦人员、经销商';
|
|
|
+ }
|
|
|
+ if (value.indexOf('1') != -1 && value.indexOf('0') == -1) {
|
|
|
+ return '经销商';
|
|
|
+ }
|
|
|
+ if (value.indexOf('1') == -1 && value.indexOf('0') != -1) {
|
|
|
+ return '立邦人员';
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
+ // {
|
|
|
+ // field : 'tile',
|
|
|
+ // title : '磁贴'
|
|
|
+ // },
|
|
|
{
|
|
|
title: '操作',
|
|
|
align: 'center',
|
|
|
@@ -129,6 +142,7 @@
|
|
|
}
|
|
|
}]
|
|
|
};
|
|
|
+ console.log(1,options);
|
|
|
$.table.init(options);
|
|
|
});
|
|
|
</script>
|
