共性问题：操作按钮

src/main/webapp/WEB-INF/tags/table/delRow.tag

@@ -3,7 +3,9 @@
 <%@ attribute name="id" type="java.lang.String" required="true"%>
 <%@ attribute name="url" type="java.lang.String" required="true"%>
 <%@ attribute name="label" type="java.lang.String" required="false"%>
-<button class="nav-btn nav-btn-delete" onclick="deleteAll()" data-toggle="tooltip" data-placement="top"><i class="fa fa-trash-o"> ${label==null?'删除':label}</i>
+<button class="layui-btn layui-bg-red" onclick="deleteAll()" data-toggle="tooltip" data-placement="top">
+<%--    <i class="fa fa-trash-o"> </i>--%>
+    ${label==null?'删除':label}
                         </button>
 <%-- 使用方法： 1.将本tag写在查询的form之前；2.传入table的id和controller的url --%>
 <script type="text/javascript">

src/main/webapp/WEB-INF/tags/table/editRow.tag

@@ -7,8 +7,10 @@
 <%@ attribute name="height" type="java.lang.String" required="false"%>
 <%@ attribute name="target" type="java.lang.String" required="false"%>
 <%@ attribute name="label" type="java.lang.String" required="false"%>
-<button class="nav-btn nav-btn-edit" data-toggle="tooltip" data-placement="left" onclick="edit()" title="修改"><i class="fa fa-file-text-o"></i> ${label==null?'修改':label}</button>
-                        </button>
+<button class="layui-btn layui-bg-green" data-toggle="tooltip" data-placement="left" onclick="edit()" title="修改">
+<%--    <i class="fa fa-file-text-o"></i> --%>
+    ${label==null?'修改':label}</button>
+<%--                        </button>--%>
 <%-- 使用方法： 1.将本tag写在查询的form之前；2.传入table的id和controller的url --%>
 <script type="text/javascript">
 $(document).ready(function() {

src/main/webapp/WEB-INF/tags/table/importExcelBasic.tag

@@ -2,7 +2,9 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <%@ attribute name="url" type="java.lang.String" required="true"%>
 <%-- 使用方法： 1.将本tag写在查询的form之前；2.传入controller的url --%>
-<button id="btnImport" class="nav-btn nav-btn-import" data-toggle="tooltip" data-placement="left" title="导入"><i class="fa fa-folder-open-o"></i> 导入</button>
+<button id="btnImport" class="layui-btn layui-bg-orange" data-toggle="tooltip" data-placement="left" title="导入">
+<%--	<i class="fa fa-folder-open-o"></i> --%>
+	导入</button>
 <div id="importBox" class="hide">
 	<form id="importForm2" action="${url}" method="post" enctype="multipart/form-data" onsubmit="loading('正在导入，请稍等...');">
 		<br/>

src/main/webapp/webpage/modules/ProjectFollowReport/ProjectFollowReportList.jsp

@@ -306,9 +306,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -319,9 +324,14 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-					<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--					<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>
@@ -457,7 +467,9 @@
 			if(d.pid=="0") {
 				if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增跟踪咨询报告\', \'${ctx}/project/constructionContract/followForm?project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+						'<div class=\"layui-btn-group\">'+
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增跟踪咨询报告\', \'${ctx}/project/constructionContract/followForm?project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+						+'</div>'
 					].join('');
 				}else{
 					return [
@@ -468,22 +480,34 @@
 				if(1 == d.operationSign) {
 					if(d.status == 1){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改跟踪咨询报告内容\', \'${ctx}/project/constructionContract/followForm?id='+d.id+'&project.id='+d.pid+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
-							'<a href="${ctx}/project/constructionContract/deleteFollow?project.id='+d.pid+'&id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该跟踪咨询报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改跟踪咨询报告内容\', \'${ctx}/project/constructionContract/followForm?id='+d.id+'&project.id='+d.pid+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" >  编辑</a>',
+							'<a href="${ctx}/project/constructionContract/deleteFollow?project.id='+d.pid+'&id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该跟踪咨询报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+							+'</div>'
 						].join('');
 					}else if(d.status == 2){
 						return [
-							'<a href="${ctx}/project/constructionContract/revoke?id='+d.id+'&processInstanceId='+d.processInstanceId+'" onclick="return confirmx(\'确认要撤回该跟踪咨询报告吗？\', this.href)"   class="op-btn op-btn-cancel"><i class="glyphicon glyphicon-share-alt"></i> 撤回</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="${ctx}/project/constructionContract/revoke?id='+d.id+'&processInstanceId='+d.processInstanceId+'" onclick="return confirmx(\'确认要撤回该跟踪咨询报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-blue">撤回</a>',
+
+							+'</div>'
 						].join('');
 					}else if(d.status == 3){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改跟踪咨询报告内容\', \'${ctx}/project/constructionContract/followForm?id='+d.id+'&project.id='+d.pid+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
-							'<a href="${ctx}/project/constructionContract/deleteFollow?project.id='+d.pid+'&id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该跟踪咨询报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改跟踪咨询报告内容\', \'${ctx}/project/constructionContract/followForm?id='+d.id+'&project.id='+d.pid+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" >编辑</a>',
+							'<a href="${ctx}/project/constructionContract/deleteFollow?project.id='+d.pid+'&id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该跟踪咨询报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+							+'</div>'
 						].join('');
 					}else if(d.status == 4){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreModify(\'修改跟踪咨询报告内容\', \'${ctx}/project/constructionContract/modify?id='+d.id+'&project.id='+d.pid+ '\',\''+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
-							'<a href="${ctx}/project/constructionContract/deleteFollow?project.id='+d.pid+'&id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该跟踪咨询报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreModify(\'修改跟踪咨询报告内容\', \'${ctx}/project/constructionContract/modify?id='+d.id+'&project.id='+d.pid+ '\',\''+d.id+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
+							'<a href="${ctx}/project/constructionContract/deleteFollow?project.id='+d.pid+'&id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该跟踪咨询报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+							+'</div>'
 						].join('');
 					}else if(d.status == 5){
 						return [

src/main/webapp/webpage/modules/act/actModelList.jsp

@@ -74,8 +74,12 @@
 						</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 class="layui-btn-group" style="margin-left: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<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>
@@ -86,13 +90,22 @@
 		<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 class="layui-btn-group" style="margin-left: 15px;">
+						<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="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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>
 

src/main/webapp/webpage/modules/act/actProcessHistoryList.jsp

@@ -40,8 +40,12 @@
 
 						<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 class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<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>
@@ -52,7 +56,10 @@
 		<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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>
 

src/main/webapp/webpage/modules/act/actProcessList.jsp

@@ -75,8 +75,12 @@
 						</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 class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<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>
@@ -87,10 +91,14 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<%--<shiro:hasPermission name="act:process:deploy">--%>
+					<div class="layui-btn-group" style="margin-left: 15px;">
 						<table:addRow url="${ctx}/act/process/deploy/" label="上传流程文件" title="新建模型"></table:addRow><!-- 增加按钮 -->
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+					<%--<shiro:hasPermission name="act:process:deploy">--%>
+<%--						<table:addRow url="${ctx}/act/process/deploy/" label="上传流程文件" title="新建模型"></table:addRow><!-- 增加按钮 -->--%>
 					<%--</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>
+<%--					<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>
 

src/main/webapp/webpage/modules/act/actProcessRunningList.jsp

@@ -40,8 +40,12 @@
 
 						<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 class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<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>
@@ -52,7 +56,10 @@
 		<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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>
 

src/main/webapp/webpage/modules/processProjectPlan/plan/processProjectPlanList.jsp

@@ -159,9 +159,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -206,7 +211,10 @@
 		<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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 class="oa-table layui-table" id="contentTable1"></table>
@@ -249,15 +257,16 @@
 				,{field:'createDate',align:'center', title: '创建日期',  width:80}
 				,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
 						////对操作进行初始化
-						var xml="";
+						var xml="<div class=\"layui-btn-group\">";
 						if(d.canedit3 != undefined && d.canedit3 =="1")
 						{
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/processProject/processProjectPlan/form?view=view&id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-search-plus\"></i> 详情</a>";
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/processProject/processProjectPlan/form?view=view&id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" > 详情</a>";
 						}
 						if(d.canedit4 != undefined && d.canedit4 =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/processProject/processProjectPlan/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 编辑</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/processProject/processProjectPlan/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs\" > 编辑</a>";
 						}
+						xml+="</div>"
 						return xml;
 
 					}}

src/main/webapp/webpage/modules/project/type/accrding/projectAccrdingTypeList.jsp

@@ -41,8 +41,12 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<button id="searchReset" style="margin-right: 0px;" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<div class="layui-btn-group" style="margin-left: 20px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<button id="searchReset" style="margin-right: 0px;" 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>
@@ -54,16 +58,28 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<shiro:hasPermission name="project:projectType:add">
-						<table:addRow url="${ctx}/projectType/projectType/form" title="项目内容类型"></table:addRow><!-- 增加按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="project:projectType:import">
-						<table:importExcel url="${ctx}/projectType/projectType/import"></table:importExcel><!-- 导入按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="project:projectType:export">
-						<table:exportExcel url="${ctx}/projectType/projectType/export"></table:exportExcel><!-- 导出按钮 -->
-					</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 class="layui-btn-group" style="margin-left: 15px;">
+						<shiro:hasPermission name="project:projectType:add">
+							<table:addRow url="${ctx}/projectType/projectType/form" title="项目内容类型"></table:addRow><!-- 增加按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="project:projectType:import">
+							<table:importExcel url="${ctx}/projectType/projectType/import"></table:importExcel><!-- 导入按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="project:projectType:export">
+							<table:exportExcel url="${ctx}/projectType/projectType/export"></table:exportExcel><!-- 导出按钮 -->
+						</shiro:hasPermission>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<shiro:hasPermission name="project:projectType:add">--%>
+<%--						<table:addRow url="${ctx}/projectType/projectType/form" title="项目内容类型"></table:addRow><!-- 增加按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="project:projectType:import">--%>
+<%--						<table:importExcel url="${ctx}/projectType/projectType/import"></table:importExcel><!-- 导入按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="project:projectType:export">--%>
+<%--						<table:exportExcel url="${ctx}/projectType/projectType/export"></table:exportExcel><!-- 导出按钮 -->--%>
+<%--					</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>
 
@@ -145,12 +161,18 @@
 		function complain(d){//操作中显示的内容
 			if(d.tier == 3){
 				return [
-					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('新增宜居性文件类型信息','${ctx}/project/projectAccordingType/form?view=saveSubordinateInfo&id="+d.id+"','60%', '95%');\" class=\"op-btn nav-btn-add layui-bg-green\"><i class=\"fa fa-plus layui-bg-green\"></i> 新增下级项目类型</a>",
+					'<div class=\"layui-btn-group\">'+
+					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('新增宜居性文件类型信息','${ctx}/project/projectAccordingType/form?view=saveSubordinateInfo&id="+d.id+"','60%', '95%');\" class=\"layui-btn layui-btn-xs layui-bg-green\"> 新增下级项目类型</a>",
+
+					+'</div>'
 				].join('');
 			}else if(d.tier == 4){
 				return [
-					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('修改项目类型信息','${ctx}/project/projectAccordingType/form?view=updateSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"btn btn-success btn-xs\"><i class=\"fa fa-edit\"></i> 修改</a>",
-					'<a href="${ctx}/projectType/projectType/delete?id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该项目类型信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+					'<div class=\"layui-btn-group\">'+
+					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('修改项目类型信息','${ctx}/project/projectAccordingType/form?view=updateSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"layui-btn layui-btn-xs\">修改</a>",
+					'<a href="${ctx}/projectType/projectType/delete?id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该项目类型信息吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red">删除</a>',
+
+					+'</div>'
 				].join('');
 			}
 			else{

src/main/webapp/webpage/modules/project/type/template/projectResultsFileTemplateList.jsp

@@ -41,8 +41,12 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<button id="searchReset" style="margin-right: 0px;" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<div class="layui-btn-group" style="margin-left: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<button id="searchReset" style="margin-right: 0px;" 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>
@@ -53,8 +57,10 @@
 		</div>
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
-				<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 class="nav-btns"><div class="layui-btn-group" style="margin-left: 15px;">
+					<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+				</div>
+<%--					<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>
 
@@ -136,12 +142,18 @@
 		function complain(d){//操作中显示的内容
 			if(d.tier == 3){
 				return [
-					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('新增模板文件信息','${ctx}/project/projectResultsFileTemplate/form?view=saveSubordinateInfo&id="+d.id+"','80%', '95%');\" class=\"op-btn nav-btn-add layui-bg-green\"><i class=\"fa fa-plus layui-bg-green\"></i> 新增模板文件</a>",
+					'<div class=\"layui-btn-group\">'+
+					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('新增模板文件信息','${ctx}/project/projectResultsFileTemplate/form?view=saveSubordinateInfo&id="+d.id+"','80%', '95%');\" class=\"layui-btn layui-btn-xs layui-bg-green\"> 新增模板文件</a>",
+
+					+'</div>'
 				].join('');
 			}else if(d.tier == 4){
 				return [
-					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('修改模板文件信息','${ctx}/project/projectResultsFileTemplate/form?view=updateSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"btn btn-success btn-xs\"><i class=\"fa fa-edit\"></i> 修改</a>",
-					'<a href="${ctx}/project/projectResultsFileTemplate/delete?id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该模板文件信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+					'<div class=\"layui-btn-group\">'+
+					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('修改模板文件信息','${ctx}/project/projectResultsFileTemplate/form?view=updateSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"layui-btn layui-btn-xs\"> 修改</a>",
+					'<a href="${ctx}/project/projectResultsFileTemplate/delete?id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该模板文件信息吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red">< 删除</a>',
+
+					+'</div>'
 				].join('');
 			}
 			else{

src/main/webapp/webpage/modules/projectConstruction/projectConstructionList.jsp

@@ -217,9 +217,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -230,9 +235,14 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-					<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--					<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>
@@ -388,7 +398,9 @@
 			if(d.pid=="0") {
 				if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增施工合同\', \'${ctx}/project/constructionContract/form?view=before&projectId=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+						'<div class=\"layui-btn-group\">'+
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增施工合同\', \'${ctx}/project/constructionContract/form?view=before&projectId=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs layui-bg-blue" > 新增</a>',
+						+'</div>'
 					].join('');
 				}else{
 					return [
@@ -400,8 +412,11 @@
 					if(d.status ==null){
 						//子级内容
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改施工合同内容\', \'${ctx}/project/constructionContract/form?id='+d.id+'&projectId='+d.pid+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
-							'<a href="${ctx}/project/constructionContract/delete?projectId='+d.pid+'&id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该施工合同吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改施工合同内容\', \'${ctx}/project/constructionContract/form?id='+d.id+'&projectId='+d.pid+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
+							'<a href="${ctx}/project/constructionContract/delete?projectId='+d.pid+'&id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该施工合同吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+							+'</div>'
 						].join('');
 
 					}else{

src/main/webapp/webpage/modules/projectrecord/armorForMaterials/armorForMaterialsList.jsp

@@ -180,9 +180,14 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-                                <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-                                <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group" style="float: right;margin-right: 10px;">
+                                    <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                                </div>
+<%--                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--                                <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>
@@ -193,9 +198,14 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                    <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 class="layui-btn-group" style="margin-left: 15px;">
+                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
+<%--                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--                    <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>
@@ -318,7 +328,9 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增甲供物资信息\', \'${ctx}/project/armorForMaterials/form?project.id='+d.pid+'&contract.id='+d.id+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增甲供物资信息\', \'${ctx}/project/armorForMaterials/form?project.id='+d.pid+'&contract.id='+d.id+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
@@ -326,8 +338,10 @@
             } else if (d.condition ==3){
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=armor&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=armor&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
                         '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');

src/main/webapp/webpage/modules/projectrecord/check/checkClaimList.jsp

@@ -189,9 +189,14 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-                                <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-                                <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group" style="float: right;margin-right: 10px;">
+                                    <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                                </div>
+<%--                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--                                <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>
@@ -202,9 +207,14 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                    <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 class="layui-btn-group" style="margin-left: 15px;">
+                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
+<%--                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--                    <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>
@@ -357,7 +367,10 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" >  领取报告号</a>',
+
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
@@ -365,28 +378,43 @@
             } else if (d.condition ==3){
                 if(d.status == 1){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 2){
                     return [
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="op-btn op-btn-cancel"><i class="glyphicon glyphicon-share-alt"></i> 撤回</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-blue"> 撤回</a>',
+
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 3){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" >修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red">删除</a>',
+
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 4){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs " > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 5){
                     return [''].join('');
                 }else if(d.status == null || d.status == '' || d.status == 10){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=claim&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=claim&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 复核</a>',
+
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');

src/main/webapp/webpage/modules/projectrecord/check/checkDesignList.jsp

@@ -190,9 +190,14 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-                                <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-                                <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group" style="float: right;margin-right: 10px;">
+                                    <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                                </div>
+<%--                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--                                <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>
@@ -203,10 +208,15 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
+                    <div class="layui-btn-group" style="margin-left: 15px;">
+                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
                     <%--<button class="nav-btn nav-btn-add" title="签证汇总" onclick="openVisa('签证汇总','${ctx}/project/projectVisa/form','95%','95%')"><i class="fa fa-plus"></i>&nbsp;添加</button>--%>
-                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                    <button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+<%--                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--                    <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>
@@ -359,7 +369,9 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs layui-bg-red" > 领取报告号</a>',
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
@@ -367,28 +379,40 @@
             } else if (d.condition ==3){
                 if(d.status == 1){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 2){
                     return [
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="op-btn op-btn-cancel"><i class="glyphicon glyphicon-share-alt"></i> 撤回</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-blue"> 撤回</a>',
+
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 3){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 4){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 5){
                     return [''].join('');
                 }else if(d.status == null || d.status == '' || d.status == 10){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=design&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=design&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 复核</a>',
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');

src/main/webapp/webpage/modules/projectrecord/check/checkDistributionSettlementList.jsp

@@ -189,9 +189,14 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-                                <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-                                <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group" style="float: right;margin-right: 10px;">
+                                    <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                                </div>
+<%--                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--                                <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>
@@ -202,9 +207,14 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                    <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 class="layui-btn-group" style="margin-left: 15px;">
+                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
+<%--                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--                    <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>
@@ -355,7 +365,10 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 领取报告号</a>',
+
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
@@ -363,28 +376,43 @@
             } else if (d.condition ==3){
                 if(d.status == 1){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" >  修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red">  删除</a>',
+
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 2){
                     return [
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="op-btn op-btn-cancel"><i class="glyphicon glyphicon-share-alt"></i> 撤回</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-blue"> 撤回</a>',
+
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 3){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs " > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 4){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class=" layui-btn layui-btn-xs " >  修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 5){
                     return [''].join('');
                 }else if(d.status == null || d.status == '' || d.status == 10){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=distribution&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=distribution&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 复核</a>',
+
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');

src/main/webapp/webpage/modules/projectrecord/check/checkInterimPayment.jsp

@@ -226,9 +226,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -242,9 +247,14 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-					<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--					<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="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
@@ -395,7 +405,9 @@
 
 				if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+						'<div class=\"layui-btn-group\">'+
+						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 领取报告号</a>',
+						+'</div>'
 					].join('');
 				}else{
 					return[''].join('');
@@ -404,28 +416,42 @@
 				if(1 == d.operationSign) {
 					if(d.status == 1){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+							+'</div>'
 						].join('');
 					}else if(d.status == 2){
 						return [
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="op-btn op-btn-cancel"><i class="glyphicon glyphicon-share-alt"></i> 撤回</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-blue"> 撤回</a>',
+
+							+'</div>'
 						].join('');
 					}else if(d.status == 3){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+							+'</div>'
 						].join('');
 					}else if(d.status == 4){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+							+'</div>'
+
 						].join('');
 					}else if(d.status == 5){
 						return [''].join('');
 					}else if(d.status == null || d.status == '' || d.status == 10){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=interim&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=interim&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 复核</a>',
+							+'</div>'
 						].join('');
 					}else{
 						return[''].join('');

src/main/webapp/webpage/modules/projectrecord/check/checkVisaList.jsp

@@ -190,9 +190,14 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-                                <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-                                <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group" style="float: right;margin-right: 10px;">
+                                    <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                                </div>
+<%--                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--                                <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>
@@ -203,10 +208,15 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
+                    <div class="layui-btn-group" style="margin-left: 15px;">
+                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
                     <%--<button class="nav-btn nav-btn-add" title="签证汇总" onclick="openVisa('签证汇总','${ctx}/project/projectVisa/form','95%','95%')"><i class="fa fa-plus"></i>&nbsp;添加</button>--%>
-                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                    <button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+<%--                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--                    <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>
@@ -358,7 +368,10 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 领取报告号</a>',
+
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
@@ -366,28 +379,43 @@
             } else if (d.condition ==3){
                 if(d.status == 1){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 2){
                     return [
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="op-btn op-btn-cancel"><i class="glyphicon glyphicon-share-alt"></i> 撤回</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-blue"> 撤回</a>',
+
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 3){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 4){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+                        +'</div>'
                     ].join('');
                 }else if(d.status == 5){
                     return [''].join('');
                 }else if(d.status == null || d.status == '' || d.status == 10){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=visa&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=visa&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" >  复核</a>',
+
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');

src/main/webapp/webpage/modules/projectrecord/claim/projectClaimList.jsp

@@ -180,9 +180,14 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-                                <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-                                <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group" style="float: right;margin-right: 10px;">
+                                    <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                                </div>
+<%--                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--                                <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>
@@ -193,9 +198,14 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                    <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 class="layui-btn-group" style="margin-left: 15px;">
+                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
+<%--                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--                    <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>
@@ -338,7 +348,9 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增索赔内容\', \'${ctx}/project/projectClaim/form?type=3&project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增索赔内容\', \'${ctx}/project/projectClaim/form?type=3&project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class=" layui-btn layui-btn-xs" > 新增</a>',
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
@@ -347,8 +359,10 @@
                 if(1 == d.operationSign) {
                     if(d.status =="10"){
                         return [
-                            '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改索赔信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=claim&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                            '<div class=\"layui-btn-group\">'+
+                            '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改索赔信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=claim&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class=" layui-btn layui-btn-xs" > 编辑</a>',
                             '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+                            +'</div>'
                         ].join('');
                     }else{
                         return[''].join('');

src/main/webapp/webpage/modules/projectrecord/concealProject/concealProjectList.jsp

@@ -181,9 +181,14 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-                                <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-                                <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group" style="float: right;margin-right: 10px;">
+                                    <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                                </div>
+<%--                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--                                <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>
@@ -194,9 +199,14 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                    <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 class="layui-btn-group" style="margin-left: 15px;">
+                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
+<%--                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--                    <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>
@@ -319,7 +329,9 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增隐蔽工程量\', \'${ctx}/project/concealProject/form?project.id='+d.pid+'&contract.id='+d.id+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增隐蔽工程量\', \'${ctx}/project/concealProject/form?project.id='+d.pid+'&contract.id='+d.id+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
@@ -327,8 +339,10 @@
             } else if (d.condition ==3){
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=conceal&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=conceal&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
                         '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');

src/main/webapp/webpage/modules/projectrecord/contractMaterial/materialList.jsp

@@ -181,9 +181,14 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-                                <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-                                <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group" style="float: right;margin-right: 10px;">
+                                    <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                                </div>
+<%--                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--                                <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>
@@ -194,9 +199,14 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                    <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 class="layui-btn-group" style="margin-left: 15px;">
+                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
+<%--                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--                    <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>
@@ -319,7 +329,9 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/contractMaterial/form?project.id='+d.pid+'&contract.id='+d.id+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/contractMaterial/form?project.id='+d.pid+'&contract.id='+d.id+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
@@ -327,8 +339,10 @@
             } else if (d.condition ==3){
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=material&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改隐蔽工程量信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=material&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
                         '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');

src/main/webapp/webpage/modules/projectrecord/distributionSettlement/distributionSettlementList.jsp

@@ -180,9 +180,14 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-                                <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-                                <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group" style="float: right;margin-right: 10px;">
+                                    <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                                </div>
+<%--                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--                                <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>
@@ -193,9 +198,14 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                    <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 class="layui-btn-group" style="margin-left: 15px;">
+                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
+<%--                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--                    <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>
@@ -318,7 +328,9 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增分布结算信息\', \'${ctx}/project/distributionSettlement/form?project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增分布结算信息\', \'${ctx}/project/distributionSettlement/form?project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
@@ -327,8 +339,10 @@
                 if(1 == d.operationSign) {
                     if(d.status =="10"){
                         return [
-                            '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改分布结算信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=distribution&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                            '<div class=\"layui-btn-group\">'+
+                            '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改分布结算信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=distribution&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs"" > 编辑</a>',
                             '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+                            +'</div>'
                         ].join('');
                     }else{
                         return[''].join('');

src/main/webapp/webpage/modules/projectrecord/implementCompletion/projectCompletionReviewList.jsp

@@ -196,9 +196,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -224,9 +229,14 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-					<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--					<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>
@@ -377,7 +387,9 @@
 			if(d.pid=="0") {
 				if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+						'<div class=\"layui-btn-group\">'+
+						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 领取报告号</a>',
+						+'</div>'
 					].join('');
 				}else{
 					return [
@@ -389,22 +401,34 @@
 
 					if(d.status == 1){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=completion&flag=edit&dictType=${dictType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=completion&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=completion&flag=edit&dictType=${dictType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=completion&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+							+'</div>'
 						].join('');
 					}else if(d.status == 2){
 						return [
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="op-btn op-btn-cancel"><i class="glyphicon glyphicon-share-alt"></i> 撤回</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-blue">  撤回</a>',
+
+							+'</div>'
 						].join('');
 					}else if(d.status == 3){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=completion&flag=edit&dictType=${dictType}&id='+d.contentPId+'&parentIds=${parentIds}&reportType=${reportType}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=accocompletionrding&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=completion&flag=edit&dictType=${dictType}&id='+d.contentPId+'&parentIds=${parentIds}&reportType=${reportType}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=accocompletionrding&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+							+'</div>'
 						].join('');
 					}else if(d.status == 4){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=completion&dictType=${dictType}&id='+d.contentPId+'&parentIds=${parentIds}&reportType=${reportType}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=completion&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=completion&dictType=${dictType}&id='+d.contentPId+'&parentIds=${parentIds}&reportType=${reportType}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=completion&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+
+							+'</div>'
 						].join('');
 					}else if(d.status == 5){
 						return [
@@ -412,7 +436,10 @@
 						].join('');
 					}else if(d.status == null || d.status == '' || d.status == 10){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectCompletionReview/reviewForm?condition=completion&reportType=${reportType}&view=report&dictType='+d.dictType+'&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectCompletionReview/reviewForm?condition=completion&reportType=${reportType}&view=report&dictType='+d.dictType+'&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 复核</a>',
+
+							+'</div>'
 						].join('');
 					}else{
 						return[''].join('');

src/main/webapp/webpage/modules/projectrecord/implementCompletion/projectImplementCompletionList.jsp

@@ -196,9 +196,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -224,9 +229,14 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-					<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--					<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>
@@ -375,7 +385,10 @@
 			if(d.pid=="0") {
 				if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/projectImplementCompletion/form?view=before&dictType=&parentIds=&projectContentId='+d.projectContentId+'&projectContentData.name='+d.projectName+'&project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+						'<div class=\"layui-btn-group\">'+
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/projectImplementCompletion/form?view=before&dictType=&parentIds=&projectContentId='+d.projectContentId+'&projectContentData.name='+d.projectName+'&project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+
+						+'</div>'
 					].join('');
 				}else{
 					return [
@@ -387,8 +400,11 @@
 					if(d.status ==null){
 						//子级内容
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工作内容\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=complement&flag=modify&dictType=&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工作内容\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=complement&flag=modify&dictType=&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
 							'<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+
+							+'</div>'
 							/*'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.id+'&id='+d.contentPId+'&type=8&condition=record" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',*/
 						].join('');
 

src/main/webapp/webpage/modules/projectrecord/implementEarly/projectEarlyPigeonholeList.jsp

@@ -196,9 +196,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -224,9 +229,14 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-					<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--					<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>
@@ -387,26 +397,36 @@
 				if(1 == d.operationSign) {
 					if(d.status == 1){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改归档信息\', \'${ctx}/projectcontentinfo/projectReportRecord/form?condition=earlyArchive&id='+d.recordId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectReportRecord/delete?condition=earlyArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要删除该归档信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改归档信息\', \'${ctx}/projectcontentinfo/projectReportRecord/form?condition=earlyArchive&id='+d.recordId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectReportRecord/delete?condition=earlyArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要删除该归档信息吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+							+'</div>'
 						].join('');
 					}else if(d.status == 2){
 						return [
-							'<a href="${ctx}/projectcontentinfo/projectReportRecord/cancelInvalidate?condition=earlyArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要撤回该归档信息吗？\', this.href)"   class="op-btn op-btn-cancel"><i class="glyphicon glyphicon-share-alt"></i> 撤回</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="${ctx}/projectcontentinfo/projectReportRecord/cancelInvalidate?condition=earlyArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要撤回该归档信息吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-blue"> 撤回</a>',
+							+'</div>'
 						].join('');
 					}else if(d.status == 3){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改归档信息\', \'${ctx}/projectcontentinfo/projectReportRecord/form?condition=earlyArchive&id='+d.recordId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectReportRecord/delete?condition=earlyArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要删除该归档信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改归档信息\', \'${ctx}/projectcontentinfo/projectReportRecord/form?condition=earlyArchive&id='+d.recordId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectReportRecord/delete?condition=earlyArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要删除该归档信息吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+							+'</div>'
 						].join('');
 					}else if(d.status == 4){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改归档信息\', \'${ctx}/projectcontentinfo/projectReportRecord/form?condition=earlyArchive&view=modiftApply&id='+d.recordId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectReportRecord/delete?condition=earlyArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要删除该归档信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改归档信息\', \'${ctx}/projectcontentinfo/projectReportRecord/form?condition=earlyArchive&view=modiftApply&id='+d.recordId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectReportRecord/delete?condition=earlyArchive&id='+d.recordId+'" onclick="return confirmx(\'确认要删除该归档信息吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+							+'</div>'
 						].join('');
 					}else if(d.status == null || d.status == '' || d.status == 10){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'归档\', \'${ctx}/projectcontentinfo/projectReportRecord/formEarly?report.id='+d.reportId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 归档</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'归档\', \'${ctx}/projectcontentinfo/projectReportRecord/formEarly?report.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-blue" > 归档</a>',
+							+'</div>'
 						].join('');
 					}else{
 						return[''].join('');

src/main/webapp/webpage/modules/projectrecord/implementEarly/projectEarlyReviewList.jsp

@@ -217,9 +217,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -245,9 +250,14 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-					<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--					<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>
@@ -399,7 +409,9 @@
 			if(d.pid=="0") {
 				if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 领取报告号</a>',
+						'<div class=\"layui-btn-group\">'+
+						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 领取报告号</a>',
+						+'</div>'
 					].join('');
 				}else{
 					return [
@@ -412,22 +424,30 @@
 
 					if(d.status == 1){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogres(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+							+'</div>'
 						].join('');
 					}else if(d.status == 2){
 						return [
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="op-btn op-btn-cancel"><i class="glyphicon glyphicon-share-alt"></i> 撤回</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-blue"> 撤回</a>',
+							+'</div>'
 						].join('');
 					}else if(d.status == 3){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=report&condition=according&flag=edit&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+							+'</div>'
 						].join('');
 					}else if(d.status == 4){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>',
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改报告\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportModify&flag=edit&condition=according&dictType=${dictType}&reportType=${reportType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'&projectId='+d.projectId+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 修改</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.reportId+'&condition=according&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
+							+'</div>'
 						].join('');
 					}else if(d.status == 5){
 						return [
@@ -435,7 +455,9 @@
 						].join('');
 					}else if(d.status == null || d.status == '' || d.status == 10){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectEarlyReview/reviewForm?view=report&condition=according&dictType='+d.dictType+'&reportType=${reportType}&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectEarlyReview/reviewForm?view=report&condition=according&dictType='+d.dictType+'&reportType=${reportType}&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-blue" > 复核</a>',
+							+'</div>'
 						].join('');
 					}else{
 						return[''].join('');

src/main/webapp/webpage/modules/projectrecord/implementEarly/projectImplementEarlyList.jsp

@@ -218,9 +218,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 20px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -246,9 +251,14 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-					<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--					<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>
@@ -397,7 +407,9 @@
 			if(d.pid=="0") {
 				if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/projectImplementEarly/form?view=before&dictType=&parentIds=&projectContentData.name='+d.projectName+'&projectContentId='+d.projectContentId+'&project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+						'<div class=\"layui-btn-group\">'+
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/projectImplementEarly/form?view=before&dictType=&parentIds=&projectContentData.name='+d.projectName+'&projectContentId='+d.projectContentId+'&project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+						+'</div>'
 					].join('');
 				}else{
 					return [
@@ -409,9 +421,11 @@
 					if(d.status ==null){
 						//子级内容
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工作内容\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=early&flag=modify&dictType=&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工作内容\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=early&flag=modify&dictType=&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
 							'<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
 							/*'<a href="${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+d.id+'&id='+d.contentPId+'&type=8&condition=record" onclick="return confirmxRefresh(\'确认要删除该工作内容报告吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',*/
+							+'</div>'
 						].join('');
 
 					}else{

src/main/webapp/webpage/modules/projectrecord/implementStage/projectDesignList.jsp

@@ -181,9 +181,14 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-                                <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-                                <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group" style="float: right;margin-right: 10px;">
+                                    <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                                </div>
+<%--                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--                                <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>
@@ -194,10 +199,15 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
+                    <div class="layui-btn-group" style="margin-left: 15px;">
+                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
                     <%--<button class="nav-btn nav-btn-add" title="签证汇总" onclick="openVisa('签证汇总','${ctx}/project/projectVisa/form','95%','95%')"><i class="fa fa-plus"></i>&nbsp;添加</button>--%>
-                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                    <button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+<%--                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--                    <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>
@@ -340,7 +350,9 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增设计变更内容\', \'${ctx}/project/projectDesignChange/form?type=2&project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增设计变更内容\', \'${ctx}/project/projectDesignChange/form?type=2&project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
@@ -349,8 +361,10 @@
                 if(1 == d.operationSign) {
                     if(d.status =="10"){
                         return [
-                            '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改设计变更信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=design&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                            '<div class=\"layui-btn-group\">'+
+                            '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改设计变更信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=design&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
                             '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+                            +'</div>'
                         ].join('');
                     }else{
                         return[''].join('');

src/main/webapp/webpage/modules/projectrecord/implementStage/projectInterimPaymentList.jsp

@@ -217,9 +217,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -233,9 +238,14 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-					<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--					<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="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
@@ -411,7 +421,9 @@
 
 				if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工程进度款信息\', \'${ctx}/project/projectInterimPayment/form?project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+							'<div class=\"layui-btn-group\">'+
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工程进度款信息\', \'${ctx}/project/projectInterimPayment/form?project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs layui-bg-blue" > 新增</a>',
+							+'</div>'
 					].join('');
 				}else{
 					return[''].join('');
@@ -420,9 +432,11 @@
 				if(1 == d.operationSign) {
 					if(d.status =="10"){
 						return [
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工程进度款信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=interim&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+							'<div class=\"layui-btn-group\">'+
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工程进度款信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=interim&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
 							'<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
 							/*'<a href="${ctx}/project/projectInterimPayment/deleteInterimPayment?id='+d.id+'" onclick="return confirmx(\'确认要删除该甲供物资信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',*/
+							+'</div>'
 						].join('');
 					}else{
 						return[''].join('');

src/main/webapp/webpage/modules/projectrecord/implementStage/projectVisaList.jsp

@@ -181,9 +181,14 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-                                <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-                                <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group" style="float: right;margin-right: 10px;">
+                                    <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                                </div>
+<%--                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--                                <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>
@@ -208,10 +213,15 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
+                    <div class="layui-btn-group" style="margin-left: 15px;">
+                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
                     <%--<button class="nav-btn nav-btn-add" title="签证汇总" onclick="openVisa('签证汇总','${ctx}/project/projectVisa/form','95%','95%')"><i class="fa fa-plus"></i>&nbsp;添加</button>--%>
-                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                    <button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+<%--                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--                    <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>
@@ -335,7 +345,9 @@
             } else if(d.condition ==2) {
                 if(1 == d.operationSign) {
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增签证内容\', \'${ctx}/project/projectVisa/form?type=1&project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增签证内容\', \'${ctx}/project/projectVisa/form?type=1&project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+                        +'</div>'
                     ].join('');
                 }else{
                     return[''].join('');
@@ -344,8 +356,10 @@
                 if(1 == d.operationSign) {
                     if(d.status =="10"){
                     return [
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改签证信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=visa&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+                        '<div class=\"layui-btn-group\">'+
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改签证信息\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=visa&flag=modify&dictType=${dictType}&infoId='+d.id+'&id='+d.contentPId+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
                         '<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
+                        +'</div>'
                     ].join('');
                     } else {
                         return[''].join('');

src/main/webapp/webpage/modules/projectrecord/monthly/monthlyConsultationReportList.jsp

@@ -196,9 +196,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -224,9 +229,14 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-					<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--					<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>
@@ -350,7 +360,9 @@
 			if(d.pid=="0") {
 				if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/monthlyConsultationReport/form?view=before&dictType=&parentIds=&projectContentId='+d.projectContentId+'&project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+						'<div class=\"layui-btn-group\">'+
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/monthlyConsultationReport/form?view=before&dictType=&parentIds=&projectContentId='+d.projectContentId+'&project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" >新增</a>',
+						+'</div>'
 					].join('');
 				}else{
 					return [
@@ -362,8 +374,10 @@
 					if(d.status ==null){
 						//子级内容
 						return [
+							'<div class=\"layui-btn-group\">'+
 							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工作内容\', \'${ctx}/project/monthlyConsultationReport/form?dictType=&id='+d.id+'&project.id='+d.pid+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
 							'<a href="${ctx}/project/monthlyConsultationReport/delete?id='+d.id+'" onclick="return confirmx(\'确认要删除该月报信息吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>',
+							+'</div>'
 						].join('');
 
 					}else{

src/main/webapp/webpage/modules/projectrecord/projectRecordUsersList.jsp

@@ -61,9 +61,14 @@
 							</div>
 							<div class="layui-item athird">
 								<div class="input-group">
-									<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-									<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-									<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+									<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+									<div class="layui-btn-group" style="float: right;margin-right: 20px;">
+										<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+										<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+									</div>
+<%--									<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--									<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>
@@ -94,8 +99,11 @@
 			</div>
 			<div class="full-width fl">
 				<div class="contentShadow layui-form contentDetails">
-					<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 class="nav-btns">'
+						<div class="layui-btn-group" style="margin-left: 15px;">
+							<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						</div>
+<%--						<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 class="oa-table layui-table" id="contentTable1"></table>
@@ -141,11 +149,12 @@
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{field:"op",align:'center',title:"操作",width:70,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
                         if(d.signature != undefined && d.signature =="1"){
-                            xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogView('项目成员管理', '${ctx}/project/projectRecordUsers/form?id=" + d.id +"','95%', '95%')\" class=\"op-btn op-btn-edit\" > 进入</a>";
+                            xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogView('项目成员管理', '${ctx}/project/projectRecordUsers/form?id=" + d.id +"','95%', '95%')\" class=\"layui-btn layui-btn-xs\" > 进入</a>";
                         }
-                        return xml;
+						xml+="</div>"
+						return xml;
                     }}
             ]]
             ,data: [

src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterList.jsp

@@ -144,9 +144,14 @@
 								</div>
 							<div class="layui-item athird">
 								<div class="input-group">
-									<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-									<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-									<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+									<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+									<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+										<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+										<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+									</div>
+<%--									<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--									<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>
@@ -184,7 +189,10 @@
 			<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 class="layui-btn-group" style="margin-left: 15px;">
+							<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						</div>
+<%--						<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 class="oa-table layui-table" id="contentTable1"></table>
@@ -241,27 +249,28 @@
                         }}
                     ,{align:'center',title:"操作",width:130,templet:function(d){
                             ////对操作进行初始化
-                            var xml="";
+                            var xml="<div class=\"layui-btn-group\">";
                             if(d.canedit1 != undefined && d.canedit1 =="1")
                             {
-                                xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/project/projectRecordsAlter/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                                xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/project/projectRecordsAlter/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                             }
                             if(d.canedit2 != undefined && d.canedit2 =="1")
                             {
-                                xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecordsAlter/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                                xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecordsAlter/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                             }
                             if(d.canrecall != undefined && d.canrecall =="1")
                             {
-                                xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecordsAlter/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                                xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecordsAlter/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                             }
                             if(d.candel != undefined && d.candel =="1")
                             {
-                                xml+="<a href=\"${ctx}/project/projectRecordsAlter/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+                                xml+="<a href=\"${ctx}/project/projectRecordsAlter/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
                             }
                             if(d.cancancel != undefined && d.cancancel =="1")
                             {
-                                xml+="<a href=\"${ctx}/project/projectRecordsAlter/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+                                xml+="<a href=\"${ctx}/project/projectRecordsAlter/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回</a>";
                             }
+                            xml+="</div>"
                             return xml;
 
                         }}

src/main/webapp/webpage/modules/projectrecord/projectRecordsList.jsp

@@ -240,9 +240,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -289,18 +294,30 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<shiro:hasPermission name="project:projectRecords:add">
-						<table:addRow url="${ctx}/project/projectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="project:projectRecords:del">
-						<%--<table:delRow url="${ctx}/project/projectRecords/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->--%>
-					</shiro:hasPermission>
-					<shiro:hasPermission name="project:projectRecords:export">
-						<table:exportExcel url="${ctx}/project/projectRecords/export"></table:exportExcel><!-- 导出按钮 -->
-					</shiro:hasPermission>
+					<div class="layui-btn-group" style="margin-left: 15px;">
+						<shiro:hasPermission name="project:projectRecords:add">
+							<table:addRow url="${ctx}/project/projectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="project:projectRecords:del">
+							<%--<table:delRow url="${ctx}/project/projectRecords/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->--%>
+						</shiro:hasPermission>
+						<shiro:hasPermission name="project:projectRecords:export">
+							<table:exportExcel url="${ctx}/project/projectRecords/export"></table:exportExcel><!-- 导出按钮 -->
+						</shiro:hasPermission>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<shiro:hasPermission name="project:projectRecords:add">--%>
+<%--						<table:addRow url="${ctx}/project/projectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="project:projectRecords:del">--%>
+<%--						&lt;%&ndash;<table:delRow url="${ctx}/project/projectRecords/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->&ndash;%&gt;--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="project:projectRecords:export">--%>
+<%--						<table:exportExcel url="${ctx}/project/projectRecords/export"></table:exportExcel><!-- 导出按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
 					<%--<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
 					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+<%--					<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>
@@ -360,31 +377,32 @@
                     }}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/project/projectRecords/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/project/projectRecords/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecords/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecords/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecords/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecords/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                         }
                         if(d.candel != undefined && d.candel =="1")
                         {
-                            xml+="<a href=\"${ctx}/project/projectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+                            xml+="<a href=\"${ctx}/project/projectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {
-                            xml+="<a href=\"${ctx}/project/projectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+                            xml+="<a href=\"${ctx}/project/projectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回</a>";
                         }
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {
-                            xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogre('项目变更管理', '${ctx}/project/projectRecordsAlter/form?alterBeforeRecords.id='+encodeURIComponent('" + d.id + "'),'95%','95%','','送审,暂存,关闭')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 变更</a>";
+                            xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogre('项目变更管理', '${ctx}/project/projectRecordsAlter/form?alterBeforeRecords.id='+encodeURIComponent('" + d.id + "'),'95%','95%','','送审,暂存,关闭')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" > 变更</a>";
                         }
+                        xml+="</div>"
                         return xml;
 
                     }}

src/main/webapp/webpage/modules/projectrecord/summarizing/armorProjectRecordsList.jsp

@@ -229,9 +229,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -269,7 +274,10 @@
 		<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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>
 				<table class="oa-table layui-table" id="contentTable1"></table>
 				<table:page page="${page}"></table:page>
@@ -308,12 +316,14 @@
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看甲供物资信息', '${ctx}/project/armorSummarizing/form?view=contentView&condition=interim&type=411&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看甲供物资信息', '${ctx}/project/armorSummarizing/form?view=contentView&condition=interim&type=411&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" >详情</a>"
                         /*}*/
-                        return xml;
+						xml+="</div>";
+
+						return xml;
 
                     }}
             ]]

src/main/webapp/webpage/modules/projectrecord/summarizing/claimSumamarizingProjectRecordsList.jsp

@@ -229,9 +229,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -269,7 +274,10 @@
 		<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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>
 				<table class="oa-table layui-table" id="contentTable1"></table>
 				<table:page page="${page}"></table:page>
@@ -308,12 +316,14 @@
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/claimSummarizing/form?view=contentView&condition=interim&type=46&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/claimSummarizing/form?view=contentView&condition=interim&type=46&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" > 详情</a>"
                         /*}*/
-                        return xml;
+						xml+="</div>";
+
+						return xml;
 
                     }}
             ]]

src/main/webapp/webpage/modules/projectrecord/summarizing/concealProjectRecordsList.jsp

@@ -229,9 +229,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -269,7 +274,10 @@
 		<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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>
 				<table class="oa-table layui-table" id="contentTable1"></table>
 				<table:page page="${page}"></table:page>
@@ -308,12 +316,14 @@
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看隐蔽工程量信息', '${ctx}/project/concealSummarizing/form?view=contentView&condition=interim&type=410&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看隐蔽工程量信息', '${ctx}/project/concealSummarizing/form?view=contentView&condition=interim&type=410&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" >详情</a>"
                         /*}*/
-                        return xml;
+						xml+="</div>";
+
+						return xml;
 
                     }}
             ]]

src/main/webapp/webpage/modules/projectrecord/summarizing/designSumamarizingProjectRecordsList.jsp

@@ -229,9 +229,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -269,7 +274,12 @@
 		<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 class="layui-btn-group" style="margin-left: 15px;">
+<%--						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>--%>
+<%--						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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>
 				<table class="oa-table layui-table" id="contentTable1"></table>
 				<table:page page="${page}"></table:page>
@@ -308,11 +318,12 @@
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/designSummarizing/form?view=contentView&condition=interim&type=43&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/designSummarizing/form?view=contentView&condition=interim&type=43&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" >详情</a>"
                         /*}*/
+						xml+="</div>";
                         return xml;
 
                     }}

src/main/webapp/webpage/modules/projectrecord/summarizing/distributionSumamarizingProjectRecordsList.jsp

@@ -229,9 +229,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -269,7 +274,10 @@
 		<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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>
 				<table class="oa-table layui-table" id="contentTable1"></table>
 				<table:page page="${page}"></table:page>
@@ -308,12 +316,14 @@
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/distributionSummarizing/form?view=contentView&condition=interim&type=412&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/distributionSummarizing/form?view=contentView&condition=interim&type=412&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" > 详情</a>"
                         /*}*/
-                        return xml;
+						xml+="</div>";
+
+						return xml;
 
                     }}
             ]]

src/main/webapp/webpage/modules/projectrecord/summarizing/materialProjectRecordsList.jsp

@@ -229,9 +229,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -269,7 +274,10 @@
 		<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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>
 				<table class="oa-table layui-table" id="contentTable1"></table>
 				<table:page page="${page}"></table:page>
@@ -308,12 +316,14 @@
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/materialSummarizing/form?view=contentView&condition=material&type=421&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/materialSummarizing/form?view=contentView&condition=material&type=421&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" > 详情</a>"
                         /*}*/
-                        return xml;
+						xml+="</div>";
+
+						return xml;
 
                     }}
             ]]

src/main/webapp/webpage/modules/projectrecord/summarizing/sumamarizingProjectRecordsList.jsp

@@ -229,9 +229,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -269,7 +274,10 @@
 		<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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>
 				<table class="oa-table layui-table" id="contentTable1"></table>
 				<table:page page="${page}"></table:page>
@@ -312,11 +320,12 @@
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/interimPaymentSummarizing/form?view=contentView&condition=interim&type=420&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/interimPaymentSummarizing/form?view=contentView&condition=interim&type=420&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" >详情</a>"
                         /*}*/
+						xml+="</div>";
                         return xml;
 
                     }}

src/main/webapp/webpage/modules/projectrecord/summarizing/visaSumamarizingProjectRecordsList.jsp

@@ -229,9 +229,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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>
@@ -269,7 +274,10 @@
 		<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 class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<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>
 				<table class="oa-table layui-table" id="contentTable1"></table>
 				<table:page page="${page}"></table:page>
@@ -308,11 +316,12 @@
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/visaSummarizing/form?view=contentView&condition=interim&type=45&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/visaSummarizing/form?view=contentView&condition=interim&type=45&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" > 详情</a>"
                         /*}*/
+						xml+="</div>";
                         return xml;
 
                     }}

src/main/webapp/webpage/modules/serialnum/serialNumTplList.jsp

@@ -89,8 +89,12 @@
 					</div>
 					<div class="layui-item athird fr">
 						<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 class="layui-btn-group" style="float: right;margin-right: 10px;">
+								<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+							</div>
+<%--							<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>
@@ -102,11 +106,18 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<shiro:hasPermission name="serialnum:serialNumTpl:add">
-						<%--<table:addRow url="${ctx}/serialnum/serialNumTpl/form" title="编号模板"></table:addRow><!-- 增加按钮 -->--%>
-						<button class="nav-btn nav-btn-add" data-toggle="tooltip" data-placement="left" onclick="openDialogre('修改编号模板', '${ctx}/serialnum/serialNumTpl/form?id=${serialNumTpl.id}','95%', '95%','','生成模板,提交,关闭')" title="添加"><i class="fa fa-plus"></i> 添加</button>
-					</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 class="layui-btn-group" style="margin-left: 15px;">
+						<shiro:hasPermission name="serialnum:serialNumTpl:add">
+							<%--<table:addRow url="${ctx}/serialnum/serialNumTpl/form" title="编号模板"></table:addRow><!-- 增加按钮 -->--%>
+							<button class="layui-btn layui-bg-blue" data-toggle="tooltip" data-placement="left" onclick="openDialogre('修改编号模板', '${ctx}/serialnum/serialNumTpl/form?id=${serialNumTpl.id}','95%', '95%','','生成模板,提交,关闭')" title="添加"> 添加</button>
+						</shiro:hasPermission>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<shiro:hasPermission name="serialnum:serialNumTpl:add">--%>
+<%--						&lt;%&ndash;<table:addRow url="${ctx}/serialnum/serialNumTpl/form" title="编号模板"></table:addRow><!-- 增加按钮 -->&ndash;%&gt;--%>
+<%--						<button class="nav-btn nav-btn-add" data-toggle="tooltip" data-placement="left" onclick="openDialogre('修改编号模板', '${ctx}/serialnum/serialNumTpl/form?id=${serialNumTpl.id}','95%', '95%','','生成模板,提交,关闭')" title="添加"><i class="fa fa-plus"></i> 添加</button>--%>
+<%--					</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>
 
@@ -145,12 +156,20 @@
 							</td>
 							<td class="op-td text-center">
 								<div class="op-btn-box">
-                                    <shiro:hasPermission name="serialnum:serialNumTpl:edit">
-                                        <a href="javascript:void(0);" onclick="openDialogre('修改编号模板', '${ctx}/serialnum/serialNumTpl/form?id=${serialNumTpl.id}','95%', '95%','','生成模板,提交,关闭')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>
-                                    </shiro:hasPermission>
-                                    <shiro:hasPermission name="serialnum:serialNumTpl:del">
-                                        <a href="${ctx}/serialnum/serialNumTpl/delete?id=${serialNumTpl.id}" onclick="return confirmx('确认要删除该编号模板吗？', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
-                                    </shiro:hasPermission>
+									<div class="layui-btn-group">
+										<shiro:hasPermission name="serialnum:serialNumTpl:edit">
+											<a href="javascript:void(0);" onclick="openDialogre('修改编号模板', '${ctx}/serialnum/serialNumTpl/form?id=${serialNumTpl.id}','95%', '95%','','生成模板,提交,关闭')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>
+										</shiro:hasPermission>
+										<shiro:hasPermission name="serialnum:serialNumTpl:del">
+											<a href="${ctx}/serialnum/serialNumTpl/delete?id=${serialNumTpl.id}" onclick="return confirmx('确认要删除该编号模板吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>
+										</shiro:hasPermission>
+									</div>
+<%--                                    <shiro:hasPermission name="serialnum:serialNumTpl:edit">--%>
+<%--                                        <a href="javascript:void(0);" onclick="openDialogre('修改编号模板', '${ctx}/serialnum/serialNumTpl/form?id=${serialNumTpl.id}','95%', '95%','','生成模板,提交,关闭')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>--%>
+<%--                                    </shiro:hasPermission>--%>
+<%--                                    <shiro:hasPermission name="serialnum:serialNumTpl:del">--%>
+<%--                                        <a href="${ctx}/serialnum/serialNumTpl/delete?id=${serialNumTpl.id}" onclick="return confirmx('确认要删除该编号模板吗？', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>--%>
+<%--                                    </shiro:hasPermission>--%>
 								</div>
 							</td>
 						</tr>

src/main/webapp/webpage/modules/sys/areaList2.jsp

@@ -49,18 +49,20 @@
 		<td>{{d.remarks}}</td>
 		<td class="op-td text-center">
 			<div class="op-btn-box">
-				<shiro:hasPermission name="sys:area:view">
-					<a href="javascript:void(0)" onclick="openDialogView('查看区域', '${ctx}/sys/area/form?id={{d.id}}&view=1','95%','95%')" class="op-btn op-btn-view" ><i class="fa fa-search-plus"></i>  查看</a>
-				</shiro:hasPermission>
-				<shiro:hasPermission name="sys:area:edit">
-					<a href="javascript:void(0)" onclick="openDialog('修改区域', '${ctx}/sys/area/form?id={{d.id}}','95%','95%')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>
-				</shiro:hasPermission>
-				<shiro:hasPermission name="sys:area:del">
-					<a href="${ctx}/sys/area/delete?id={{d.id}}" onclick="return confirmx('要删除该区域及所有子区域项吗？', this.href)" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i> 删除</a>
-				</shiro:hasPermission>
-				<shiro:hasPermission name="sys:area:add">
-					<a href="javascript:void(0)" onclick="openDialog('添加下级区域', '${ctx}/sys/area/form?parent.id={{d.id}}','95%','95%')" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 添加下级区域</a>
-				</shiro:hasPermission>
+				<div class="layui-btn-group">
+					<shiro:hasPermission name="sys:area:view">
+						<a href="javascript:void(0)" onclick="openDialogView('查看区域', '${ctx}/sys/area/form?id={{d.id}}&view=1','95%','95%')" class="layui-btn layui-btn-xs layui-bg-green" > 查看</a>
+					</shiro:hasPermission>
+					<shiro:hasPermission name="sys:area:edit">
+						<a href="javascript:void(0)" onclick="openDialog('修改区域', '${ctx}/sys/area/form?id={{d.id}}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-blue" > 修改</a>
+					</shiro:hasPermission>
+					<shiro:hasPermission name="sys:area:del">
+						<a href="${ctx}/sys/area/delete?id={{d.id}}" onclick="return confirmx('要删除该区域及所有子区域项吗？', this.href)" class="layui-btn layui-btn-xs layui-bg-red" > 删除</a>
+					</shiro:hasPermission>
+					<shiro:hasPermission name="sys:area:add">
+						<a href="javascript:void(0)" onclick="openDialog('添加下级区域', '${ctx}/sys/area/form?parent.id={{d.id}}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-blue" > 添加下级区域</a>
+					</shiro:hasPermission>
+				</div>
 			</div>
 		</td>
 	</script>
@@ -76,9 +78,15 @@
 			<div class="row">
 				<div class="col-sm-12">
 					<div class="pull-left">
-						<shiro:hasPermission name="sys:menu:add">
-							<table:addRow url="${ctx}/sys/area/form" title="菜单"></table:addRow><!-- 增加按钮 -->
-						</shiro:hasPermission>
+						<div class="layui-btn-group" style="margin-left: 15px;">
+							<shiro:hasPermission name="sys:menu:add">
+								<table:addRow url="${ctx}/sys/area/form" title="菜单"></table:addRow><!-- 增加按钮 -->
+							</shiro:hasPermission>
+							<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						</div>
+<%--						<shiro:hasPermission name="sys:menu:add">--%>
+<%--							<table:addRow url="${ctx}/sys/area/form" title="菜单"></table:addRow><!-- 增加按钮 -->--%>
+<%--						</shiro:hasPermission>--%>
 						<%--<shiro:hasPermission name="sys:menu:edit">
                             <table:editRow url="${ctx}/sys/area/form" id="treeTable"  title="菜单"></table:editRow><!-- 编辑按钮 -->
                         </shiro:hasPermission>
@@ -88,7 +96,7 @@
                         <shiro:hasPermission name="sys:menu:updateSort">
                             <button id="btnSubmit" class="btn btn-white btn-sm " data-toggle="tooltip" data-placement="left" onclick="updateSort()" title="保存排序"><i class="fa fa-save"></i> 保存排序</button>
                         </shiro:hasPermission>--%>
-						<button class="btn btn-white btn-sm " data-toggle="tooltip" data-placement="left" onclick="refresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i> 刷新</button>
+<%--						<button class="btn btn-white btn-sm " data-toggle="tooltip" data-placement="left" onclick="refresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i> 刷新</button>--%>
 
 					</div>
 				</div>

src/main/webapp/webpage/modules/sys/dictList.jsp

@@ -48,8 +48,12 @@
 					</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 class="layui-btn-group" style="float: right;margin-right: 10px;">
+								<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+							</div>
+<%--							<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>
@@ -61,16 +65,28 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<shiro:hasPermission name="sys:dict:add">
-						<table:addRow url="${ctx}/sys/dict/form" title="字典"></table:addRow><!-- 增加按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="sys:dict:edit">
-						<table:editRow url="${ctx}/sys/dict/form" id="contentTable"  title="字典"></table:editRow><!-- 编辑按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="sys:dict:del">
-						<table:delRow url="${ctx}/sys/dict/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 class="layui-btn-group" style="margin-left: 15px;">
+						<shiro:hasPermission name="sys:dict:add">
+							<table:addRow url="${ctx}/sys/dict/form" title="字典"></table:addRow><!-- 增加按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="sys:dict:edit">
+							<table:editRow url="${ctx}/sys/dict/form" id="contentTable"  title="字典"></table:editRow><!-- 编辑按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="sys:dict:del">
+							<table:delRow url="${ctx}/sys/dict/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->
+						</shiro:hasPermission>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<shiro:hasPermission name="sys:dict:add">--%>
+<%--						<table:addRow url="${ctx}/sys/dict/form" title="字典"></table:addRow><!-- 增加按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="sys:dict:edit">--%>
+<%--						<table:editRow url="${ctx}/sys/dict/form" id="contentTable"  title="字典"></table:editRow><!-- 编辑按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="sys:dict:del">--%>
+<%--						<table:delRow url="${ctx}/sys/dict/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>
 	
@@ -99,18 +115,20 @@
 							<td>${dict.sort}</td>
 							<td class="op-td text-center">
 								<div class="op-btn-box">
-								<shiro:hasPermission name="sys:dict:view">
-									<a href="javascript:void(0)" onclick="openDialogView('查看字典', '${ctx}/sys/dict/form?id=${dict.id}&view=1','95%','95%')" class="op-btn op-btn-view" ><i class="fa fa-search-plus"></i> 查看</a>
-								</shiro:hasPermission>
-								<shiro:hasPermission name="sys:dict:edit">
-									<a href="javascript:void(0)" onclick="openDialog('修改字典', '${ctx}/sys/dict/form?id=${dict.id}','95%','95%')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>
-								</shiro:hasPermission>
-								<shiro:hasPermission name="sys:dict:del">
-									<a href="${ctx}/sys/dict/delete?id=${dict.id}&type=${dict.type}" onclick="return confirmx('确认要删除该字典吗？', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
-								</shiro:hasPermission>
-								<shiro:hasPermission name="sys:dict:add">
-									<a href="javascript:void(0)" onclick="openDialog('添加键值', '<c:url value='${fns:getAdminPath()}/sys/dict/form?type=${dict.type}&sort=${dict.sort+10}'><c:param name='description' value='${dict.description}'/></c:url>','95%','95%')" class="op-btn op-btn-revert" ><i class="fa fa-plus"></i> 添加键值</a>
-								</shiro:hasPermission>
+									<div class="layui-btn-group">
+										<shiro:hasPermission name="sys:dict:view">
+											<a href="javascript:void(0)" onclick="openDialogView('查看字典', '${ctx}/sys/dict/form?id=${dict.id}&view=1','95%','95%')" class="layui-btn layui-btn-xs layui-bg-green" > 查看</a>
+										</shiro:hasPermission>
+										<shiro:hasPermission name="sys:dict:edit">
+											<a href="javascript:void(0)" onclick="openDialog('修改字典', '${ctx}/sys/dict/form?id=${dict.id}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-blue" > 修改</a>
+										</shiro:hasPermission>
+										<shiro:hasPermission name="sys:dict:del">
+											<a href="${ctx}/sys/dict/delete?id=${dict.id}&type=${dict.type}" onclick="return confirmx('确认要删除该字典吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>
+										</shiro:hasPermission>
+										<shiro:hasPermission name="sys:dict:add">
+											<a href="javascript:void(0)" onclick="openDialog('添加键值', '<c:url value='${fns:getAdminPath()}/sys/dict/form?type=${dict.type}&sort=${dict.sort+10}'><c:param name='description' value='${dict.description}'/></c:url>','95%','95%')" class="layui-btn layui-btn-xs layui-bg-green" > 添加键值</a>
+										</shiro:hasPermission>
+									</div>
 								</div>
 							</td>
 						</tr>

src/main/webapp/webpage/modules/sys/mainDictList.jsp

@@ -110,9 +110,14 @@
 					</div>
 					<div class="layui-item athird">
 						<div class="input-group">
-							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+							<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+								<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+							</div>
+<%--							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--							<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>
@@ -133,10 +138,16 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<c:if test="<%=admin%>">
+					<div class="layui-btn-group" style="margin-left: 15px;">
+						<c:if test="<%=admin%>">
 							<table:addRow url="${ctx}/sys/mainDict/form" title="字典类型"></table:addRow><!-- 增加按钮 -->
-					</c:if>
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+						</c:if>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<c:if test="<%=admin%>">--%>
+<%--							<table:addRow url="${ctx}/sys/mainDict/form" title="字典类型"></table:addRow><!-- 增加按钮 -->--%>
+<%--					</c:if>--%>
+<%--					<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>
 				<!-- 表格 -->
@@ -177,18 +188,32 @@
 							</td>
 							<td class="op-td text-center">
 								<div class="op-btn-box">
-								<a href="#" onclick="openDialogView('字典明细', '${ctx}/sys/mainDict/form?id=${mainDict.id}&view=2','95%', '95%')"   class="op-btn op-btn-submit"><i class="fa fa-edit"></i> 自定义</a>
-									<c:if test="<%=admin%>">
-										<shiro:hasPermission name="sys:mainDict:edit">
-											<a href="#" onclick="openDialog('修改字典', '${ctx}/sys/mainDict/form?id=${mainDict.id}','95%', '95%')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>
-										</shiro:hasPermission>
-										<shiro:hasPermission name="sys:mainDict:del">
-											<a href="${ctx}/sys/mainDict/delete?id=${mainDict.id}" onclick="return confirmx('确认要删除该字典吗？', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
+									<div class="layui-btn-group">
+										<a href="#" onclick="openDialogView('字典明细', '${ctx}/sys/mainDict/form?id=${mainDict.id}&view=2','95%', '95%')"   class="layui-btn layui-btn-xs layui-bg-orange"> 自定义</a>
+										<c:if test="<%=admin%>">
+											<shiro:hasPermission name="sys:mainDict:edit">
+												<a href="#" onclick="openDialog('修改字典', '${ctx}/sys/mainDict/form?id=${mainDict.id}','95%', '95%')" class="layui-btn layui-btn-xs layui-bg-blue" > 修改</a>
+											</shiro:hasPermission>
+											<shiro:hasPermission name="sys:mainDict:del">
+												<a href="${ctx}/sys/mainDict/delete?id=${mainDict.id}" onclick="return confirmx('确认要删除该字典吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red">删除</a>
+											</shiro:hasPermission>
+										</c:if>
+										<shiro:hasPermission name="sys:mainDict:view">
+											<a href="#" onclick="openDialogView('默认字典', '${ctx}/sys/mainDict/form?id=${mainDict.id}&view=1','95%', '95%')" class="layui-btn layui-btn-xs layui-bg-green" > 默认字典</a>
 										</shiro:hasPermission>
-									</c:if>
-								<shiro:hasPermission name="sys:mainDict:view">
-									<a href="#" onclick="openDialogView('默认字典', '${ctx}/sys/mainDict/form?id=${mainDict.id}&view=1','95%', '95%')" class="op-btn op-btn-revert" ><i class="fa fa-search-plus"></i> 默认字典</a>
-								</shiro:hasPermission>
+									</div>
+<%--								<a href="#" onclick="openDialogView('字典明细', '${ctx}/sys/mainDict/form?id=${mainDict.id}&view=2','95%', '95%')"   class="op-btn op-btn-submit"><i class="fa fa-edit"></i> 自定义</a>--%>
+<%--									<c:if test="<%=admin%>">--%>
+<%--										<shiro:hasPermission name="sys:mainDict:edit">--%>
+<%--											<a href="#" onclick="openDialog('修改字典', '${ctx}/sys/mainDict/form?id=${mainDict.id}','95%', '95%')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>--%>
+<%--										</shiro:hasPermission>--%>
+<%--										<shiro:hasPermission name="sys:mainDict:del">--%>
+<%--											<a href="${ctx}/sys/mainDict/delete?id=${mainDict.id}" onclick="return confirmx('确认要删除该字典吗？', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>--%>
+<%--										</shiro:hasPermission>--%>
+<%--									</c:if>--%>
+<%--								<shiro:hasPermission name="sys:mainDict:view">--%>
+<%--									<a href="#" onclick="openDialogView('默认字典', '${ctx}/sys/mainDict/form?id=${mainDict.id}&view=1','95%', '95%')" class="op-btn op-btn-revert" ><i class="fa fa-search-plus"></i> 默认字典</a>--%>
+<%--								</shiro:hasPermission>--%>
 								</div>
 							</td>
 						</tr>

src/main/webapp/webpage/modules/sys/menuList2.jsp

@@ -69,18 +69,32 @@
 		</td>
 		<td style="text-align: center">
 			<div class="btn-group">
-				<shiro:hasPermission name="sys:menu:view">
-					<a href="javascript:void(0)" style="margin-left: 2px;margin-right: 2px;" onclick="openDialogView('查看菜单', '${ctx}/sys/menu/form?id={{d.id}}','80%', '80%')" class="btn btn-info btn-xs"><i class="fa fa-search-plus"></i> 查看</a>&nbsp&nbsp
-				</shiro:hasPermission>
-				<shiro:hasPermission name="sys:menu:edit">
-					<a href="javascript:void(0)" style="margin-left: 2px;margin-right: 2px;" onclick="openDialog('修改菜单', '${ctx}/sys/menu/form?id={{d.id}}','80%', '80%')" class="btn btn-success btn-xs"><i class="fa fa-edit"></i> 修改</a>
-				</shiro:hasPermission>
-				<shiro:hasPermission name="sys:menu:del">
-					<a href="${ctx}/sys/menu/delete?id={{d.id}}" onclick="return confirmx('要删除该菜单及所有子菜单项吗？', this.href)" style="margin-left: 2px;margin-right: 2px;" class="btn btn-danger btn-xs" ><i class="fa fa-trash"></i> 删除</a>
-				</shiro:hasPermission>
-				<shiro:hasPermission name="sys:menu:add">
-					<a href="javascript:void(0)" style="margin-left: 2px;margin-right: 2px;" onclick="openDialog('添加下级菜单', '${ctx}/sys/menu/form?parent.id={{d.id}}','80%', '80%')" class="btn btn-primary btn-xs"><i class="fa fa-plus"></i> 添加下级菜单</a>
-				</shiro:hasPermission>
+				<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+					<shiro:hasPermission name="sys:menu:view">
+						<a href="javascript:void(0)" style="margin-left: 2px;margin-right: 2px;" onclick="openDialogView('查看菜单', '${ctx}/sys/menu/form?id={{d.id}}','80%', '80%')" class="layui-btn layui-btn-xs layui-bg-green"> 查看</a>&nbsp&nbsp
+					</shiro:hasPermission>
+					<shiro:hasPermission name="sys:menu:edit">
+						<a href="javascript:void(0)" style="margin-left: 2px;margin-right: 2px;" onclick="openDialog('修改菜单', '${ctx}/sys/menu/form?id={{d.id}}','80%', '80%')" class="layui-btn layui-btn-xs layui-bg-blue"> 修改</a>
+					</shiro:hasPermission>
+					<shiro:hasPermission name="sys:menu:del">
+						<a href="${ctx}/sys/menu/delete?id={{d.id}}" onclick="return confirmx('要删除该菜单及所有子菜单项吗？', this.href)" style="margin-left: 2px;margin-right: 2px;" class="layui-btn layui-btn-xs layui-bg-red" > 删除</a>
+					</shiro:hasPermission>
+					<shiro:hasPermission name="sys:menu:add">
+						<a href="javascript:void(0)" style="margin-left: 2px;margin-right: 2px;" onclick="openDialog('添加下级菜单', '${ctx}/sys/menu/form?parent.id={{d.id}}','80%', '80%')" class="layui-btn layui-btn-xs layui-bg-green"> 添加下级菜单</a>
+					</shiro:hasPermission>
+				</div>
+<%--				<shiro:hasPermission name="sys:menu:view">--%>
+<%--					<a href="javascript:void(0)" style="margin-left: 2px;margin-right: 2px;" onclick="openDialogView('查看菜单', '${ctx}/sys/menu/form?id={{d.id}}','80%', '80%')" class="btn btn-info btn-xs"><i class="fa fa-search-plus"></i> 查看</a>&nbsp&nbsp--%>
+<%--				</shiro:hasPermission>--%>
+<%--				<shiro:hasPermission name="sys:menu:edit">--%>
+<%--					<a href="javascript:void(0)" style="margin-left: 2px;margin-right: 2px;" onclick="openDialog('修改菜单', '${ctx}/sys/menu/form?id={{d.id}}','80%', '80%')" class="btn btn-success btn-xs"><i class="fa fa-edit"></i> 修改</a>--%>
+<%--				</shiro:hasPermission>--%>
+<%--				<shiro:hasPermission name="sys:menu:del">--%>
+<%--					<a href="${ctx}/sys/menu/delete?id={{d.id}}" onclick="return confirmx('要删除该菜单及所有子菜单项吗？', this.href)" style="margin-left: 2px;margin-right: 2px;" class="btn btn-danger btn-xs" ><i class="fa fa-trash"></i> 删除</a>--%>
+<%--				</shiro:hasPermission>--%>
+<%--				<shiro:hasPermission name="sys:menu:add">--%>
+<%--					<a href="javascript:void(0)" style="margin-left: 2px;margin-right: 2px;" onclick="openDialog('添加下级菜单', '${ctx}/sys/menu/form?parent.id={{d.id}}','80%', '80%')" class="btn btn-primary btn-xs"><i class="fa fa-plus"></i> 添加下级菜单</a>--%>
+<%--				</shiro:hasPermission>--%>
 			</div>
 		</td>
 	</script>
@@ -96,9 +110,15 @@
 	<div class="row">
 	<div class="col-sm-12">
 		<div class="pull-left">
-			<shiro:hasPermission name="sys:menu:add">
-				<table:addRow url="${ctx}/sys/menu/form" title="菜单"></table:addRow><!-- 增加按钮 -->
-			</shiro:hasPermission>
+			<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+				<shiro:hasPermission name="sys:menu:add">
+					<table:addRow url="${ctx}/sys/menu/form" title="菜单"></table:addRow><!-- 增加按钮 -->
+				</shiro:hasPermission>
+				<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+			</div>
+<%--			<shiro:hasPermission name="sys:menu:add">--%>
+<%--				<table:addRow url="${ctx}/sys/menu/form" title="菜单"></table:addRow><!-- 增加按钮 -->--%>
+<%--			</shiro:hasPermission>--%>
 			<%--<shiro:hasPermission name="sys:menu:edit">
 			    <table:editRow url="${ctx}/sys/menu/form" id="treeTable"  title="菜单"></table:editRow><!-- 编辑按钮 -->
 			</shiro:hasPermission>
@@ -108,7 +128,7 @@
 			<shiro:hasPermission name="sys:menu:updateSort">
 				<button id="btnSubmit" class="btn btn-white btn-sm " data-toggle="tooltip" data-placement="left" onclick="updateSort()" title="保存排序"><i class="fa fa-save"></i> 保存排序</button>
 			</shiro:hasPermission>--%>
-				<button class="btn btn-white btn-sm " data-toggle="tooltip" data-placement="left" onclick="refresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i> 刷新</button>
+<%--				<button class="btn btn-white btn-sm " data-toggle="tooltip" data-placement="left" onclick="refresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i> 刷新</button>--%>
 		
 		</div>
 	</div>

src/main/webapp/webpage/modules/sys/officeList.jsp

@@ -127,8 +127,12 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<button id="searchReset" style="margin-right: 10px;" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<button id="searchReset" style="margin-right: 10px;" 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>
@@ -139,10 +143,13 @@
 		<div class="contentShadow shadowT full-width fl" style="margin-top: 0px;">
 			<div class="layui-form contentDetails">
 				<div class="nav-btns">
+					<div class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
 					<%--<shiro:hasPermission name="sys:office:add">
 						<table:addRow url="${ctx}/sys/office/form?parent.id=${office.id}" title="机构" target=""></table:addRow><!-- 增加按钮 -->
 					</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>
+<%--					<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>
 
@@ -159,20 +166,33 @@
 						<%--<td>禁用</td>--%>
 						<td class="op-td text-center">
 							<div class="op-btn-box">
+								<div class="layui-btn-group">
+									<shiro:hasPermission name="sys:office:edit">
+										<a href="javascript:void(0)" onclick="openDialogres('修改机构', '${ctx}/sys/office/form?id={{row.id}}','95%','95%', '')" class="layui-btn layui-btn-xs layui-bg-blue" > 修改</a>
+										<a href="${ctx}/sys/office/deleteUseable?id={{row.id}}&useable=1" onclick="return confirmx('要启用该机构及所有子机构项吗？', this.href)" class="layui-btn layui-btn-xs layui-bg-blue"> 启用</a>
+									</shiro:hasPermission>
+									<shiro:hasPermission name="sys:office:del">
+										<a href="${ctx}/sys/office/deleteUseable?id={{row.id}}&useable=2" onclick="return confirmx('要禁用该机构及所有子机构项吗？', this.href)" class="layui-btn layui-btn-xs layui-bg-red">禁用</a>
+										<a href="${ctx}/sys/office/delete?id={{row.id}}" onclick="return confirmx('要删除该机构及所有子机构项吗？', this.href)" class="layui-btn layui-btn-xs layui-bg-red">删除</a>
+									</shiro:hasPermission>
+									<shiro:hasPermission name="sys:office:add">
+										<a href="javascript:void(0)" onclick="addSonNode('{{row.id}}');" class="layui-btn layui-btn-xs layui-bg-green">添加下级机构</a>
+									</shiro:hasPermission>
+								</div>
 							<%--<shiro:hasPermission name="sys:office:view">
 								<a href="javascript:void(0)" onclick="openDialogView('查看机构', '${ctx}/sys/office/form?id={{row.id}}','80%','80%')" class="btn btn-info btn-xs" ><i class="fa fa-search-plus"></i> 查看</a>
 							</shiro:hasPermission>--%>
-								<shiro:hasPermission name="sys:office:edit">
-								<a href="javascript:void(0)" onclick="openDialogres('修改机构', '${ctx}/sys/office/form?id={{row.id}}','95%','95%', '')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>
-								<a href="${ctx}/sys/office/deleteUseable?id={{row.id}}&useable=1" onclick="return confirmx('要启用该机构及所有子机构项吗？', this.href)" class="op-btn op-btn-edit"><i class="fa fa-plus"></i> 启用</a>
-							</shiro:hasPermission>
-							<shiro:hasPermission name="sys:office:del">
-								<a href="${ctx}/sys/office/deleteUseable?id={{row.id}}&useable=2" onclick="return confirmx('要禁用该机构及所有子机构项吗？', this.href)" class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 禁用</a>
-								<a href="${ctx}/sys/office/delete?id={{row.id}}" onclick="return confirmx('要删除该机构及所有子机构项吗？', this.href)" class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
-							</shiro:hasPermission>
-							<shiro:hasPermission name="sys:office:add">
-								<a href="javascript:void(0)" onclick="addSonNode('{{row.id}}');" class="op-btn  op-btn-add"><i class="fa fa-plus"></i> 添加下级机构</a>
-							</shiro:hasPermission>
+<%--								<shiro:hasPermission name="sys:office:edit">--%>
+<%--								<a href="javascript:void(0)" onclick="openDialogres('修改机构', '${ctx}/sys/office/form?id={{row.id}}','95%','95%', '')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>--%>
+<%--								<a href="${ctx}/sys/office/deleteUseable?id={{row.id}}&useable=1" onclick="return confirmx('要启用该机构及所有子机构项吗？', this.href)" class="op-btn op-btn-edit"><i class="fa fa-plus"></i> 启用</a>--%>
+<%--							</shiro:hasPermission>--%>
+<%--							<shiro:hasPermission name="sys:office:del">--%>
+<%--								<a href="${ctx}/sys/office/deleteUseable?id={{row.id}}&useable=2" onclick="return confirmx('要禁用该机构及所有子机构项吗？', this.href)" class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 禁用</a>--%>
+<%--								<a href="${ctx}/sys/office/delete?id={{row.id}}" onclick="return confirmx('要删除该机构及所有子机构项吗？', this.href)" class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>--%>
+<%--							</shiro:hasPermission>--%>
+<%--							<shiro:hasPermission name="sys:office:add">--%>
+<%--								<a href="javascript:void(0)" onclick="addSonNode('{{row.id}}');" class="op-btn  op-btn-add"><i class="fa fa-plus"></i> 添加下级机构</a>--%>
+<%--							</shiro:hasPermission>--%>
 							</div>
 						</td>
 					</tr>

src/main/webapp/webpage/modules/sys/roleList.jsp

@@ -65,8 +65,12 @@
 
 						<div class="layui-item athird fr">
 							<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 class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<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>
@@ -77,16 +81,22 @@
 		<div class="contentShadow shadowT full-width fl">
 			<div class="layui-form contentDetails">
 				<div class="nav-btns">
-					<shiro:hasPermission name="sys:role:add">
-						<table:addRow url="${ctx}/sys/role/form?office=" title="岗位"></table:addRow><!-- 增加按钮 -->
-					</shiro:hasPermission>
+					<div class="layui-btn-group" style="margin-left: 15px;">
+						<shiro:hasPermission name="sys:role:add">
+							<table:addRow url="${ctx}/sys/role/form?office=" title="岗位"></table:addRow><!-- 增加按钮 -->
+						</shiro:hasPermission>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<shiro:hasPermission name="sys:role:add">--%>
+<%--						<table:addRow url="${ctx}/sys/role/form?office=" title="岗位"></table:addRow><!-- 增加按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
 					<%--<shiro:hasPermission name="sys:role:edit">
 						<table:editRow url="${ctx}/sys/role/form" id="contentTable"  title="岗位"></table:editRow><!-- 编辑按钮 -->
 					</shiro:hasPermission>--%>
 					<%--<shiro:hasPermission name="sys:role:del">
 						<table:delRow url="${ctx}/sys/role/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>
+<%--					<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 class="oa-table layui-table" id="contentTable"></table>
@@ -125,19 +135,20 @@
                 ,{field:'dataScope', align:'center',title: '数据范围',width:160}
                 ,{field:'op',align:'center',title:"操作",width:200,templet:function(d){
                         ////对操作进行初始化
-                        var xml = "";
+                        var xml = "<div class=\"layui-btn-group\">";
                         if(d.candelete1 != undefined && d.candelete1 == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改岗位', '${ctx}/sys/role/form?id="+ d.id + "&office="+ d.officeId+"','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改岗位', '${ctx}/sys/role/form?id="+ d.id + "&office="+ d.officeId+"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         if(d.candelete2 != undefined && d.candelete2 == "1")
-                            xml +="<a href=\"${ctx}/sys/role/deleteAlls?ids=" + d.id + "\" onclick=\"return confirmx('确认要删除该岗位吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+                            xml +="<a href=\"${ctx}/sys/role/deleteAlls?ids=" + d.id + "\" onclick=\"return confirmx('确认要删除该岗位吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
                         if(d.candelete3 != undefined && d.candelete3 == "1")
                             /*xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('权限设置', '${ctx}/sys/role/auth?id="+ d.id + "&office="+ d.officeId+"','350px','500px')\" class=\"op-btn op-btn-submit\" ><i class=\"fa fa-edit\"></i> 权限设置</a>";
                             xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogView('分配用户', '${ctx}/sys/role/assign?id="+ d.id + "&office="+ d.officeId+"&office.name="+encodeURI(d.office)+"','95%','95%')\" class=\"op-btn  op-btn-add\" ><i class=\"glyphicon glyphicon-plus\"></i> 分配用户</a>";
                        		 if(d.candelete4 != undefined && d.candelete4 == "1")
                             xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('关联工作流角色', '${ctx}/sys/role/form?id="+ d.id + "&view=copy&office="+ d.officeId+"&office.name="+encodeURI(d.office)+"','80%','500px')\" class=\"op-btn op-btn-revert\" ><i class=\"fa fa-refresh\"></i> 关联角色</a>";
                         */
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogView('分配用户', '${ctx}/sys/role/assign?id="+ d.id + "&office="+ d.officeId+"&office.name="+encodeURI(d.office)+"','95%','95%')\" class=\"op-btn  op-btn-add\" ><i class=\"glyphicon glyphicon-plus\"></i> 分配用户</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogView('分配用户', '${ctx}/sys/role/assign?id="+ d.id + "&office="+ d.officeId+"&office.name="+encodeURI(d.office)+"','95%','95%')\" class=\"layui-btn  layui-btn-xs layui-bg-blue\" >分配用户</a>";
 
+						xml+="</div>";
                         return xml;
                     }}
             ]]

src/main/webapp/webpage/modules/sys/sysroleactivityList.jsp

@@ -48,8 +48,12 @@
 
 					<div class="layui-item athird fr">
 						<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 class="layui-btn-group" style="float: right;margin-right: 10px;">
+								<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+							</div>
+<%--							<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>
@@ -61,19 +65,31 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<shiro:hasPermission name="sys:sysroleactivity:add">
-						<table:addRow url="${ctx}/sys/sysroleactivity/form" title="工作流角色信息" width="95%" height="95%"></table:addRow><!-- 增加按钮 -->
-					</shiro:hasPermission>
+					<div class="layui-btn-group" style="margin-left: 15px;">
+						<shiro:hasPermission name="sys:sysroleactivity:add">
+							<table:addRow url="${ctx}/sys/sysroleactivity/form" title="工作流角色信息" width="95%" height="95%"></table:addRow><!-- 增加按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="sys:sysroleactivity:import">
+							<table:importExcel url="${ctx}/sys/sysroleactivity/import"></table:importExcel><!-- 导入按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="sys:sysroleactivity:export">
+							<table:exportExcel url="${ctx}/sys/sysroleactivity/export"></table:exportExcel><!-- 导出按钮 -->
+						</shiro:hasPermission>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<shiro:hasPermission name="sys:sysroleactivity:add">--%>
+<%--						<table:addRow url="${ctx}/sys/sysroleactivity/form" title="工作流角色信息" width="95%" height="95%"></table:addRow><!-- 增加按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
 					<%--<shiro:hasPermission name="sys:sysroleactivity:del">
 						<table:delRow url="${ctx}/sys/sysroleactivity/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->
 					</shiro:hasPermission>--%>
-					<shiro:hasPermission name="sys:sysroleactivity:import">
-						<table:importExcel url="${ctx}/sys/sysroleactivity/import"></table:importExcel><!-- 导入按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="sys:sysroleactivity:export">
-						<table:exportExcel url="${ctx}/sys/sysroleactivity/export"></table:exportExcel><!-- 导出按钮 -->
-					</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>
+<%--					<shiro:hasPermission name="sys:sysroleactivity:import">--%>
+<%--						<table:importExcel url="${ctx}/sys/sysroleactivity/import"></table:importExcel><!-- 导入按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="sys:sysroleactivity:export">--%>
+<%--						<table:exportExcel url="${ctx}/sys/sysroleactivity/export"></table:exportExcel><!-- 导出按钮 -->--%>
+<%--					</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>
 
@@ -110,12 +126,14 @@
 									</td>
 									<td class="op-td text-center">
 										<div class="op-btn-box">
-											<shiro:hasPermission name="sys:sysroleactivity:edit">
-												<a href="#" onclick="openDialog('修改工作流角色信息', '${ctx}/sys/sysroleactivity/form?id=${sysRoleActivity.id}','95%', '95%')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>
-											</shiro:hasPermission>
-											<shiro:hasPermission name="sys:sysroleactivity:edit">
-												<a href="${ctx}/sys/sysroleactivity/delete?id=${sysRoleActivity.id}" onclick="return confirmx('确认要删除该角色吗？', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
-											</shiro:hasPermission>
+											<div class="layui-btn-group">
+												<shiro:hasPermission name="sys:sysroleactivity:edit">
+													<a href="#" onclick="openDialog('修改工作流角色信息', '${ctx}/sys/sysroleactivity/form?id=${sysRoleActivity.id}','95%', '95%')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>
+												</shiro:hasPermission>
+												<shiro:hasPermission name="sys:sysroleactivity:edit">
+													<a href="${ctx}/sys/sysroleactivity/delete?id=${sysRoleActivity.id}" onclick="return confirmx('确认要删除该角色吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>
+												</shiro:hasPermission>
+											</div>
 										</div>
 									</td>
 								</tr>

src/main/webapp/webpage/modules/sys/userList.jsp

@@ -78,9 +78,14 @@
 
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<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 id="moresees" style="clear:both;display:none;">
@@ -100,9 +105,18 @@
 		<div class="contentShadow shadowT full-width fl">
 			<div class="layui-form contentDetails">
 				<div class="nav-btns">
-					<shiro:hasPermission name="sys:user:add">
-						<table:addRow url="${ctx}/sys/user/form?office.id=${user.office.id}&office.name=${user.office.name}&office.type=${user.office.type}" title="用户" target=""></table:addRow><!-- 增加按钮 -->
-					</shiro:hasPermission>
+					<div class="layui-btn-group" style="margin-left: 15px;">
+						<shiro:hasPermission name="sys:user:add">
+							<table:addRow url="${ctx}/sys/user/form?office.id=${user.office.id}&office.name=${user.office.name}&office.type=${user.office.type}" title="用户" target=""></table:addRow><!-- 增加按钮 -->
+						</shiro:hasPermission>
+						<c:if test="${manager}">
+							<a href="javascript:void(0)" onclick="openDialog('邀请加入企业', '${ctx}/sys/company/addUserInfo','75%','400px;')" class="layui-btn nav-btn-add" > 邀请</a>
+						</c:if>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<shiro:hasPermission name="sys:user:add">--%>
+<%--						<table:addRow url="${ctx}/sys/user/form?office.id=${user.office.id}&office.name=${user.office.name}&office.type=${user.office.type}" title="用户" target=""></table:addRow><!-- 增加按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
 					<%--<shiro:hasPermission name="sys:user:del">
                         <table:delRow url="${ctx}/sys/user/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->
                     </shiro:hasPermission>--%>
@@ -115,10 +129,10 @@
 					&lt;%&ndash;<shiro:hasPermission name="importInfo:importInfo:importInfoErr">
                     </shiro:hasPermission>&ndash;%&gt;
 					<table:importInfoErr url="${ctx}/sys/user/importInfoErr" title="导入日志"></table:importInfoErr><!-- 导出按钮 -->--%>
-					<c:if test="${manager}">
-						<a href="javascript:void(0)" onclick="openDialog('邀请加入企业', '${ctx}/sys/company/addUserInfo','75%','400px;')" class="nav-btn nav-btn-add" ><i class="fa fa-edit"></i> 邀请</a>
-					</c:if>
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+<%--					<c:if test="${manager}">--%>
+<%--						<a href="javascript:void(0)" onclick="openDialog('邀请加入企业', '${ctx}/sys/company/addUserInfo','75%','400px;')" class="nav-btn nav-btn-add" ><i class="fa fa-edit"></i> 邀请</a>--%>
+<%--					</c:if>--%>
+<%--					<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 class="oa-table layui-table" id="contentTable"></table>
@@ -162,14 +176,16 @@
                             xml = "<img src=\"" + d.photo + "?x-oss-process=image/resize,w_50,limit_0\" onclick=\"openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=" + d.photo + "','95%','95%')\"/>";
                         return xml;
                     }}
-                ,{field:'op',align:'center',title:"操作",minWidth:160,templet:function(d){
+                ,{field:'op',align:'center',title:"操作",minWidth:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml = "";
+                        var xml = "<div class=\"layui-btn-group\">";
                         /*if(d.candelete1 != undefined && d.candelete1 == "1")
                             xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改用户', '${ctx}/sys/user/form?id="+ d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
 						*/
 						if(d.candelete2 != undefined && d.candelete2 == "1")
-                            xml +="<a href=\"${ctx}/sys/user/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要移除该用户吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 移除</a>";
+                            xml +="<a href=\"${ctx}/sys/user/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要移除该用户吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red	\"> 移除</a>";
+						xml+="</div>";
+
 						return xml;
                     }}
             ]]

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoList.jsp

@@ -180,13 +180,22 @@
         <div class="full-width fl">
             <div class="contentShadow layui-form contentDetails">
                 <div class="nav-btns">
-                    <shiro:hasPermission name="workstaff:workStaffBasicInfo:add">
-                        <table:addRow url="${ctx}/workstaff/workStaffBasicInfo/form" title="员工信息"></table:addRow><!-- 增加按钮 -->
-                    </shiro:hasPermission>
-                    <shiro:hasPermission name="workstaff:workStaffBasicInfo:import">
-                        <table:importExcelBasic url="${ctx}/workstaff/workStaffBasicInfo/import"></table:importExcelBasic><!-- 导入按钮 -->
-                    </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 class="layui-btn-group" style="margin-left: 15px;">
+                        <shiro:hasPermission name="workstaff:workStaffBasicInfo:add">
+                            <table:addRow url="${ctx}/workstaff/workStaffBasicInfo/form" title="员工信息"></table:addRow><!-- 增加按钮 -->
+                        </shiro:hasPermission>
+                        <shiro:hasPermission name="workstaff:workStaffBasicInfo:import">
+                            <table:importExcelBasic url="${ctx}/workstaff/workStaffBasicInfo/import"></table:importExcelBasic><!-- 导入按钮 -->
+                        </shiro:hasPermission>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
+<%--                    <shiro:hasPermission name="workstaff:workStaffBasicInfo:add">--%>
+<%--                        <table:addRow url="${ctx}/workstaff/workStaffBasicInfo/form" title="员工信息"></table:addRow><!-- 增加按钮 -->--%>
+<%--                    </shiro:hasPermission>--%>
+<%--                    <shiro:hasPermission name="workstaff:workStaffBasicInfo:import">--%>
+<%--                        <table:importExcelBasic url="${ctx}/workstaff/workStaffBasicInfo/import"></table:importExcelBasic><!-- 导入按钮 -->--%>
+<%--                    </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 class="oa-table layui-table" id="contentTable" lay-filter="tableEvent"></table>