Ver código fonte

oa模块页面调整

user5 4 anos atrás
pai
commit
a630f23df6

+ 2 - 2
src/main/java/com/jeeplus/modules/act/service/ActProcessService.java

@@ -73,14 +73,14 @@ public class ActProcessService extends BaseService {
 		}
 	    
 	    page.setCount(processDefinitionQuery.count());
-	    
+
 	    List<ProcessDefinition> processDefinitionList = processDefinitionQuery.listPage(page.getFirstResult(), page.getMaxResults());
 	    for (ProcessDefinition processDefinition : processDefinitionList) {
 	      String deploymentId = processDefinition.getDeploymentId();
 	      Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(deploymentId).singleResult();
 	      page.getList().add(new Object[]{processDefinition, deployment});
 	    }
-
+		page.initialize();
 		return page;
 	}
 

+ 121 - 140
src/main/webapp/webpage/modules/act/actModelList.jsp

@@ -2,42 +2,45 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>模型管理</title>
+	<title>项目登记</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript">
-		$(document).ready(function(){
-			top.$.jBox.tip.mess = null;
+		$(document).ready(function() {
 		});
 		function updateCategory(id, category){
 			layer.open({
-				  type: 1, 
-				  title:"设置分类",
-				  area: ['400px', '200px'],
-				  content: $("#categoryBox").html() //这里content是一个普通的String
-				});
+				type: 1,
+				title:"设置分类",
+				area: ['400px', '200px'],
+				content: $("#categoryBox").html() //这里content是一个普通的String
+			});
 			$("#categoryBoxId").val(id);
 			$("#categoryBoxCategory").val(category);
 		}
+
+		function reset() {
+			$("#searchForm").resetForm();
+		}
 	</script>
 	<script type="text/template" id="categoryBox">
 		<form id="categoryForm" action="${ctx}/act/model/updateCategory" method="post" enctype="multipart/form-data"
-			style="text-align:center;"   onsubmit="loading('正在分类,请稍等...');"><br/>
-		
+			  style="text-align:center;"   onsubmit="loading('正在分类,请稍等...');"><br/>
+
+
+			<div class="col-md-12">
+				<div class="form-group">
+					<label class="col-sm-3 control-label">选择分类:</label>
+					<div class="col-sm-9">
+						<input id="categoryBoxId" type="hidden" name="id" value="" />
+						<select id="categoryBoxCategory" name="category" class="form-control">
+							<c:forEach items="${fns:getDictList('act_category')}" var="dict">
+								<option value="${dict.value}">${dict.label}</option>
+							</c:forEach>
+						</select>
+					</div>
+				</div>
+			</div>
 
-		<div class="col-md-12">
-   			<div class="form-group">
-        		<label class="col-sm-3 control-label">选择分类:</label>
-       			<div class="col-sm-9">
-           			 <input id="categoryBoxId" type="hidden" name="id" value="" />
-					<select id="categoryBoxCategory" name="category" class="form-control">
-						<c:forEach items="${fns:getDictList('act_category')}" var="dict">
-							<option value="${dict.value}">${dict.label}</option>
-						</c:forEach>
-					</select>
-       			 </div>
-   			 </div>
-			</div>	
-			
 			<br/>
 			<br/> 
 			<br/> 
@@ -46,125 +49,103 @@
 		</form>
 	</script>
 </head>
-<body class="gray-bg">
-	<div class="wrapper wrapper-content">
-	<div class="ibox">
-	<%--<div class="ibox-title">
-		<h5>模型管理 </h5>
-		<div class="ibox-tools">
-			<a class="collapse-link">
-				<i class="fa fa-chevron-up"></i>
-			</a>
-			<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">
-				<i class="fa fa-wrench"></i>
-			</a>
-			<ul class="dropdown-menu dropdown-user">
-				<li><a href="javascript:void(0)">选项1</a>
-				</li>
-				<li><a href="javascript:void(0)">选项2</a>
-				</li>
-			</ul>
-			<a class="close-link">
-				<i class="fa fa-times"></i>
-			</a>
-		</div>
-	</div>--%>
-    
-    <div class="ibox-content">
+<body>
+<div class="wrapper wrapper-content">
 	<sys:message content="${message}"/>
-	
-	<!--查询条件-->
-	<div class="row">
-	<div class="col-sm-12">
-	<form:form id="searchForm" modelAttribute="category" action="${ctx}/act/model/" method="post" class="form-inline">
-		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-		<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
-		<a href="#" id="moresee" class="fa fa-chevron-down" style="float: right;">更多</a>
-		<div class="form-group">
-			<select id="category" name="category" class="form-control">
-				<option value="">全部分类</option>
-				<c:forEach items="${fns:getDictList('act_category')}" var="dict">
-					<option value="${dict.value}" ${dict.value==category?'selected':''}>${dict.label}</option>
-				</c:forEach>
-			</select>
-		 </div>	
-	</form:form>
-	<br/>
-	</div>
-	</div>
-	
-	<!-- 工具栏 -->
-	<div class="row">
-	<div class="col-sm-12">
-		<div class="pull-left">
-			<shiro:hasPermission name="act:model:create">
-				<table:addRow url="${ctx}/act/model/create"  title="新建模型"></table:addRow><!-- 增加按钮 -->
-			</shiro:hasPermission>
-			<shiro:hasPermission name="act:model:del">
-				<table:delRow url="${ctx}/act/model/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->
-			</shiro:hasPermission>
-	       <button class="btn btn-white btn-sm " data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i> 刷新</button>
-		
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="category" action="${ctx}/act/model/" method="post" class="form-inline">
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+
+					<div class="commonQuery lw6">
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">流程分类:</label>
+							<div class="layui-input-block">
+								<select id="category" name="category" class=" form-control  simple-select">
+									<option value="" label="全部分类"/>
+									<c:forEach items="${fns:getDictList('act_category')}" var="dict">
+										<option value="${dict.value}" ${dict.value==category?'selected':''}>${dict.label}</option>
+									</c:forEach>
+								</select>
+							</div>
+						</div>
+						<div class="layui-item athird">
+							<div class="input-group">
+								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
+								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="layui-form contentDetails contentShadow shadowLBR">
+				<div class="nav-btns">
+					<shiro:hasPermission name="act:model:create">
+						<table:addRow url="${ctx}/act/model/create"  title="新建模型"></table:addRow><!-- 增加按钮 -->
+					</shiro:hasPermission>
+					<shiro:hasPermission name="act:model:del">
+						<table:delRow url="${ctx}/act/model/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->
+					</shiro:hasPermission>
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div style="clear: both;"></div>
+				</div>
+
+				<table id="contentTable" class="table table-striped table-bordered table-hover table-condensed dataTables-example dataTable">
+					<thead>
+					<tr>
+						<th> <input type="checkbox" class="i-checks"></th>
+						<th>流程分类</th>
+						<th>模型ID</th>
+						<th>模型标识</th>
+						<th>模型名称</th>
+						<th>版本号</th>
+						<th>创建时间</th>
+						<th>最后更新时间</th>
+						<th>操作</th>
+					</tr>
+					</thead>
+					<tbody>
+					<c:forEach items="${page.list}" var="model">
+						<tr>
+							<td> <input type="checkbox" id="${model.id}" class="i-checks"></td>
+							<td><a href="javascript:updateCategory('${model.id}', '${model.category}')" title="设置分类">${fns:getDictLabel(model.category,'act_category','无分类')}</a></td>
+							<td>${model.id}</td>
+							<td>${model.key}</td>
+							<td>${model.name}</td>
+							<td><b title='流程版本号'>V: ${model.version}</b></td>
+							<td><fmt:formatDate value="${model.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+							<td><fmt:formatDate value="${model.lastUpdateTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+							<td>
+								<shiro:hasPermission name="act:model:edit">
+									<a href="${pageContext.request.contextPath}/act/rest/modeler.html?modelId=${model.id}" target="_blank">在线设计</a>
+								</shiro:hasPermission>
+								<shiro:hasPermission name="act:model:deploy">
+									<a href="${ctx}/act/model/deploy?id=${model.id}" onclick="return confirmx('确认要部署该模型吗?', this.href)">部署</a>
+								</shiro:hasPermission>
+								<shiro:hasPermission name="act:model:export">
+									<a href="${ctx}/act/model/export?id=${model.id}" target="_blank">导出</a>
+								</shiro:hasPermission>
+								<shiro:hasPermission name="act:model:del">
+									<a href="${ctx}/act/model/delete?id=${model.id}" onclick="return confirmx('确认要删除该模型吗?', this.href)">删除</a>
+								</shiro:hasPermission>
+							</td>
+						</tr>
+					</c:forEach>
+					</tbody>
+				</table>
+
+				<!-- 分页代码 -->
+				<table:page page="${page}"></table:page>
+				<div style="clear: both;"></div>
 			</div>
-		<div class="pull-right">
-			<button  class="btn btn-primary btn-rounded btn-outline btn-sm " onclick="search()" ><i class="fa fa-search"></i> 查询</button>
-			<button  class="btn btn-primary btn-rounded btn-outline btn-sm " onclick="reset()" ><i class="fa fa-refresh"></i> 重置</button>
 		</div>
-	</div>
-	</div>
-	
-	<!-- 表格 -->
-	<table id="contentTable" class="table table-striped table-bordered table-hover table-condensed dataTables-example dataTable">
-		<thead>
-			<tr>
-				<th> <input type="checkbox" class="i-checks"></th>
-				<th>流程分类</th>
-				<th>模型ID</th>
-				<th>模型标识</th>
-				<th>模型名称</th>
-				<th>版本号</th>
-				<th>创建时间</th>
-				<th>最后更新时间</th>
-				<th>操作</th>
-			</tr>
-		</thead>
-		<tbody>
-		<c:forEach items="${page.list}" var="model">
-			<tr>
-				<td> <input type="checkbox" id="${model.id}" class="i-checks"></td>
-				<td><a href="javascript:updateCategory('${model.id}', '${model.category}')" title="设置分类">${fns:getDictLabel(model.category,'act_category','无分类')}</a></td>
-					<td>${model.id}</td>
-					<td>${model.key}</td>
-					<td>${model.name}</td>
-					<td><b title='流程版本号'>V: ${model.version}</b></td>
-					<td><fmt:formatDate value="${model.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-					<td><fmt:formatDate value="${model.lastUpdateTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-					<td>
-						<shiro:hasPermission name="act:model:edit">
-							<a href="${pageContext.request.contextPath}/act/rest/modeler.html?modelId=${model.id}" target="_blank">在线设计</a>
-						</shiro:hasPermission>
-						<shiro:hasPermission name="act:model:deploy">
-							<a href="${ctx}/act/model/deploy?id=${model.id}" onclick="return confirmx('确认要部署该模型吗?', this.href)">部署</a>
-						</shiro:hasPermission>
-						<shiro:hasPermission name="act:model:export">
-							<a href="${ctx}/act/model/export?id=${model.id}" target="_blank">导出</a>
-						</shiro:hasPermission>
-						<shiro:hasPermission name="act:model:del">
-	                    	<a href="${ctx}/act/model/delete?id=${model.id}" onclick="return confirmx('确认要删除该模型吗?', this.href)">删除</a>
-	                    </shiro:hasPermission>
-					</td>
-			</tr>
-		</c:forEach>
-		</tbody>
-	</table>
-	
-		<!-- 分页代码 -->
-	<table:page page="${page}"></table:page>
-	<br/>
-	<br/>
-	</div>
 	</div>
 </div>
 </body>
-</html>
+</html>

+ 83 - 96
src/main/webapp/webpage/modules/act/actProcessHistoryList.jsp

@@ -2,110 +2,97 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>已结束的流程</title>
+	<title>项目登记</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript">
-		$(document).ready(function(){
-			top.$.jBox.tip.mess = null;
+		$(document).ready(function() {
 		});
+
+		function reset() {
+			$("#searchForm").resetForm();
+		}
 	</script>
 </head>
-<body class="gray-bg">
-	<div class="wrapper wrapper-content">
-	<div class="ibox">
-	<%--<div class="ibox-title">
-		<h5>已结束的流程 </h5>
-		<div class="ibox-tools">
-			<a class="collapse-link">
-				<i class="fa fa-chevron-up"></i>
-			</a>
-			<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">
-				<i class="fa fa-wrench"></i>
-			</a>
-			<ul class="dropdown-menu dropdown-user">
-				<li><a href="javascript:void(0)">选项1</a>
-				</li>
-				<li><a href="javascript:void(0)">选项2</a>
-				</li>
-			</ul>
-			<a class="close-link">
-				<i class="fa fa-times"></i>
-			</a>
-		</div>
-	</div>--%>
-    
-    <div class="ibox-content">
+<body>
+<div class="wrapper wrapper-content">
 	<sys:message content="${message}"/>
-	
-	<!--查询条件-->
-	<div class="row">
-	<div class="col-sm-12">
-	<form:form id="searchForm"  action="${ctx}/act/process/historyList/" method="post" class="form-inline">
-		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-		<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
-		<a href="#" id="moresee" class="fa fa-chevron-down" style="float: right;">更多</a>
-		<div class="form-group">
-			<label>流程实例ID:</label><input type="text" id="procInsId" name="procInsId" value="${procInsId}" class="form-control"/>
-			<label>流程定义Key:</label><input type="text" id="procDefKey" name="procDefKey" value="${procDefKey}" class="form-control"/>
-		</div>	
-	</form:form>
-	<br/>
-	</div>
-	</div>
-	
-		<!-- 工具栏 -->
-	<div class="row">
-	<div class="col-sm-12">
-		<div class="pull-left">
-	       <button class="btn btn-white btn-sm " data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i> 刷新</button>
-		
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="category" action="${ctx}/act/process/historyList/" method="post" class="form-inline">
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+
+					<div class="commonQuery lw6">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">流程实例ID</label>
+							<div class="layui-input-block with-icon">
+								<input id="procInsId" name="procInsId" value="${procInsId}" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label double-line">流程定义Key</label>
+							<div class="layui-input-block with-icon">
+								<input id="procDefKey" name="procDefKey" value="${procDefKey}" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+
+						<div class="layui-item athird">
+							<div class="input-group">
+								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
+								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="layui-form contentDetails contentShadow shadowLBR">
+				<div class="nav-btns">
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div style="clear: both;"></div>
+				</div>
+
+				<table id="contentTable" class="table table-striped table-bordered table-hover table-condensed dataTables-example dataTable">
+					<thead>
+					<tr>
+						<th>流程名称</th>
+						<th>执行ID</th>
+						<th>流程实例ID</th>
+						<th>流程定义ID</th>
+						<th>当前环节</th>
+						<th>是否挂起</th>
+						<th>操作</th>
+					</tr>
+					</thead>
+					<tbody>
+					<c:forEach items="${page.list}" var="procIns">
+						<tr>
+							<td>${procIns.processDefinitionName}</td>
+							<td>${procIns.id}</td>
+							<td>${procIns.processInstanceId}</td>
+							<td>${procIns.processDefinitionId}</td>
+							<td>${procIns.activityId}</td>
+							<td>${procIns.suspended}</td>
+							<td>
+								<a  href="javascript:openDialog('查看流程历史','${ctx}/act/task/trace/photo/${procIns.processDefinitionId}/${procIns.id}','1000px', '600px')">历史</a>
+								<shiro:hasPermission name="act:process:edit">
+									<a href="${ctx}/act/process/deleteProcIns?procInsId=${procIns.processInstanceId}&reason=" onclick="return promptx('作废原因',this.href);">作废</a>
+								</shiro:hasPermission>&nbsp;
+							</td>
+						</tr>
+					</c:forEach>
+					</tbody>
+				</table>
+
+				<!-- 分页代码 -->
+				<table:page page="${page}"></table:page>
+				<div style="clear: both;"></div>
 			</div>
-		<div class="pull-right">
-			<button  class="btn btn-primary btn-rounded btn-outline btn-sm " onclick="search()" ><i class="fa fa-search"></i> 查询</button>
-			<button  class="btn btn-primary btn-rounded btn-outline btn-sm " onclick="reset()" ><i class="fa fa-refresh"></i> 重置</button>
 		</div>
-	</div>
-	</div>
-	
-	
-		<!-- 表格 -->
-	<table id="contentTable" class="table table-striped table-bordered table-hover table-condensed dataTables-example dataTable">
-		<thead>
-			<tr>
-				<th>流程发起人</th>
-				<th>执行ID</th>
-				<th>流程实例ID</th>
-				<th>流程定义ID</th>
-				<th>流程启动时间</th>
-				<th>流程结束时间</th>
-				<th>流程状态</th>
-				<th>操作</th>
-			</tr>
-		</thead>
-		<tbody>
-			<c:forEach items="${page.list}" var="procIns">
-				<tr>
-					<td>${procIns.startUserId}</td>
-					<td>${procIns.id}</td>
-					<td>${procIns.processInstanceId}</td>
-					<td>${procIns.processDefinitionId}</td>
-					<td><fmt:formatDate value="${procIns.startTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-					<td><fmt:formatDate value="${procIns.endTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-					<td><c:if test="${procIns.deleteReason != null}">[流程作废]原因:${procIns.deleteReason}</c:if>  <c:if test="${procIns.deleteReason == null}">[正常结束]</c:if></td>
-					<td>
-						<a  href="javascript:openDialog('查看流程历史','${ctx}/act/task/trace/photo/${procIns.processDefinitionId}/${procIns.id}','1000px', '600px')">历史</a>
-						
-					</td>
-				</tr>
-			</c:forEach>
-		</tbody>
-	</table>
-			<!-- 分页代码 -->
-	<table:page page="${page}"></table:page>
-	<br/>
-	<br/>
-	</div>
 	</div>
 </div>
 </body>

+ 119 - 135
src/main/webapp/webpage/modules/act/actProcessList.jsp

@@ -2,42 +2,46 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>流程管理</title>
+	<title>项目登记</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript">
-		$(document).ready(function(){
-			top.$.jBox.tip.mess = null;
+		$(document).ready(function() {
 		});
 		function updateCategory(id, category){
 			layer.open({
-				  type: 1, 
-				  title:"设置分类",
-				  area: ['350px', '200px'],
-				  content: $("#categoryBox").html() //这里content是一个普通的String
-				});
+				type: 1,
+				title:"设置分类",
+				area: ['350px', '200px'],
+				content: $("#categoryBox").html() //这里content是一个普通的String
+			});
 			$("#categoryBoxId").val(id);
 			$("#categoryBoxCategory").val(category);
 		}
+
+		function reset() {
+			$("#searchForm").resetForm();
+		}
 	</script>
+
 	<script type="text/template" id="categoryBox">
 		<form id="categoryForm" action="${ctx}/act/process/updateCategory" method="post" enctype="multipart/form-data"
-			style="text-align:center;" onsubmit="loading('正在设置,请稍等...');"><br/>
-			
+			  style="text-align:center;" onsubmit="loading('正在设置,请稍等...');"><br/>
+
 			<div class="col-md-12">
-   			<div class="form-group">
-        		<label class="col-sm-3 control-label">选择分类:</label>
-       			<div class="col-sm-9">
+				<div class="form-group">
+					<label class="col-sm-3 control-label">选择分类:</label>
+					<div class="col-sm-9">
+
+						<input id="categoryBoxId" type="hidden" name="procDefId" value="" />
+						<select id="categoryBoxCategory" name="category" class="form-control">
+							<c:forEach items="${fns:getDictList('act_category')}" var="dict">
+								<option value="${dict.value}">${dict.label}</option>
+							</c:forEach>
+						</select>
+					</div>
+				</div>
+			</div>
 
-			<input id="categoryBoxId" type="hidden" name="procDefId" value="" />
-			<select id="categoryBoxCategory" name="category" class="form-control">
-				<c:forEach items="${fns:getDictList('act_category')}" var="dict">
-					<option value="${dict.value}">${dict.label}</option>
-				</c:forEach>
-			</select>
-				 </div>
-   			 </div>
-			</div>	
-			
 			<br/>
 			<br/> 
 			<br/> 
@@ -46,121 +50,101 @@
 		</form>
 	</script>
 </head>
-<body class="gray-bg">
-	<div class="wrapper wrapper-content">
-	<div class="ibox">
-	<%--<div class="ibox-title">
-		<h5>流程管理 </h5>
-		<div class="ibox-tools">
-			<a class="collapse-link">
-				<i class="fa fa-chevron-up"></i>
-			</a>
-			<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">
-				<i class="fa fa-wrench"></i>
-			</a>
-			<ul class="dropdown-menu dropdown-user">
-				<li><a href="javascript:void(0)">选项1</a>
-				</li>
-				<li><a href="javascript:void(0)">选项2</a>
-				</li>
-			</ul>
-			<a class="close-link">
-				<i class="fa fa-times"></i>
-			</a>
-		</div>
-	</div>--%>
-    
-    <div class="ibox-content">
+<body>
+<div class="wrapper wrapper-content">
 	<sys:message content="${message}"/>
-	
-	<!--查询条件-->
-	<div class="row">
-	<div class="col-sm-12">
-	<form:form id="searchForm" modelAttribute="category" action="${ctx}/act/process/" method="post" class="form-inline">
-		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-		<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
-		<a href="#" id="moresee" class="fa fa-chevron-down" style="float: right;">更多</a>
-		<div class="form-group">
-			<select id="category" name="category" class="form-control">
-			<option value="">全部分类</option>
-			<c:forEach items="${fns:getDictList('act_category')}" var="dict">
-				<option value="${dict.value}" ${dict.value==category?'selected':''}>${dict.label}</option>
-			</c:forEach>
-		</select>
-		 </div>	
-	</form:form>
-	<br/>
-	</div>
-	</div>
-	
-		<!-- 工具栏 -->
-	<div class="row">
-	<div class="col-sm-12">
-		<div class="pull-left">
-			<!--<shiro:hasPermission name="act:process:deploy">-->	<!--</shiro:hasPermission>-->
-				<table:addRow url="${ctx}/act/process/deploy/"  label="上传流程文件" title="流程"></table:addRow><!-- 增加按钮 -->
-		
-	       <button class="btn btn-white btn-sm " data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i> 刷新</button>
-		
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="category" action="${ctx}/act/process/" method="post" class="form-inline">
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+
+					<div class="commonQuery lw6">
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">流程分类:</label>
+							<div class="layui-input-block">
+								<select id="category" name="category" class=" form-control  simple-select">
+									<option value="" label="全部分类"/>
+									<c:forEach items="${fns:getDictList('act_category')}" var="dict">
+										<option value="${dict.value}" ${dict.value==category?'selected':''}>${dict.label}</option>
+									</c:forEach>
+								</select>
+							</div>
+						</div>
+						<div class="layui-item athird">
+							<div class="input-group">
+								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
+								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="layui-form contentDetails contentShadow shadowLBR">
+				<div class="nav-btns">
+					<shiro:hasPermission name="act:model:create">
+						<table:addRow url="${ctx}/act/model/create"  title="新建模型"></table:addRow><!-- 增加按钮 -->
+					</shiro:hasPermission>
+					<shiro:hasPermission name="act:model:del">
+						<table:delRow url="${ctx}/act/model/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->
+					</shiro:hasPermission>
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div style="clear: both;"></div>
+				</div>
+
+				<table id="contentTable" class="table table-striped table-bordered table-hover table-condensed dataTables-example dataTable">
+					<thead>
+					<tr>
+						<th>流程分类</th>
+						<th>流程ID</th>
+						<th>流程标识</th>
+						<th>流程名称</th>
+						<th>流程版本</th>
+						<th>流程XML</th>
+						<th>流程图片</th>
+						<th>部署时间</th>
+						<th>操作</th>
+					</tr>
+					</thead>
+					<tbody>
+					<c:forEach items="${page.list}" var="object">
+						<c:set var="process" value="${object[0]}" />
+						<c:set var="deployment" value="${object[1]}" />
+						<tr>
+							<td><a href="javascript:updateCategory('${process.id}', '${process.category}')" title="设置分类">${fns:getDictLabel(process.category,'act_category','无分类')}</a></td>
+							<td>${process.id}</td>
+							<td>${process.key}</td>
+							<td>${process.name}</td>
+							<td><b title='流程版本号'>V: ${process.version}</b></td>
+							<td><a target="_blank" href="${ctx}/act/process/resource/read?procDefId=${process.id}&resType=xml">${process.resourceName}</a></td>
+							<td><a target="_blank" href="${ctx}/act/process/resource/read?procDefId=${process.id}&resType=image">${process.diagramResourceName}</a></td>
+							<td><fmt:formatDate value="${deployment.deploymentTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+							<td>
+								<c:if test="${process.suspended}">
+									<a href="${ctx}/act/process/update/active?procDefId=${process.id}" onclick="return confirmx('确认要激活吗?', this.href)">激活</a>
+								</c:if>
+								<c:if test="${!process.suspended}">
+									<a href="${ctx}/act/process/update/suspend?procDefId=${process.id}" onclick="return confirmx('确认挂起除吗?', this.href)">挂起</a>
+								</c:if>
+								<a href='${ctx}/act/process/delete?deploymentId=${process.deploymentId}' onclick="return confirmx('确认要删除该流程吗?', this.href)">删除</a>
+								<a href='${ctx}/act/process/convert/toModel?procDefId=${process.id}' onclick="return confirmx('确认要转换为模型吗?', this.href)">转换为模型</a>
+							</td>
+						</tr>
+					</c:forEach>
+					</tbody>
+				</table>
+
+				<!-- 分页代码 -->
+				<table:page page="${page}"></table:page>
+				<div style="clear: both;"></div>
 			</div>
-		<div class="pull-right">
-			<button  class="btn btn-primary btn-rounded btn-outline btn-sm " onclick="search()" ><i class="fa fa-search"></i> 查询</button>
-			<button  class="btn btn-primary btn-rounded btn-outline btn-sm " onclick="reset()" ><i class="fa fa-refresh"></i> 重置</button>
 		</div>
-	</div>
-	</div>
-	
-	
-		<!-- 表格 -->
-	<table id="contentTable" class="table table-striped table-bordered table-hover table-condensed dataTables-example dataTable">
-		<thead>
-			<tr>
-				<th>流程分类</th>
-				<th>流程ID</th>
-				<th>流程标识</th>
-				<th>流程名称</th>
-				<th>流程版本</th>
-				<th>流程XML</th>
-				<th>流程图片</th>
-				<th>部署时间</th>
-				<th>操作</th>
-			</tr>
-		</thead>
-		<tbody>
-			<c:forEach items="${page.list}" var="object">
-				<c:set var="process" value="${object[0]}" />
-				<c:set var="deployment" value="${object[1]}" />
-				<tr>
-					<td><a href="javascript:updateCategory('${process.id}', '${process.category}')" title="设置分类">${fns:getDictLabel(process.category,'act_category','无分类')}</a></td>
-					<td>${process.id}</td>
-					<td>${process.key}</td>
-					<td>${process.name}</td>
-					<td><b title='流程版本号'>V: ${process.version}</b></td>
-					<td><a target="_blank" href="${ctx}/act/process/resource/read?procDefId=${process.id}&resType=xml">${process.resourceName}</a></td>
-					<td><a target="_blank" href="${ctx}/act/process/resource/read?procDefId=${process.id}&resType=image">${process.diagramResourceName}</a></td>
-					<td><fmt:formatDate value="${deployment.deploymentTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-					<td>
-						<c:if test="${process.suspended}">
-							<a href="${ctx}/act/process/update/active?procDefId=${process.id}" onclick="return confirmx('确认要激活吗?', this.href)">激活</a>
-						</c:if>
-						<c:if test="${!process.suspended}">
-							<a href="${ctx}/act/process/update/suspend?procDefId=${process.id}" onclick="return confirmx('确认挂起除吗?', this.href)">挂起</a>
-						</c:if>
-						<a href='${ctx}/act/process/delete?deploymentId=${process.deploymentId}' onclick="return confirmx('确认要删除该流程吗?', this.href)">删除</a>
-                        <a href='${ctx}/act/process/convert/toModel?procDefId=${process.id}' onclick="return confirmx('确认要转换为模型吗?', this.href)">转换为模型</a>
-					</td>
-				</tr>
-			</c:forEach>
-		</tbody>
-	</table>
-	
-		<!-- 分页代码 -->
-	<table:page page="${page}"></table:page>
-	<br/>
-	<br/>
-	</div>
 	</div>
 </div>
 </body>
-</html>
+</html>

+ 83 - 96
src/main/webapp/webpage/modules/act/actProcessRunningList.jsp

@@ -2,110 +2,97 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
-	<title>运行中的流程</title>
+	<title>项目登记</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript">
-		$(document).ready(function(){
-			top.$.jBox.tip.mess = null;
+		$(document).ready(function() {
 		});
+
+		function reset() {
+			$("#searchForm").resetForm();
+		}
 	</script>
 </head>
-<body class="gray-bg">
-	<div class="wrapper wrapper-content">
-	<div class="ibox">
-	<%--<div class="ibox-title">
-		<h5>运行中的流程 </h5>
-		<div class="ibox-tools">
-			<a class="collapse-link">
-				<i class="fa fa-chevron-up"></i>
-			</a>
-			<a class="dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">
-				<i class="fa fa-wrench"></i>
-			</a>
-			<ul class="dropdown-menu dropdown-user">
-				<li><a href="javascript:void(0)">选项1</a>
-				</li>
-				<li><a href="javascript:void(0)">选项2</a>
-				</li>
-			</ul>
-			<a class="close-link">
-				<i class="fa fa-times"></i>
-			</a>
-		</div>
-	</div>--%>
-    
-    <div class="ibox-content">
+<body>
+<div class="wrapper wrapper-content">
 	<sys:message content="${message}"/>
-	
-	<!--查询条件-->
-	<div class="row">
-	<div class="col-sm-12">
-	<form:form id="searchForm"  action="${ctx}/act/process/running/" method="post" class="form-inline">
-		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-		<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-		<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
-		<a href="#" id="moresee" class="fa fa-chevron-down" style="float: right;">更多</a>
-		<div class="form-group">
-			<label>流程实例ID:</label><input type="text" id="procInsId" name="procInsId" value="${procInsId}" class="form-control"/>
-			<label>流程定义Key:</label><input type="text" id="procDefKey" name="procDefKey" value="${procDefKey}" class="form-control"/>
-		</div>	
-	</form:form>
-	<br/>
-	</div>
-	</div>
-	
-		<!-- 工具栏 -->
-	<div class="row">
-	<div class="col-sm-12">
-		<div class="pull-left">
-	       <button class="btn btn-white btn-sm " data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i> 刷新</button>
-		
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="layui-row contentShadow shadowLR" id="queryDiv">
+				<form:form id="searchForm" modelAttribute="category" action="${ctx}/act/process/running/" method="post" class="form-inline">
+					<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+					<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
+					<table:sortColumn id="orderBy" name="orderBy" value="${page.orderBy}" callback="sortOrRefresh();"/><!-- 支持排序 -->
+
+					<div class="commonQuery lw6">
+						<div class="layui-item query athird">
+							<label class="layui-form-label">流程实例ID</label>
+							<div class="layui-input-block with-icon">
+								<input id="procInsId" name="procInsId" value="${procInsId}" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+						<div class="layui-item query athird">
+							<label class="layui-form-label double-line">流程定义Key</label>
+							<div class="layui-input-block with-icon">
+								<input id="procDefKey" name="procDefKey" value="${procDefKey}" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
+							</div>
+						</div>
+
+						<div class="layui-item athird">
+							<div class="input-group">
+								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
+								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							</div>
+						</div>
+						<div style="    clear:both;"></div>
+					</div>
+				</form:form>
+			</div>
+		</div>
+		<div class="full-width fl">
+			<div class="layui-form contentDetails contentShadow shadowLBR">
+				<div class="nav-btns">
+					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div style="clear: both;"></div>
+				</div>
+
+				<table id="contentTable" class="table table-striped table-bordered table-hover table-condensed dataTables-example dataTable">
+					<thead>
+					<tr>
+						<th>流程名称</th>
+						<th>执行ID</th>
+						<th>流程实例ID</th>
+						<th>流程定义ID</th>
+						<th>当前环节</th>
+						<th>是否挂起</th>
+						<th>操作</th>
+					</tr>
+					</thead>
+					<tbody>
+					<c:forEach items="${page.list}" var="procIns">
+						<tr>
+							<td>${procIns.processDefinitionName}</td>
+							<td>${procIns.id}</td>
+							<td>${procIns.processInstanceId}</td>
+							<td>${procIns.processDefinitionId}</td>
+							<td>${procIns.activityId}</td>
+							<td>${procIns.suspended}</td>
+							<td>
+								<a  href="javascript:openDialog('查看流程历史','${ctx}/act/task/trace/photo/${procIns.processDefinitionId}/${procIns.id}','1000px', '600px')">历史</a>
+								<shiro:hasPermission name="act:process:edit">
+									<a href="${ctx}/act/process/deleteProcIns?procInsId=${procIns.processInstanceId}&reason=" onclick="return promptx('作废原因',this.href);">作废</a>
+								</shiro:hasPermission>&nbsp;
+							</td>
+						</tr>
+					</c:forEach>
+					</tbody>
+				</table>
+
+				<!-- 分页代码 -->
+				<table:page page="${page}"></table:page>
+				<div style="clear: both;"></div>
 			</div>
-		<div class="pull-right">
-			<button  class="btn btn-primary btn-rounded btn-outline btn-sm " onclick="search()" ><i class="fa fa-search"></i> 查询</button>
-			<button  class="btn btn-primary btn-rounded btn-outline btn-sm " onclick="reset()" ><i class="fa fa-refresh"></i> 重置</button>
 		</div>
-	</div>
-	</div>
-	
-	
-		<!-- 表格 -->
-	<table id="contentTable" class="table table-striped table-bordered table-hover table-condensed dataTables-example dataTable">
-		<thead>
-			<tr>
-				<th>流程名称</th>
-				<th>执行ID</th>
-				<th>流程实例ID</th>
-				<th>流程定义ID</th>
-				<th>当前环节</th>
-				<th>是否挂起</th>
-				<th>操作</th>
-			</tr>
-		</thead>
-		<tbody>
-			<c:forEach items="${page.list}" var="procIns">
-				<tr>
-					<td>${procIns.processDefinitionName}</td>
-					<td>${procIns.id}</td>
-					<td>${procIns.processInstanceId}</td>
-					<td>${procIns.processDefinitionId}</td>
-					<td>${procIns.activityId}</td>
-					<td>${procIns.suspended}</td>
-					<td>
-						<a  href="javascript:openDialog('查看流程历史','${ctx}/act/task/trace/photo/${procIns.processDefinitionId}/${procIns.id}','1000px', '600px')">历史</a>
-						<shiro:hasPermission name="act:process:edit">
-							<a href="${ctx}/act/process/deleteProcIns?procInsId=${procIns.processInstanceId}&reason=" onclick="return promptx('作废原因',this.href);">作废</a>
-						</shiro:hasPermission>&nbsp;
-					</td>
-				</tr>
-			</c:forEach>
-		</tbody>
-	</table>
-			<!-- 分页代码 -->
-	<table:page page="${page}"></table:page>
-	<br/>
-	<br/>
-	</div>
 	</div>
 </div>
 </body>