OpenGitLink
/
snow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/develop2.1.1'

This commit is contained in:
8fire 2022-07-27 08:27:56 +08:00
parent 493b08b3c6 b39f7f9856
commit e1ca41dd89
3 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -225,8 +225,8 @@ V2.1.1 2022-08-01
- 项目断更好久了，最近一段时间阿吉比较忙碌，入职了新公司。从0到1开发了一款奢侈品电商APP（需要买名牌包的联系阿吉），这期先做个小更新，近期都会以优化代码为主：
- 1.0 重构邮件模块
- 2.0 重构消息中心
- 3.0 钉钉模块部分代码调整
- 3.0 重构系统任务
- 4.0 钉钉模块部分代码调整
## 未来规划

6
snow-admin/src/main/resources/templates/system/task/add.html
View File

@ -70,12 +70,6 @@
</div>
</form>
</div>
<div class="row">
<div class="col-sm-offset-5 col-sm-10">
<button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
<button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">

22
snow-admin/src/main/resources/templates/system/task/task.html
View File

@ -12,17 +12,16 @@
<div class="tabs-left">
<ul class="nav nav-tabs">
<li class="active">
<a data-toggle="tab" href="#tab-1"> <span class="font-bold text-info"><i class="fa fa-tasks"></i> 待处理 </span> <span class="label label-info pull-right"></span></a>
<a data-toggle="tab" href="#tab-1"> <span class="font-bold text-info"><i class="fa fa-tasks"></i>&nbsp; 待处理 </span> <span class="label label-info pull-right"></span></a>
</li>
<li class="">
<a data-toggle="tab" href="#tab-2"> <span class="font-bold text-info"><i class="fa fa-paint-brush"></i> 我创建 </span> <span class="label label-info pull-right" ></span></a>
<a data-toggle="tab" href="#tab-2"> <span class="font-bold text-info"><i class="fa fa-paint-brush"></i>&nbsp; 我创建 </span> <span class="label label-info pull-right" ></span></a>
</li>
<li class="">
<a data-toggle="tab" href="#tab-3"><span class="font-bold text-info"><i class="fa fa-map"></i> 已处理 </span> <span class="label label-info pull-right" ></span></a>
<a data-toggle="tab" href="#tab-3"><span class="font-bold text-info"><i class="fa fa-map"></i>&nbsp; 已处理 </span> <span class="label label-info pull-right" ></span></a>
</li>
</ul>
@ -43,7 +42,7 @@
</li>
<li>
<label>任务状态：</label>
<select name="taskStatus" id="myTaskStatus" th:with="type=${@dict.getType('ding_task_status')}">
<select name="taskStatus" id="taskExecuteStatus" th:with="type=${@dict.getType('ding_task_status')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
@ -57,11 +56,6 @@
</form>
</div>
<div class="btn-group-sm" id="toolbar1" role="group">
<a class="btn btn-warning" onclick="$.table.exportExcel('formId3')" shiro:hasPermission="system:task:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table3"></table>
</div>
@ -202,7 +196,7 @@
field: 'taskExecuteStatus',
title: '执行状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(taskStatusDatas, row.sysOaTask.taskType);
return $.table.selectDictLabel(taskStatusDatas, value);
}
},
{
@ -242,7 +236,7 @@
function queryParams(params) {
var search = $.table.queryParams(params);
search.taskNo = $("#myTaskNo").val();
search.taskStatus = $("#myTaskStatus").val();
search.taskExecuteStatus = $("#taskExecuteStatus").val();
return search;
}
@ -342,7 +336,7 @@
field: 'taskName',
title: '任务名称',
formatter: function(value, row, index) {
return row.sysOaTask.taskName;
return $.table.tooltip(row.sysOaTask.taskName) ;
}
},
{
@ -421,7 +415,7 @@
field: 'taskNo',
title: '任务编号',
formatter: function(value, row, index) {
return row.taskNo.substring(0,5)+"...";
return $.table.tooltip(row.taskNo);
}
},
{