refactor(activiti): 优化实验请求相关页面和功能，experimentDesc为实验内容，experimentContent为实验方案
- 修改了多个模板文件的布局和字段显示 - 更新了实验请求状态的处理逻辑 - 优化了时间列表的展示方式 - 调整了编辑功能的权限控制 - 修复了一些小的UI问题master
parent
672a653ea5
commit
1970c8d944
@ -1,111 +1,111 @@
|
||||
<!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('实验申请信息关联时间列表')" />
|
||||
</head>
|
||||
<body class="gray-bg">
|
||||
<div class="container-div">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 search-collapse">
|
||||
<form id="formId">
|
||||
<div class="select-list">
|
||||
<ul>
|
||||
<li>
|
||||
<label>绑定项目主键：</label>
|
||||
<input type="text" name="pojectId"/>
|
||||
</li>
|
||||
<li class="select-time">
|
||||
<label>更新时间：</label>
|
||||
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginUpdateTime]"/>
|
||||
<span>-</span>
|
||||
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endUpdateTime]"/>
|
||||
</li>
|
||||
<li>
|
||||
<label>实验状态：</label>
|
||||
<select name="status" th:with="type=${@dict.getType('process_status')}">
|
||||
<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>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<!--<!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('实验申请信息关联时间列表')" />-->
|
||||
<!--</head>-->
|
||||
<!--<body class="gray-bg">-->
|
||||
<!--<div class="container-div">-->
|
||||
<!-- <div class="row">-->
|
||||
<!-- <div class="col-sm-12 search-collapse">-->
|
||||
<!-- <form id="formId">-->
|
||||
<!-- <div class="select-list">-->
|
||||
<!-- <ul>-->
|
||||
<!-- <li>-->
|
||||
<!-- <label>绑定项目主键：</label>-->
|
||||
<!-- <input type="text" name="pojectId"/>-->
|
||||
<!-- </li>-->
|
||||
<!-- <li class="select-time">-->
|
||||
<!-- <label>更新时间：</label>-->
|
||||
<!-- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginUpdateTime]"/>-->
|
||||
<!-- <span>-</span>-->
|
||||
<!-- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endUpdateTime]"/>-->
|
||||
<!-- </li>-->
|
||||
<!-- <li>-->
|
||||
<!-- <label>实验状态：</label>-->
|
||||
<!-- <select name="status" th:with="type=${@dict.getType('process_status')}">-->
|
||||
<!-- <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>-->
|
||||
<!-- </li>-->
|
||||
<!-- </ul>-->
|
||||
<!-- </div>-->
|
||||
<!-- </form>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<div class="btn-group-sm" id="toolbar" role="group">
|
||||
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activiti:experiment_request_relation:add">
|
||||
<i class="fa fa-plus"></i> 添加
|
||||
</a>
|
||||
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activiti:experiment_request_relation:edit">
|
||||
<i class="fa fa-edit"></i> 修改
|
||||
</a>
|
||||
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activiti:experiment_request_relation:remove">
|
||||
<i class="fa fa-remove"></i> 删除
|
||||
</a>
|
||||
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activiti:experiment_request_relation:export">
|
||||
<i class="fa fa-download"></i> 导出
|
||||
</a>
|
||||
</div>
|
||||
<div class="col-sm-12 select-table table-striped">
|
||||
<table id="bootstrap-table"></table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<script th:inline="javascript">
|
||||
var editFlag = [[${@permission.hasPermi('activiti:experiment_request_relation:edit')}]];
|
||||
var removeFlag = [[${@permission.hasPermi('activiti:experiment_request_relation:remove')}]];
|
||||
var statusDatas = [[${@dict.getType('process_status')}]];
|
||||
var prefix = ctx + "activiti/experiment_request_relation";
|
||||
<!-- <div class="btn-group-sm" id="toolbar" role="group">-->
|
||||
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="activiti:experiment_request_relation:add">-->
|
||||
<!-- <i class="fa fa-plus"></i> 添加-->
|
||||
<!-- </a>-->
|
||||
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="activiti:experiment_request_relation:edit">-->
|
||||
<!-- <i class="fa fa-edit"></i> 修改-->
|
||||
<!-- </a>-->
|
||||
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="activiti:experiment_request_relation:remove">-->
|
||||
<!-- <i class="fa fa-remove"></i> 删除-->
|
||||
<!-- </a>-->
|
||||
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="activiti:experiment_request_relation:export">-->
|
||||
<!-- <i class="fa fa-download"></i> 导出-->
|
||||
<!-- </a>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="col-sm-12 select-table table-striped">-->
|
||||
<!-- <table id="bootstrap-table"></table>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!--</div>-->
|
||||
<!--<th:block th:include="include :: footer" />-->
|
||||
<!--<script th:inline="javascript">-->
|
||||
<!-- var editFlag = [[${@permission.hasPermi('activiti:experiment_request_relation:edit')}]];-->
|
||||
<!-- var removeFlag = [[${@permission.hasPermi('activiti:experiment_request_relation:remove')}]];-->
|
||||
<!-- var statusDatas = [[${@dict.getType('process_status')}]];-->
|
||||
<!-- var prefix = ctx + "activiti/experiment_request_relation";-->
|
||||
|
||||
$(function() {
|
||||
var options = {
|
||||
url: prefix + "/list",
|
||||
createUrl: prefix + "/add",
|
||||
updateUrl: prefix + "/edit/{id}",
|
||||
removeUrl: prefix + "/remove",
|
||||
exportUrl: prefix + "/export",
|
||||
modalName: "实验申请信息关联时间",
|
||||
columns: [{
|
||||
checkbox: true
|
||||
},
|
||||
{
|
||||
field: 'objId',
|
||||
title: '主键',
|
||||
visible: false
|
||||
},
|
||||
{
|
||||
field: 'pojectId',
|
||||
title: '绑定项目主键'
|
||||
},
|
||||
{
|
||||
field: 'updateTime',
|
||||
title: '更新时间'
|
||||
},
|
||||
{
|
||||
field: 'status',
|
||||
title: '实验状态',
|
||||
formatter: function(value, row, index) {
|
||||
return $.table.selectDictLabel(statusDatas, value);
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
align: 'center',
|
||||
formatter: function(value, row, index) {
|
||||
var actions = [];
|
||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
||||
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objId + '\')"><i class="fa fa-remove"></i>删除</a>');
|
||||
return actions.join('');
|
||||
}
|
||||
}]
|
||||
};
|
||||
$.table.init(options);
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
<!-- $(function() {-->
|
||||
<!-- var options = {-->
|
||||
<!-- url: prefix + "/list",-->
|
||||
<!-- createUrl: prefix + "/add",-->
|
||||
<!-- updateUrl: prefix + "/edit/{id}",-->
|
||||
<!-- removeUrl: prefix + "/remove",-->
|
||||
<!-- exportUrl: prefix + "/export",-->
|
||||
<!-- modalName: "实验申请信息关联时间",-->
|
||||
<!-- columns: [{-->
|
||||
<!-- checkbox: true-->
|
||||
<!-- },-->
|
||||
<!-- {-->
|
||||
<!-- field: 'objId',-->
|
||||
<!-- title: '主键',-->
|
||||
<!-- visible: false-->
|
||||
<!-- },-->
|
||||
<!-- {-->
|
||||
<!-- field: 'pojectId',-->
|
||||
<!-- title: '绑定项目主键'-->
|
||||
<!-- },-->
|
||||
<!-- {-->
|
||||
<!-- field: 'updateTime',-->
|
||||
<!-- title: '更新时间'-->
|
||||
<!-- },-->
|
||||
<!-- {-->
|
||||
<!-- field: 'status',-->
|
||||
<!-- title: '实验状态',-->
|
||||
<!-- formatter: function(value, row, index) {-->
|
||||
<!-- return $.table.selectDictLabel(statusDatas, value);-->
|
||||
<!-- }-->
|
||||
<!-- },-->
|
||||
<!-- {-->
|
||||
<!-- title: '操作',-->
|
||||
<!-- align: 'center',-->
|
||||
<!-- formatter: function(value, row, index) {-->
|
||||
<!-- var actions = [];-->
|
||||
<!-- actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.objId + '\')"><i class="fa fa-edit"></i>编辑</a> ');-->
|
||||
<!-- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.objId + '\')"><i class="fa fa-remove"></i>删除</a>');-->
|
||||
<!-- return actions.join('');-->
|
||||
<!-- }-->
|
||||
<!-- }]-->
|
||||
<!-- };-->
|
||||
<!-- $.table.init(options);-->
|
||||
<!-- });-->
|
||||
<!--</script>-->
|
||||
<!--</body>-->
|
||||
<!--</html>-->
|
||||
|
||||
Loading…
Reference in New Issue