Merge remote-tracking branch 'origin/master'

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

@@ -6,7 +6,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-add" data-toggle="tooltip" data-placement="left" onclick="add()" title="添加"><i class="fa fa-plus"></i> ${label==null?'添加':label}</button>
+<button class="layui-btn layui-btn layui-bg-blue" data-toggle="tooltip" data-placement="left" onclick="add()" title="添加">
+<%--    <i class="fa fa-plus"></i>--%>
+    ${label==null?'添加':label}
+</button>
 <%-- 使用方法： 1.将本tag写在查询的form之前；2.传入table的id和controller的url --%>
 <script type="text/javascript">
 	function add(){

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

@@ -2,7 +2,9 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <%@ attribute name="url" type="java.lang.String" required="true"%>
 <%-- 使用方法： 1.将本tag写在查询的form之前；2.传入url --%>
-<button id="btnExport" class="nav-btn nav-btn-export" data-toggle="tooltip" data-placement="left" title="导出"><i class="fa fa-file-excel-o"></i> 导出</button>
+<button id="btnExport" class="layui-btn layui-btn layui-bg-cyan" data-toggle="tooltip" data-placement="left" title="导出">
+<%--    <i class="fa fa-file-excel-o"></i>--%>
+    导出</button>
 <script type="text/javascript">
 $(document).ready(function() {
 

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

@@ -2,7 +2,10 @@
 <%@ 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-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="importForm" action="${url}" method="post" enctype="multipart/form-data"
 			 style="padding-left:20px;text-align:center;" onsubmit="loading('正在导入，请稍等...');"><br/>

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

@@ -6,7 +6,9 @@
 <%@ 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-log" data-toggle="tooltip" data-placement="left" onclick="importInfoRrr()" title="导入日志"><i class="fa fa-folder-open-o"></i> ${label==null?'导入日志':label}</button>
+<button class="layui-btn layui-btn layui-bg-gray" data-toggle="tooltip" data-placement="left" onclick="importInfoRrr()" title="导入日志">
+<%--    <i class="fa fa-folder-open-o"></i>--%>
+    ${label==null?'导入日志':label}</button>
 <%-- 使用方法： 1.将本tag写在查询的form之前；2.传入table的id和controller的url --%>
 <script type="text/javascript">
     function importInfoRrr(){

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

@@ -6,7 +6,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-add" data-toggle="tooltip" data-placement="left" onclick="officeAdd()" title="添加"><i class="fa fa-plus"></i> ${label==null?'添加':label}</button>
+<button class="layui-btn layui-btn layui-bg-blue" data-toggle="tooltip" data-placement="left" onclick="officeAdd()" title="添加">
+<%--    <i class="fa fa-plus"></i>--%>
+    ${label==null?'添加':label}
+</button>
 <%-- 使用方法： 1.将本tag写在查询的form之前；2.传入table的id和controller的url --%>
 <script type="text/javascript">
 	function officeAdd(){

src/main/webapp/webpage/modules/oa/oaNotifyList.jsp

@@ -413,9 +413,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: 15px;">
+								<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>
@@ -459,20 +464,35 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<shiro:hasPermission name="oa:oaNotify:add">
-						<table:addRow label="新增" url="${ctx}/oa/oaNotify/form?flagOffice=0" title="通知" height="95%;" width="95%;"></table:addRow><!-- 增加按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="oa:oaNotify:officeAdd">
-						<table:officeAddRow label="办公室新增" url="${ctx}/oa/oaNotify/form?flagOffice=1" title="通知" height="95%;" width="95%;"></table:officeAddRow><!-- 增加按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="oa:oaNotify:import">
-						<table:importExcel url="${ctx}/oa/oaNotify/import"></table:importExcel><!-- 导入按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="oa:oaNotify:export">
-						<table:exportExcel url="${ctx}/oa/oaNotify/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 class="layui-btn-group" style="margin-left: 20px;">
+						<shiro:hasPermission name="oa:oaNotify:add">
+							<table:addRow label="新增" url="${ctx}/oa/oaNotify/form?flagOffice=0" title="通知" height="95%;" width="95%;"></table:addRow><!-- 增加按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="oa:oaNotify:officeAdd">
+							<table:officeAddRow label="办公室新增" url="${ctx}/oa/oaNotify/form?flagOffice=1" title="通知" height="95%;" width="95%;"></table:officeAddRow><!-- 增加按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="oa:oaNotify:import">
+							<table:importExcel url="${ctx}/oa/oaNotify/import"></table:importExcel><!-- 导入按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="oa:oaNotify:export">
+							<table:exportExcel url="${ctx}/oa/oaNotify/export"></table:exportExcel><!-- 导出按钮 -->
+						</shiro:hasPermission>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<shiro:hasPermission name="oa:oaNotify:add">--%>
+<%--						<table:addRow label="新增" url="${ctx}/oa/oaNotify/form?flagOffice=0" title="通知" height="95%;" width="95%;"></table:addRow><!-- 增加按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="oa:oaNotify:officeAdd">--%>
+<%--						<table:officeAddRow label="办公室新增" url="${ctx}/oa/oaNotify/form?flagOffice=1" title="通知" height="95%;" width="95%;"></table:officeAddRow><!-- 增加按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="oa:oaNotify:import">--%>
+<%--						<table:importExcel url="${ctx}/oa/oaNotify/import"></table:importExcel><!-- 导入按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="oa:oaNotify:export">--%>
+<%--						<table:exportExcel url="${ctx}/oa/oaNotify/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>
 				<table class="oa-table layui-table" id="contentTable"></table>
 
@@ -525,29 +545,30 @@
                 // ,{fixed: 'right',align:'center', toolbar: '#op',title:"操作"}
                 ,{align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml = "";
+                        var xml = "<div class=\"layui-btn-group\">";
 						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
 						{
-							xml+="<a href=\"#\" onclick=\"notifyDialogre('公告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=invoice','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('公告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=invoice','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 						}
                         if(d.canedit != undefined && d.canedit == "1")
-                            xml += "<a href=\"javascript:void(0)\" onclick=\"openDialog('修改公告', '${ctx}/oa/oaNotify/form?id="+ 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}/oa/oaNotify/form?id="+ d.id +"','95%', '95%')\"   class=\"layui-btn layui-btn-xs\"> 修改</a>";
                         if(d.flagAdmin != undefined && d.flagAdmin == "1")
-                            xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogAdmin('修改公告', '${ctx}/oa/oaNotify/adminForm?id="+ d.id +"','95%', '95%')\"   class=\"op-btn op-btn-edit\"><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogAdmin('修改公告', '${ctx}/oa/oaNotify/adminForm?id="+ d.id +"','95%', '95%')\"   class=\"layui-btn layui-btn-xs\"> 修改</a>";
                         if(d.candel != undefined && d.candel == "1")
-                            xml += "<a href=\"${ctx}/oa/oaNotify/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}/oa/oaNotify/delete?id="+ d.id +"\" onclick=\"return confirmx('确认要关闭该公告吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 关闭</a>";
                         if(d.canmodify != undefined && d.canmodify =="1"){
-                            xml+="<a href=\"#\" onclick=\"openDialogreModify('修改公告', '${ctx}/oa/oaNotify/modify?id=" + d.id + "','" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogreModify('修改公告', '${ctx}/oa/oaNotify/modify?id=" + d.id + "','" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel =="1"){
-                            xml+="<a href=\"${ctx}/oa/oaNotify/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}/oa/oaNotify/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该公告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-bule\" > 撤回</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1"){
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改公告', '${ctx}/oa/oaNotify/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}/oa/oaNotify/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                         }
                         if(d.candelete != undefined && d.candelete == "1"){
-                            xml +="<a href=\"${ctx}/oa/oaNotify/logicDelete?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}/oa/oaNotify/logicDelete?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/projectAccessory/projectAccessoryRelation/projectAccessoryRelationList.jsp

@@ -264,8 +264,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: 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" 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>
@@ -288,9 +292,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>
@@ -416,12 +425,12 @@
 			}
 			if(d.condition ==1) {
 				return [
-					'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增必填阶段\', \'${ctx}/projectAccessoryRelation/projectAccessoryRelation/form?attachmentProjectType='+attachmentProjectType +'&attachmentProjectSort='+attachmentProjectSort +'&attachmentProjectApprovalMoney='+attachmentProjectApprovalMoney+'&parentIds='+d.id+' \',\'80%\',\'60%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增附件关系</a>',
+					'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增必填阶段\', \'${ctx}/projectAccessoryRelation/projectAccessoryRelation/form?attachmentProjectType='+attachmentProjectType +'&attachmentProjectSort='+attachmentProjectSort +'&attachmentProjectApprovalMoney='+attachmentProjectApprovalMoney+'&parentIds='+d.id+' \',\'80%\',\'60%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增附件关系</a>',
 				].join('');
 			} else if (d.condition ==2){
 				return [
-					'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改必填阶段\', \'${ctx}/projectAccessoryRelation/projectAccessoryRelation/form?id='+d.id+'\',\'80%\',\'60%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
-					'<a href="${ctx}/projectAccessoryRelation/projectAccessoryRelation/delete?id='+d.id+'" onclick="return confirmx(\'确认要删除该必填阶段吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>'
+					'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改必填阶段\', \'${ctx}/projectAccessoryRelation/projectAccessoryRelation/form?id='+d.id+'\',\'80%\',\'60%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
+					'<a href="${ctx}/projectAccessoryRelation/projectAccessoryRelation/delete?id='+d.id+'" onclick="return confirmx(\'确认要删除该必填阶段吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>'
 				].join('');
 			}else{
 				return [

src/main/webapp/webpage/modules/projectAccessory/projectTemplate/projectTemplateList.jsp

@@ -43,8 +43,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>
@@ -59,7 +63,10 @@
 						<%--<shiro:hasPermission name="projectAccessory:projectAccessory:add">
 							<table:addRow url="${ctx}/projectTemplate/projectTemplate/form" 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>
+							<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>
 
@@ -93,21 +100,23 @@
 									${projectAccessory.indexNum}
 								</td>
 								<td class="op-td text-center">
+									<div class="layui-btn-group">
 									<div class="op-btn-box">
 										<c:if test="${projectAccessory.grade == 0}">
 											<shiro:hasPermission name="projectTemplate:projectTemplate:add">
-												<a href="javascript:void(0);" onclick="openDialog('添加附件结构', '${ctx}/projectTemplate/projectTemplate/form?parent.id=${projectAccessory.id}','80%','80%')" class="op-btn op-btn-add"><i class="fa fa-plus"></i> 添加下级结构</a>
+												<a href="javascript:void(0);" onclick="openDialog('添加附件结构', '${ctx}/projectTemplate/projectTemplate/form?parent.id=${projectAccessory.id}','80%','80%')" class="layui-btn layui-btn-sm"> 添加下级结构</a>
 											</shiro:hasPermission>
 										</c:if>
 										<c:if test="${projectAccessory.grade ==1}">
 										<shiro:hasPermission name="projectTemplate:projectTemplate:edit">
-											<a href="javascript:void(0);" onclick="openDialog('修改附件结构', '${ctx}/projectTemplate/projectTemplate/form?id=${projectAccessory.id}','80%','80%')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>
+											<a href="javascript:void(0);" onclick="openDialog('修改附件结构', '${ctx}/projectTemplate/projectTemplate/form?id=${projectAccessory.id}','80%','80%')" class="layui-btn layui-btn-sm layui-bg-blue" > 修改</a>
 										</shiro:hasPermission>
 										<shiro:hasPermission name="projectTemplate:projectTemplate:del">
-											<a href="${ctx}/projectTemplate/projectTemplate/delete?id=${projectAccessory.id}" onclick="return confirmx('确认要删除该复附件结构及其子附件结构吗？', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
+											<a href="${ctx}/projectTemplate/projectTemplate/delete?id=${projectAccessory.id}" onclick="return confirmx('确认要删除该复附件结构及其子附件结构吗？', this.href)"   class="layui-btn layui-btn-sm layui-bg-red"> 删除</a>
 										</shiro:hasPermission>
 										</c:if>
 									</div>
+									</div>
 								</td>
 							</tr>
 						</c:forEach>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchList.jsp

@@ -254,9 +254,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>
@@ -288,16 +293,27 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <shiro:hasPermission name="projectFilingBatch:projectFilingBatchInfo:add">
-                        <table:addRow url="${ctx}/projectFilingBatch/projectFilingBatchInfo/form" title="归档批次"></table:addRow><!-- 增加按钮 -->
-                    </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;">
+                        <button class="layui-btn" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+                        <shiro:hasPermission name="projectFilingBatch:projectFilingBatchInfo:add">
+                            <table:addRow url="${ctx}/projectFilingBatch/projectFilingBatchInfo/form" title="归档批次"></table:addRow><!-- 增加按钮 -->
+                        </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="projectFilingBatch:projectFilingBatchInfo:add">--%>
+<%--                        <table:addRow url="${ctx}/projectFilingBatch/projectFilingBatchInfo/form" title="归档批次"></table:addRow><!-- 增加按钮 -->--%>
+<%--                    </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 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>
@@ -430,31 +446,32 @@
 
 
         function complain(d){//操作中显示的内容
-            var xml = '';
+            var xml = '<div class=\"layui-btn-group\">';
             if(d.pid=="0") {
                 if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
                 {
-                    xml+="<a href=\"#\" onclick=\"notifyDialogre('新增报告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=filingBatch','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+                    xml+="<a href=\"#\" onclick=\"notifyDialogre('新增报告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=filingBatch','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
                 }
                 if(d.flag == 1){
                     if(d.status == 1){
-                        xml+="<a href=\"#\" onclick=\"openDialogre('修改批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/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}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                     }
                     if(d.status == 2){
-                        xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/revoke?id=" + d.id + "&filingStatus="+d.status+ "\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+                        xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/revoke?id=" + d.id + "&filingStatus="+d.status+ "\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回</a>";
                     }
                     if(d.status == 3){
                         //撤回操作
-                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/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}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                     }
                     if(d.status == 4){
                         //驳回操作
-                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/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}/projectFilingBatch/projectFilingBatchInfo/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"olayui-btn layui-btn-xs\" > 修改</a>";
                     }
                     if(d.status == 1 || d.status == 3 || d.status == 4){
-                        xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/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}/projectFilingBatch/projectFilingBatchInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
                     }
                 }
+                xml+="</div>"
                 return[xml].join('');
             }else{
                 var xml = '';

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.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: 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>
@@ -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: 20px;">
+						<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>
@@ -254,15 +262,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}/ruralProject/ruralProjectView/planView?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}/ruralProject/ruralProjectView/planView?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}/project/projectPlanConsulting/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}/project/projectPlanConsulting/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 编辑</a>";
 						}
+						xml+="</div>"
 						return xml;
 
 					}}

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.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: 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>
@@ -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>
@@ -254,15 +262,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}/ruralProject/ruralProjectView/planView?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}/ruralProject/ruralProjectView/planView?id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 详情</a>";
 						}
 						if(d.canedit4 != undefined && d.canedit4 =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanCost/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}/project/projectPlanCost/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/ruralprojectrecords/check/all/ruralProjectRecordsAllList.jsp

@@ -220,9 +220,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>
@@ -275,7 +280,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>
@@ -346,10 +354,10 @@
 					}}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
                         if(d.canAdd != undefined && d.canAdd =="1")
                         {
-							xml+="<a href=\"#\" onclick=\"openDialogre('选查项目', '${ctx}/project/recordChooseCheckAll/form?id=" + d.id +"','95%', '95%','','选查,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 检查</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('选查项目', '${ctx}/project/recordChooseCheckAll/form?id=" + d.id +"','95%', '95%','','选查,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 检查</a>";
                         }
                         /*if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
@@ -365,11 +373,11 @@
                         }*/
                         if(d.candel != undefined && d.candel =="1")
                         {
-                            xml+="<a href=\"${ctx}/project/recordChooseCheckAll/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该选查项目流程吗？', this.href)\" class=\"op-btn op-btn-invalid\"><i class=\"fa fa-trash-o\"></i> 删除</a>";
+                            xml+="<a href=\"${ctx}/project/recordChooseCheckAll/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/recordChooseCheckAll/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&checkStatus="+d.checkStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+                            xml+="<a href=\"${ctx}/project/recordChooseCheckAll/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&checkStatus="+d.checkStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回</a>";
                         }
                         return xml;
 

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsList.jsp

@@ -312,9 +312,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>
@@ -367,7 +372,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>
@@ -438,14 +446,14 @@
                     }}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
 
 						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
 						{
 							if(d.actType == 1){
-								xml+="<a href=\"javascript:void(0)\" onclick=\"masterCheck('提交线下归档', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=report','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 提交线下归档</a>";
+								xml+="<a href=\"javascript:void(0)\" onclick=\"masterCheck('提交线下归档', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=report','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 提交线下归档</a>";
 							}else{
-								xml+="<a href=\"#\" onclick=\"notifyDialogre('选查项目', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=report','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 线下归档审批</a>";
+								xml+="<a href=\"#\" onclick=\"notifyDialogre('选查项目', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=report','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线下归档审批</a>";
 							}
 						}
                         /*if(d.canAdd != undefined && d.canAdd =="1")
@@ -472,6 +480,7 @@
                         {
                             xml+="<a href=\"${ctx}/project/recordChooseCheck/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&checkStatus="+d.checkStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
                         }*/
+						xml+="</div>"
                         return xml;
 
                     }}

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageLists.jsp

@@ -434,9 +434,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>
@@ -507,9 +512,15 @@
 		<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>
+					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
+					<div class="layui-btn-group" style="margin-left: 20px;">
+						<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>
@@ -700,7 +711,7 @@
 								return '';
 							}
 						}},
-                    {templet: complain, align:'center', title: '操作' ,width:350}
+                    {templet: complain, align:'center', title: '操作' ,width:250}
                 ]],
                 done: function () {
                     layer.closeAll('loading');
@@ -725,59 +736,59 @@
 
 
         function complain(d){//操作中显示的内容
-        	var xml = '';
+        	var xml = '<div class=\"layui-btn-group\">';
 			if(d.pid=="0") {
 				if(d.reportNotifyFlag != undefined && d.reportNotifyFlag !=null && "" != d.reportNotifyFlag && d.reportNotifyFlag == 1)
 				{
-					xml+="<a href=\"#\" onclick=\"notifyDialogre('新增报告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=report','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+					xml+="<a href=\"#\" onclick=\"notifyDialogre('新增报告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=report','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 				}
 				if(d.recordNotifyFlag != undefined && d.recordNotifyFlag !=null && "" != d.recordNotifyFlag && d.recordNotifyFlag == 1)
 				{
-					xml+="<a href=\"#\" onclick=\"notifyDialogre('电子归档审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.recordNotifyId +"&home=record','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+					xml+="<a href=\"#\" onclick=\"notifyDialogre('电子归档审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.recordNotifyId +"&home=record','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 				}
 				if(d.reportedNotifyFlag != undefined && d.reportedNotifyFlag !=null && "" != d.reportedNotifyFlag && d.reportedNotifyFlag == 1)
 				{
-					xml+="<a href=\"#\" onclick=\"notifyDialogre('上报审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportedNotifyId +"&home=reported','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+					xml+="<a href=\"#\" onclick=\"notifyDialogre('上报审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportedNotifyId +"&home=reported','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 				}
 				if(d.flag == 1){
 					if(d.projectReportStatus == 0){
-						xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralCostProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralCostProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 新增报告</a>";
 					}
 					if(d.projectReportStatus == 1){
-						xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
 					}
 					if(d.projectReportStatus == 2){
-						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/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}/ruralProject/ruralCostProjectMessage/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目报告审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回报告</a>";
 					}
 					if(d.projectReportStatus == 3){
 						//撤回操作
-						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
 					}
 					if(d.projectReportStatus == 4){
 						//驳回操作
-						xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 删除报告</a>";
 					}
 
 					//线上归档操作
 					if(d.projectReportStatus == 5){
 						/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 						if(d.projectReportRecordStatus == 0){
-							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 线上归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上归档</a>";
 						}
 						if(d.projectReportRecordStatus == 1){
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 线上重新归档</a>";
 						}
 						if(d.projectReportRecordStatus == 2){
-							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回线上归档</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该报告线上归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 撤回线上归档</a>";
 						}
 						if(d.projectReportRecordStatus == 3){
-							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上重新归档</a>";
 						}
 						if(d.projectReportRecordStatus == 4){
-							xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上重新归档</a>";
 						}
 					}
 
@@ -805,41 +816,43 @@
 						if(d.syncStatus == 0){
 							if(d.reportStatus == 0){
 								if(d.reportedState == 0 || d.reportedState == 6){
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 上报</a>";
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 个人上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs\" > 上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs\" > 个人上报</a>";
 								}
 							}else{
 								if(d.reportedState == 2){
-									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回上报</a>";
+									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs\" > 撤回上报</a>";
 								}
 								/*撤回修改*/
 								if(d.reportedState == 3){
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs\" > 修改上报</a>";
 								}
 								/*驳回修改*/
 								if(d.reportedState == 4){
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs\" > 修改上报</a>";
 								}
 							}
 						}
 					}
 					if('1' == d.flagAdmin && d.projectReportStatus == 5)
 					{
-						xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralCostProjectMessage/adminModifyForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
-						xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralCostProjectMessage/getReportModifyList?projectId=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-delete\" style=\"background-color:#5FB878;\" ><i class=\"fa fa-eye\"></i> 历史报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralCostProjectMessage/adminModifyForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralCostProjectMessage/getReportModifyList?projectId=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs\" style=\"background-color:#5FB878;\" > 历史报告</a>";
 					}
 					if('1' == d.flagArchive && d.projectReportRecordStatus == 5)
 					{
-						xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralCostProjectMessage/adminRecordModifyForm?id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralCostProjectMessage/adminRecordModifyForm?id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改归档</a>";
 					}
 				}
+				xml+="</div>";
 				return[xml].join('');
 			}else{
 				var xml = '';
 				if(d.flag ==1){
-					xml+="<a href=\"#\" onclick=\"openDialogreSub('修改项目', '${ctx}/subProject/subProject/form?id=" + d.id + "','95%', '95%','','inputForm','layui-border-box')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
-					xml+="<a href=\"${ctx}/subProject/subProject/delete?id=" + d.id + "\" onclick=\"return subConfirmx('确认要删除该子项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+					xml+="<a href=\"#\" onclick=\"openDialogreSub('修改项目', '${ctx}/subProject/subProject/form?id=" + d.id + "','95%', '95%','','inputForm','layui-border-box')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+					xml+="<a href=\"${ctx}/subProject/subProject/delete?id=" + d.id + "\" onclick=\"return subConfirmx('确认要删除该子项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
 				}
+				xml+="</div>";
 				return[xml].join('');
 			}
         }

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -340,9 +340,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>
@@ -395,19 +400,34 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:add">
-						<table:addRow url="${ctx}/ruralProject/ruralCostProjectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:del">
-						<%--<table:delRow url="${ctx}/project/projectRecords/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->--%>
-					</shiro:hasPermission>
-					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:export">
-						<table:exportExcel url="${ctx}/ruralProject/ruralCostProjectRecords/export"></table:exportExcel><!-- 导出按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:exportAll">
-						<button type="button" data-toggle="tooltip" data-placement="top" class="nav-btn nav-btn-delete" id="delUser"><i class="fa fa-file-excel-o"> 批量下载</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: 20px;">
+						<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:add">
+							<table:addRow url="${ctx}/ruralProject/ruralCostProjectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:del">
+							<%--<table:delRow url="${ctx}/project/projectRecords/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->--%>
+						</shiro:hasPermission>
+						<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:export">
+							<table:exportExcel url="${ctx}/ruralProject/ruralCostProjectRecords/export"></table:exportExcel><!-- 导出按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:exportAll">
+							<button type="button" data-toggle="tooltip" data-placement="top" class="layui-btn layui-btn layui-bg-red" id="delUser"> 批量下载</button>
+						</shiro:hasPermission>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:add">--%>
+<%--						<table:addRow url="${ctx}/ruralProject/ruralCostProjectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:del">--%>
+<%--						&lt;%&ndash;<table:delRow url="${ctx}/project/projectRecords/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->&ndash;%&gt;--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:export">--%>
+<%--						<table:exportExcel url="${ctx}/ruralProject/ruralCostProjectRecords/export"></table:exportExcel><!-- 导出按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:exportAll">--%>
+<%--						<button type="button" data-toggle="tooltip" data-placement="top" class="nav-btn nav-btn-delete" id="delUser"><i class="fa fa-file-excel-o"> 批量下载</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>
 				<table class="oa-table layui-table" id="contentTable1"></table>
@@ -476,35 +496,35 @@
                     }}
                 ,{field:'op',align:'center',title:"操作",width:150,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
 						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
 						{
-							xml+="<a href=\"#\" onclick=\"notifyDialogre('项目审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=project','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('项目审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=project','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 						}
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/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}/ruralProject/ruralCostProjectRecords/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}/ruralProject/ruralCostProjectRecords/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}/ruralProject/ruralCostProjectRecords/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}/ruralProject/ruralCostProjectRecords/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}/ruralProject/ruralCostProjectRecords/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                         }
                         if(d.candel != undefined && d.candel =="1")
                         {
-                            xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"op-btn op-btn-invalid\"><i class=\"fa fa-trash-o\"></i> 作废</a>";
+                            xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs\" style=\"background-color:#c2c2c2\"> 作废</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {
-                            xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+                            xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs\" > 撤回</a>";
                         }
 						//项目在没有归档完成之前可对文档进行操作
 						if(d.recordStatus != undefined && d.recordStatus =="1")
 						{
-							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralCostProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralCostProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传文件</a>";
 						}
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {
@@ -512,9 +532,10 @@
                         }
 						if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
 						{
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
-							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/adminDelete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/adminDelete?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/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -312,9 +312,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>
@@ -367,16 +372,29 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<shiro:hasPermission name="ruralProject:ruralProjectRecords:add">
-						<table:addRow url="${ctx}/ruralProject/ruralProjectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="ruralProject:ruralProjectRecords:export">
-						<table:exportExcel url="${ctx}/ruralProject/ruralProjectRecords/export"></table:exportExcel><!-- 导出按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="ruralProject:ruralProjectRecords:exportAll">
-						<button type="button" data-toggle="tooltip" data-placement="top" class="nav-btn nav-btn-delete" id="delUser"><i class="fa fa-file-excel-o"> 批量下载</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>
+					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
+					<div class="layui-btn-group" style="margin-left: 20px;">
+						<shiro:hasPermission name="ruralProject:ruralProjectRecords:add">
+							<table:addRow url="${ctx}/ruralProject/ruralProjectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="ruralProject:ruralProjectRecords:export">
+							<table:exportExcel url="${ctx}/ruralProject/ruralProjectRecords/export"></table:exportExcel><!-- 导出按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="ruralProject:ruralProjectRecords:exportAll">
+							<button type="button" data-toggle="tooltip" data-placement="top" class="layui-btn layui-bg-red" id="delUser"> 批量下载</button>
+						</shiro:hasPermission>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<shiro:hasPermission name="ruralProject:ruralProjectRecords:add">--%>
+<%--						<table:addRow url="${ctx}/ruralProject/ruralProjectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="ruralProject:ruralProjectRecords:export">--%>
+<%--						<table:exportExcel url="${ctx}/ruralProject/ruralProjectRecords/export"></table:exportExcel><!-- 导出按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="ruralProject:ruralProjectRecords:exportAll">--%>
+<%--						<button type="button" data-toggle="tooltip" data-placement="top" class="nav-btn nav-btn-delete" id="delUser"><i class="fa fa-file-excel-o"> 批量下载</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>
 				<table class="oa-table layui-table" id="contentTable1"></table>
@@ -448,35 +466,35 @@
                     }}
                 ,{field:'op',align:'center',title:"操作",width:150,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
                         if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
                         {
-							xml+="<a href=\"#\" onclick=\"notifyDialogre('项目审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=project','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('项目审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=project','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
                         }
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/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}/ruralProject/ruralProjectRecords/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}/ruralProject/ruralProjectRecords/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}/ruralProject/ruralProjectRecords/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}/ruralProject/ruralProjectRecords/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}/ruralProject/ruralProjectRecords/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                         }
                         if(d.candel != undefined && d.candel =="1")
                         {
-                            xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"op-btn op-btn-invalid\"><i class=\"fa fa-trash-o\"></i> 作废</a>";
+                            xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs\" style=\"background-color:#c2c2c2\"> 作废</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {
-                            xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+                            xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回</a>";
                         }
                         //项目在没有归档完成之前可对文档进行操作
                         if(d.recordStatus != undefined && d.recordStatus =="1")
                         {
-							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传文件</a>";
                         }
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {
@@ -484,9 +502,10 @@
                         }
                         if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
                         {
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
-							xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/adminDelete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/adminDelete?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/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllLists.jsp

@@ -377,9 +377,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>
@@ -450,9 +455,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-btn" 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>
@@ -655,17 +665,18 @@
         function complain(d){//操作中显示的内容
         	var xml = '';
 			if(d.pid=="0") {
-				var xml = '';
+				var xml = '<div class=\"layui-btn-group\">';
 				if(d.flag == 1){
 					<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:accessory">
 					if(0 == d.projectReportRecordStatus){
-						xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs\" > 上传文件</a>";
 					}
 					</shiro:hasPermission>
 					<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:adminAccessory">
-						xml+="<a href=\"#\" onclick=\"openDialogView('归档管理员文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogView('归档管理员文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";
 					</shiro:hasPermission>
 				}
+				xml+="</div>"
 				return[xml].join('');
 			}else{
 				var xml = '';

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists.jsp

@@ -434,9 +434,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>
@@ -507,9 +512,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: 20px;">
+						<button class="layui-btn" 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>
@@ -702,7 +712,7 @@
 								return '';
 							}
 						}},
-                    {templet: complain, align:'center', title: '操作' ,width:350}
+                    {templet: complain, align:'center', title: '操作' ,width:250}
                 ]],
                 done: function () {
                     layer.closeAll('loading');
@@ -727,59 +737,59 @@
 
 
         function complain(d){//操作中显示的内容
-        	var xml = '';
+        	var xml = '<div class=\"layui-btn-group\">';
 			if(d.pid=="0") {
 				if(d.reportNotifyFlag != undefined && d.reportNotifyFlag !=null && "" != d.reportNotifyFlag && d.reportNotifyFlag == 1)
 				{
-					xml+="<a href=\"#\" onclick=\"notifyDialogre('新增报告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=report','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+					xml+="<a href=\"#\" onclick=\"notifyDialogre('新增报告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportNotifyId +"&home=report','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 				}
 				if(d.recordNotifyFlag != undefined && d.recordNotifyFlag !=null && "" != d.recordNotifyFlag && d.recordNotifyFlag == 1)
 				{
-					xml+="<a href=\"#\" onclick=\"notifyDialogre('电子归档审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.recordNotifyId +"&home=record','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+					xml+="<a href=\"#\" onclick=\"notifyDialogre('电子归档审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.recordNotifyId +"&home=record','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 				}
 				if(d.reportedNotifyFlag != undefined && d.reportedNotifyFlag !=null && "" != d.reportedNotifyFlag && d.reportedNotifyFlag == 1)
 				{
-					xml+="<a href=\"#\" onclick=\"notifyDialogre('上报审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportedNotifyId +"&home=reported','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+					xml+="<a href=\"#\" onclick=\"notifyDialogre('上报审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.reportedNotifyId +"&home=reported','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 				}
 				if(d.flag == 1){
 					if(d.projectReportStatus == 0){
-						xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 新增报告</a>";
 					}
 					if(d.projectReportStatus == 1){
-						xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-red\" > 删除报告</a>";
 					}
 					if(d.projectReportStatus == 2){
-						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/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}/ruralProject/ruralProjectMessage/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目报告审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-blue\" > 撤回报告</a>";
 					}
 					if(d.projectReportStatus == 3){
 						//撤回操作
-						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-red\" > 删除报告</a>";
 					}
 					if(d.projectReportStatus == 4){
 						//驳回操作
-						xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
-						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"op-btn op-btn-delete\" ><i class=\"fa fa-trash\"></i> 删除报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogreReport('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + "&view=report','"+d.id+"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改报告</a>";
+						xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/deleteReport?projectId=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目报告吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-red\" > 删除报告</a>";
 					}
 
 					//线上归档操作
 					if(d.projectReportStatus == 5){
 						/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
 						if(d.projectReportRecordStatus == 0){
-							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 线上归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上归档</a>";
 						}
 						if(d.projectReportRecordStatus == 1){
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-btn-blue\" > 线上重新归档</a>";
 						}
 						if(d.projectReportRecordStatus == 2){
-							xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回线上归档</a>";
+							xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidate?id=" + d.prrId + "&processInstanceId=" + d.prrProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该线上报告归档审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-btn-blue\" > 撤回线上归档</a>";
 						}
 						if(d.projectReportRecordStatus == 3){
-							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-btn-blue\" > 线上重新归档</a>";
 						}
 						if(d.projectReportRecordStatus == 4){
-							xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-btn-blue\" > 线上重新归档</a>";
 						}
 					}
 
@@ -807,41 +817,43 @@
 						if(d.syncStatus == 0){
 							if(d.reportStatus == 0){
 								if(d.reportedState == 0 || d.reportedState == 6){
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 上报</a>";
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"op-btn op-btn-delete\" ><i class=\"fa fa-plus\"></i> 个人上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs\" > 上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs\" > 个人上报</a>";
 								}
 							}else{
 								if(d.reportedState == 2){
-									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回上报</a>";
+									xml+="<a href=\"${ctx}/ruralProject/ruralProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回上报</a>";
 								}
 								/*撤回修改*/
 								if(d.reportedState == 3){
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs\" > 修改上报</a>";
 								}
 								/*驳回修改*/
 								if(d.reportedState == 4){
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs\" > 修改上报</a>";
 								}
 							}
 						}
 					}
 					if('1' == d.flagAdmin && d.projectReportStatus == 5)
 					{
-						xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralProjectMessage/adminModifyForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改报告</a>";
-						xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralProjectMessage/getReportModifyList?projectId=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-delete\" style=\"background-color:#5FB878;\" ><i class=\"fa fa-eye\"></i> 历史报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralProjectMessage/adminModifyForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralProjectMessage/getReportModifyList?projectId=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs\" style=\"background-color:#5FB878;\" > 历史报告</a>";
 					}
 					if('1' == d.flagArchive && d.projectReportRecordStatus == 5)
 					{
-						xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralProjectMessage/adminRecordModifyForm?id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralProjectMessage/adminRecordModifyForm?id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改归档</a>";
 					}
 				}
+				xml+="</div>"
 				return[xml].join('');
 			}else{
 				var xml = '';
 				if(d.flag ==1){
-					xml+="<a href=\"#\" onclick=\"openDialogreSub('修改项目', '${ctx}/subProject/subProject/form?id=" + d.id + "','95%', '95%','','inputForm','layui-border-box')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
-					xml+="<a href=\"${ctx}/subProject/subProject/delete?id=" + d.id + "\" onclick=\"return subConfirmx('确认要删除该子项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+					xml+="<a href=\"#\" onclick=\"openDialogreSub('修改项目', '${ctx}/subProject/subProject/form?id=" + d.id + "','95%', '95%','','inputForm','layui-border-box')\" class=\"layui-btn layui-btn-xs\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+					xml+="<a href=\"${ctx}/subProject/subProject/delete?id=" + d.id + "\" onclick=\"return subConfirmx('确认要删除该子项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
 				}
+				xml+="</div>"
 				return[xml].join('');
 			}
         }

src/main/webapp/webpage/modules/workReimbursementType/reimbursementTypeList.jsp

@@ -42,9 +42,9 @@
 							</div>
 						</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: 20px;">
+								<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -84,9 +84,10 @@
 								</td>
 								<td class="op-td text-center">
 									<div class="op-btn-box">
+										<div class="layui-btn-group">
 										<c:if test="${workReimbursementTypeInfo.grade == 0}">
 											<shiro:hasPermission name="reimbursementType:reimbursementType:add">
-												<a href="javascript:void(0);" onclick="openDialog('添加报销内容', '${ctx}/reimbursementType/reimbursementType/form?parent.id=${workReimbursementTypeInfo.id}','80%','60%')" class="op-btn op-btn-add"><i class="fa fa-plus"></i> 添加下级结构</a>
+												<a href="javascript:void(0);" onclick="openDialog('添加报销内容', '${ctx}/reimbursementType/reimbursementType/form?parent.id=${workReimbursementTypeInfo.id}','80%','60%')" class="layui-btn layui-btn-sm"> 添加下级结构</a>
 											</shiro:hasPermission>
 											<%--<shiro:hasPermission name="reimbursementType:reimbursementType:edit">
 												<a href="javascript:void(0);" onclick="openDialog('修改报销内容', '${ctx}/reimbursementType/reimbursementType/form?id=${workReimbursementTypeInfo.id}','80%','60%')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>
@@ -97,23 +98,24 @@
 										</c:if>
 										<c:if test="${workReimbursementTypeInfo.grade ==1}">
 											<shiro:hasPermission name="reimbursementType:reimbursementType:add">
-												<a href="javascript:void(0);" onclick="openDialog('添加报销内容', '${ctx}/reimbursementType/reimbursementType/form?parent.id=${workReimbursementTypeInfo.id}','80%','60%')" class="op-btn op-btn-add"><i class="fa fa-plus"></i> 添加下级结构</a>
+												<a href="javascript:void(0);" onclick="openDialog('添加报销内容', '${ctx}/reimbursementType/reimbursementType/form?parent.id=${workReimbursementTypeInfo.id}','80%','60%')" class="layui-btn layui-btn-sm"> 添加下级结构</a>
 											</shiro:hasPermission>
 											<shiro:hasPermission name="reimbursementType:reimbursementType:edit">
-												<a href="javascript:void(0);" onclick="openDialog('修改报销内容', '${ctx}/reimbursementType/reimbursementType/form?id=${workReimbursementTypeInfo.id}','80%','60%')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>
+												<a href="javascript:void(0);" onclick="openDialog('修改报销内容', '${ctx}/reimbursementType/reimbursementType/form?id=${workReimbursementTypeInfo.id}','80%','60%')" class="layui-btn layui-btn-sm layui-bg-blue" > 修改</a>
 											</shiro:hasPermission>
 											<shiro:hasPermission name="reimbursementType:reimbursementType:del">
-												<a href="${ctx}/reimbursementType/reimbursementType/delete?id=${workReimbursementTypeInfo.id}" onclick="return confirmx('确认要删除该报销内容吗？', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
+												<a href="${ctx}/reimbursementType/reimbursementType/delete?id=${workReimbursementTypeInfo.id}" onclick="return confirmx('确认要删除该报销内容吗？', this.href)"   class="layui-btn layui-btn-sm layui-bg-red"> 删除</a>
 											</shiro:hasPermission>
 										</c:if>
 										<c:if test="${workReimbursementTypeInfo.grade ==2}">
 											<shiro:hasPermission name="reimbursementType:reimbursementType:edit">
-												<a href="javascript:void(0);" onclick="openDialog('修改报销内容', '${ctx}/reimbursementType/reimbursementType/form?id=${workReimbursementTypeInfo.id}','80%','60%')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>
+												<a href="javascript:void(0);" onclick="openDialog('修改报销内容', '${ctx}/reimbursementType/reimbursementType/form?id=${workReimbursementTypeInfo.id}','80%','60%')" class="layui-btn layui-btn-sm layui-bg-blue" > 修改</a>
 											</shiro:hasPermission>
 											<shiro:hasPermission name="reimbursementType:reimbursementType:del">
-												<a href="${ctx}/reimbursementType/reimbursementType/delete?id=${workReimbursementTypeInfo.id}" onclick="return confirmx('确认要删除该报销内容吗？', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
+												<a href="${ctx}/reimbursementType/reimbursementType/delete?id=${workReimbursementTypeInfo.id}" onclick="return confirmx('确认要删除该报销内容吗？', this.href)"   class="layui-btn layui-btn-sm layui-bg-red"> 删除</a>
 											</shiro:hasPermission>
 										</c:if>
+										</div>
 									</div>
 								</td>
 							</tr>

src/main/webapp/webpage/modules/workclientinfo/workClientInfoList.jsp

@@ -133,9 +133,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: 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>
@@ -210,21 +215,38 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
+
 					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
-					<shiro:hasPermission name="workclientinfo:workClientInfo:add">
+					<div class="layui-btn-group" style="margin-left: 20px;">
+						<shiro:hasPermission name="workclientinfo:workClientInfo:add">
 							<table:addRow url="${ctx}/workclientinfo/workClientInfo/form" title="客户管理"></table:addRow><!-- 增加按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="workclientinfo:workClientInfo:import">
-						<table:importExcel url="${ctx}/workclientinfo/workClientInfo/import"></table:importExcel><!-- 导入按钮 -->
-					</shiro:hasPermission>
+						</shiro:hasPermission>
+						<shiro:hasPermission name="workclientinfo:workClientInfo:import">
+							<table:importExcel url="${ctx}/workclientinfo/workClientInfo/import"></table:importExcel><!-- 导入按钮 -->
+						</shiro:hasPermission>
+
+						<shiro:hasPermission name="workclientinfo:workClientInfo:export">
+							<table:exportExcel url="${ctx}/workclientinfo/workClientInfo/export"></table:exportExcel><!-- 导出按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="workclientinfo:workClientInfo:import">
+							<table:importInfoErr url="${ctx}/workclientinfo/workClientInfo/importInfoErr" title="导入日志"></table:importInfoErr><!-- 导出按钮 -->
+						</shiro:hasPermission>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<shiro:hasPermission name="workclientinfo:workClientInfo:add">--%>
+<%--							<table:addRow url="${ctx}/workclientinfo/workClientInfo/form" title="客户管理"></table:addRow><!-- 增加按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="workclientinfo:workClientInfo:import">--%>
+<%--						<table:importExcel url="${ctx}/workclientinfo/workClientInfo/import"></table:importExcel><!-- 导入按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
 
-					<shiro:hasPermission name="workclientinfo:workClientInfo:export">
-						<table:exportExcel url="${ctx}/workclientinfo/workClientInfo/export"></table:exportExcel><!-- 导出按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="workclientinfo:workClientInfo:import">
-						<table:importInfoErr url="${ctx}/workclientinfo/workClientInfo/importInfoErr" title="导入日志"></table:importInfoErr><!-- 导出按钮 -->
-					</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="workclientinfo:workClientInfo:export">--%>
+<%--						<table:exportExcel url="${ctx}/workclientinfo/workClientInfo/export"></table:exportExcel><!-- 导出按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="workclientinfo:workClientInfo:import">--%>
+<%--						<table:importInfoErr url="${ctx}/workclientinfo/workClientInfo/importInfoErr" title="导入日志"></table:importInfoErr><!-- 导出按钮 -->--%>
+<%--					</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"></table>
@@ -265,13 +287,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.canedit != undefined && d.canedit == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改客户信息', '${ctx}/workclientinfo/workClientInfo/form?id=" + d.id + "&param=1','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i>修改</a>"
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改客户信息', '${ctx}/workclientinfo/workClientInfo/form?id=" + d.id + "&param=1','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 修改</a>"
 
                         if(d.candelete != undefined && d.candelete == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"deleteFun('${ctx}/workclientinfo/workClientInfo/delete?id=" + d.id + "')\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"deleteFun('${ctx}/workclientinfo/workClientInfo/delete?id=" + d.id + "')\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
+                       	xml+="</div>"
                         return xml;
                     }}
             ]]

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -562,9 +562,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>
@@ -613,20 +618,36 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<shiro:hasPermission name="workcontractinfo:workContractInfo:add">
-						<button class="nav-btn nav-btn-add" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')"><i class="fa fa-plus"></i>&nbsp;添加</button>
-					</shiro:hasPermission>
-					<shiro:hasPermission name="workcontractinfo:workContractInfo:import">
-						<table:importExcel url="${ctx}/workcontractinfo/workContractInfo/import"></table:importExcel><!-- 导入按钮 -->
-					</shiro:hasPermission>
-					<%--<shiro:hasPermission name="workcontractinfo:workContractInfo:export">
-					</shiro:hasPermission>--%>
-					<shiro:hasPermission name="workcontractinfo:workContractInfo:export">
-						<table:exportExcel url="${ctx}/workcontractinfo/workContractInfo/export"></table:exportExcel><!-- 导出按钮 -->
-					</shiro:hasPermission>
-					<%--<table:importInfoErr url="${ctx}/workcontractinfo/workContractInfo/importInfoErr" title="导入日志"></table:importInfoErr>--%>
-
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i> 刷新</button>
+					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
+					<div class="layui-btn-group" style="margin-left: 20px;">
+						<shiro:hasPermission name="workcontractinfo:workContractInfo:add">
+							<button class="layui-btn layui-bg-blue" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')">&nbsp;添加</button>
+						</shiro:hasPermission>
+						<shiro:hasPermission name="workcontractinfo:workContractInfo:import">
+							<table:importExcel url="${ctx}/workcontractinfo/workContractInfo/import"></table:importExcel><!-- 导入按钮 -->
+						</shiro:hasPermission>
+						<%--<shiro:hasPermission name="workcontractinfo:workContractInfo:export">
+                        </shiro:hasPermission>--%>
+						<shiro:hasPermission name="workcontractinfo:workContractInfo:export">
+							<table:exportExcel url="${ctx}/workcontractinfo/workContractInfo/export"></table:exportExcel><!-- 导出按钮 -->
+						</shiro:hasPermission>
+
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<shiro:hasPermission name="workcontractinfo:workContractInfo:add">--%>
+<%--						<button class="nav-btn nav-btn-add" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')"><i class="fa fa-plus"></i>&nbsp;添加</button>--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="workcontractinfo:workContractInfo:import">--%>
+<%--						<table:importExcel url="${ctx}/workcontractinfo/workContractInfo/import"></table:importExcel><!-- 导入按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					&lt;%&ndash;<shiro:hasPermission name="workcontractinfo:workContractInfo:export">--%>
+<%--					</shiro:hasPermission>&ndash;%&gt;--%>
+<%--					<shiro:hasPermission name="workcontractinfo:workContractInfo:export">--%>
+<%--						<table:exportExcel url="${ctx}/workcontractinfo/workContractInfo/export"></table:exportExcel><!-- 导出按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					&lt;%&ndash;<table:importInfoErr url="${ctx}/workcontractinfo/workContractInfo/importInfoErr" title="导入日志"></table:importInfoErr>&ndash;%&gt;--%>
+
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i> 刷新</button>--%>
 
 					<div style="clear: both;"></div>
 				</div>
@@ -706,22 +727,22 @@
                     }}
                 ,{align:'center',title:"操作",minWidth:180,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
 
 						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
 						{
-							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同登记审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=invoice','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同登记审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=invoice','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 						}
 						if(d.recordNotifyFlag != undefined && d.recordNotifyFlag !=null && "" != d.recordNotifyFlag && d.recordNotifyFlag == 1)
 						{
-							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同归档审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.recordNotifyId +"&home=invoice','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同归档审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.recordNotifyId +"&home=invoice','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 						}
 						if(d.borrowNotifyFlag != undefined && d.borrowNotifyFlag !=null && "" != d.borrowNotifyFlag && d.borrowNotifyFlag == 1)
 						{
-							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同借用审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.borrowNotifyId +"&home=invoice','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+							xml+="<a href=\"#\" onclick=\"notifyDialogre('合同借用审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.borrowNotifyId +"&home=invoice','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
 						}
 						if(d.updateAdmin != undefined && d.updateAdmin == "1" ){
-							xml +="<a href=\"javascript:void(0)\" onclick=\"contractAdminUpdate('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/adminForm?id=" + d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改合同</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"contractAdminUpdate('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/adminForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs\" > 修改合同</a>";
 						}
                         if(d.status != 5){
 							/*if(d.signature != undefined && d.signature =="1")
@@ -739,19 +760,19 @@
                         }*/
 							if(d.canedit != undefined && d.canedit =="1")
 							{
-								xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogre('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/form?id=" + d.id + "&contractState="+d.status+"','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改合同</a>";
+								xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogre('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/form?id=" + d.id + "&contractState="+d.status+"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 修改合同</a>";
 							}
 							if(d.canedits != undefined && d.canedits =="1")
 							{
-								xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/form?id=" + d.id + "&contractState="+d.status+"','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改合同</a>";
+								xml +="<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/form?id=" + d.id + "&contractState="+d.status+"','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 修改合同</a>";
 							}
 							if(d.candelete != undefined && d.candelete =="1")
 							{
-								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/delete?id=" + d.id + "&contractState="+d.status+"\" onclick=\"return confirmx('确认要作废该合同信息吗？', this.href)\" class=\"op-btn op-btn-invalid\"><i class=\"fa fa-trash-o\"></i> 合同作废</a>";
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/delete?id=" + d.id + "&contractState="+d.status+"\" onclick=\"return confirmx('确认要作废该合同信息吗？', this.href)\" class=\"layui-btn layui-btn-xs \" style=\"background-color:#c2c2c2\"> 合同作废</a>";
 							}
 							if(d.cancancel != undefined && d.cancancel =="1")
 							{
-								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/revoke?id="+ d.id +"&contractState="+d.status+"&processInstanceId="+ d.processInstanceId +"\" onclick=\"return confirmx('确认要撤回该合同管理吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回合同</a>";
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/revoke?id="+ d.id +"&contractState="+d.status+"&processInstanceId="+ d.processInstanceId +"\" onclick=\"return confirmx('确认要撤回该合同管理吗？', this.href)\" class=\"layui-btn layui-btn-xs\" > 撤回合同</a>";
 							}
 
 							/*if(d.canalterCom != undefined && d.canalterCom =="1")
@@ -762,27 +783,27 @@
 							}*/
 							if(d.canalterComRevoke != undefined && d.canalterComRevoke =="1")
 							{
-								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/revokeCompletion?id="+ d.id +"\" onclick=\"return confirmx('确认要撤回该合同管理吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回合同</a>";
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/revokeCompletion?id="+ d.id +"\" onclick=\"return confirmx('确认要撤回该合同管理吗？', this.href)\" class=\"layui-btn layui-btn-xs\" > 撤回合同</a>";
 							}
 							if(d.canalterComDel != undefined && d.canalterComDel =="1")
 							{
 								<%--/* xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/saveCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要发起合同完成吗？', this.href)\"   class=\"op-btn op-btn-revert\"><i class=\"fa fa-edit\"></i> 完成</a>";*/--%>
-								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/deleteCompletion?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}/workcontractinfo/workContractInfo/deleteCompletion?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该合同吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除合同</a>";
 							}
 						} else if(d.contrractRecordStatus !="5"){
 							if(d.back != undefined && d.back =="1")
 							{
-								xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('归档申请', '${ctx}/workcontractrecord/workContractRecord/form?id="+ d.id +"&tabId=4','95%','95%')\" class=\"op-btn op-btn-revert\" ><i class=\"fa fa-edit\"></i> 归档</a>";
+								xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('归档申请', '${ctx}/workcontractrecord/workContractRecord/form?id="+ d.id +"&tabId=4','95%','95%')\" class=\"layui-btn layui-btn-xs \" > 归档</a>";
 							}
 
 							if(d.cancancelRecord != undefined && d.cancancelRecord == "1")
-								xml += "<a href=\"${ctx}/workcontractrecord/workContractRecord/cancelInvalidate?id=" + d.contrractRecordId + "&status="+d.contrractRecordStatus+"\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"op-btn op-btn-cancel\"><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回归档</a>";
+								xml += "<a href=\"${ctx}/workcontractrecord/workContractRecord/cancelInvalidate?id=" + d.contrractRecordId + "&status="+d.contrractRecordStatus+"\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"layui-btn layui-btn-xs\"> 撤回归档</a>";
 							if(d.caneditRecord1 != undefined && d.caneditRecord1 == "1")
-								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改归档信息', '${ctx}/workcontractrecord/workContractRecord/form?id="+ d.contrractRecordId + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档</a>";
+								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改归档信息', '${ctx}/workcontractrecord/workContractRecord/form?id="+ d.contrractRecordId + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 修改归档</a>";
 							if(d.caneditRecord2 != undefined && d.caneditRecord2 == "1")
-								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('修改归档信息', '${ctx}/workcontractrecord/workContractRecord/form?id="+ d.contrractRecordId + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档</a>";
+								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('修改归档信息', '${ctx}/workcontractrecord/workContractRecord/form?id="+ d.contrractRecordId + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 修改归档</a>";
 							if(d.caneditRecord3 != undefined && d.caneditRecord3 == "1")
-								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请归档', '${ctx}/workcontractrecord/workContractRecord/form?id=" + d.contrractRecordId + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改归档</a>";
+								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请归档', '${ctx}/workcontractrecord/workContractRecord/form?id=" + d.contrractRecordId + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 修改归档</a>";
 							/*if(d.candeleteRecord != undefined && d.candeleteRecord == "1")
 								xml +="<a href=\"${ctx}/workcontractrecord/workContractRecord/delete?id=" + d.contrractRecordId + "\" onclick=\"return confirmx('确认要删除该合同归档申请吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";*/
 						}
@@ -790,11 +811,11 @@
                         else if(d.contrractRecordStatus =="5"){
 							if((d.borrowStatus != undefined && d.borrowStatus == "0")|| d.borrowStatus == "4" || (d.giveStatus != undefined && d.giveStatus == "5"))
 							{
-								xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('借用申请', '${ctx}/workContractBorrow/workContractBorrow/form?id="+ d.id +"&tabId=4','95%','95%')\" style='background-color: #1E9FFF' class=\"op-btn op-btn-revert\" ><i class=\"fa fa-edit\"></i> 借用</a>";
+								xml += "<a href=\"javascript:void(0)\" onclick=\"contractOpenDialogres('借用申请', '${ctx}/workContractBorrow/workContractBorrow/form?id="+ d.id +"&tabId=4','95%','95%')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-blue\" > 借用</a>";
 							}
 
 							if(d.cancancelBorrow != undefined && d.cancancelBorrow == "1")
-								xml += "<a href=\"${ctx}/workContractBorrow/workContractBorrow/cancelInvalidate?id=" + d.borrowId + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"op-btn op-btn-cancel\"><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回借用</a>";
+								xml += "<a href=\"${ctx}/workContractBorrow/workContractBorrow/cancelInvalidate?id=" + d.borrowId + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-blue\"> 撤回借用</a>";
 							/*if(d.caneditBorrow1 != undefined && d.caneditBorrow1 == "1")
 								xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改归档信息', '${ctx}/workContractBorrow/workContractBorrow/form?id="+ d.borrowId + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
 							if(d.caneditBorrow2 != undefined && d.caneditBorrow2 == "1")
@@ -804,8 +825,9 @@
 							if(d.candeleteBorrow != undefined && d.candeleteBorrow == "1")
 								xml +="<a href=\"${ctx}/workContractBorrow/workContractBorrow/delete?id=" + d.borrowId + "\" onclick=\"return confirmx('确认要删除该合同归档申请吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";*/
 							if(d.giveBorrow != undefined && d.giveBorrow == "1")
-								xml +="<a href=\"${ctx}/workContractBorrow/workContractBorrow/updateGiveDate?id=" + d.borrowId + "\" onclick=\"return confirmx('确认归还该合同信息吗？', this.href)\"   class=\"btn btn-info btn-xs\"><i class=\"fa fa-edit\"></i> 归还合同</a>";
+								xml +="<a href=\"${ctx}/workContractBorrow/workContractBorrow/updateGiveDate?id=" + d.borrowId + "\" onclick=\"return confirmx('确认归还该合同信息吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-blue\"> 归还合同</a>";
 						}
+                        xml+="</div>"
                         return xml;
 
                     }}

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -376,9 +376,11 @@
 						</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>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -481,11 +483,13 @@
 		<div class="full-width fl">
 			<div class=" contentShadow shadowLBR layui-form contentDetails">
 				<div class="nav-btns">
-					<shiro:hasPermission name="workinvoice:workInvoice:add">
-						<button class="nav-btn nav-btn-add" title="发票管理" onclick="openDialogre('发票管理','${ctx}//workinvoiceAll/workInvoiceAll/form','95%','95%')"><i class="fa fa-plus"></i>&nbsp;添加</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> 刷新</button>
+					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
+					<div class="layui-btn-group" style="margin-left: 20px;">
+						<shiro:hasPermission name="workinvoice:workInvoice:add">
+							<button class="layui-btn layui-btn layui-bg-blue" title="发票管理" onclick="openDialogre('发票管理','${ctx}//workinvoiceAll/workInvoiceAll/form','95%','95%')">&nbsp;添加</button>
+						</shiro:hasPermission>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
 					<%--<shiro:hasPermission name="workinvoice:workInvoice:del">
 						<table:delRow url="${ctx}/workinvoiceAll/workInvoiceAll/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->
 					</shiro:hasPermission>--%>
@@ -566,28 +570,28 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-                ,{field:'op',align:'center',title:"操作",fixed: 'right',width:130,templet:function(d){
+                ,{field:'op',align:'center',title:"操作",fixed: 'right',width:180,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改发票', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改发票', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs\" >修改</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改发票', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=3','"+ d.id +"','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改发票', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=3','"+ d.id +"','95%','95%')\" class=\"layui-btn layui-btn-xs\" >修改</a>";
                         }
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请发票', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=4','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请发票', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=4','95%','95%')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                         }
                         if(d.candelete != undefined && d.candelete =="1")
                         {
-                            xml += "<a href=\"${ctx}/workinvoiceAll/workInvoiceAll/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}/workinvoiceAll/workInvoiceAll/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}/workinvoiceAll/workInvoiceAll/cancelInvalidate?id="+ d.id +"\" onclick=\"return confirmx('确认要强制撤回？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+                            xml += "<a href=\"${ctx}/workinvoiceAll/workInvoiceAll/cancelInvalidate?id="+ d.id +"\" onclick=\"return confirmx('确认要强制撤回？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回</a>";
                         }
                         /*if(d.canalter != undefined && d.canalter =="1")
                         {
@@ -596,33 +600,34 @@
 
 						if(d.financeFlag != undefined && d.financeFlag =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"receiptInvoice('发票收款', '${ctx}/workinvoiceAll/workInvoiceAll/receiptForm?id=" + d.id + "','95%','95%')\" class=\"op-btn layui-btn\" ><i class=\"fa fa-edit\"></i> 收款</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"receiptInvoice('发票收款', '${ctx}/workinvoiceAll/workInvoiceAll/receiptForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs\" > 收款</a>";
 						}
 						if(d.cancellationFlag != undefined && d.cancellationFlag =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废发票', '${ctx}/workinvoiceAll/workInvoiceAll/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-invalid\" ><i class=\"fa fa-trash-o\"></i> 作废</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废发票', '${ctx}/workinvoiceAll/workInvoiceAll/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs\" style=\"background-color:#c2c2c2\" > 作废</a>";
 						}
 						if(d.conditionCanedit != undefined && d.conditionCanedit =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废修改发票', '${ctx}/workinvoiceAll/workInvoiceAll/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废修改发票', '${ctx}/workinvoiceAll/workInvoiceAll/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
 						}
 						if(d.conditionCanedit3 != undefined && d.conditionCanedit3 =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请发票', '${ctx}/workinvoiceAll/workInvoiceAll/cancellationForm?id=" + d.id + "&tabId=4','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请发票', '${ctx}/workinvoiceAll/workInvoiceAll/cancellationForm?id=" + d.id + "&tabId=4','95%','95%')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
 						}
 						if(d.conditionCandelete != undefined && d.conditionCandelete =="1")
 						{
-							xml += "<a href=\"${ctx}/workinvoiceAll/workInvoiceAll/cancellationDelete?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}/workinvoiceAll/workInvoiceAll/cancellationDelete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该发票作废记录吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
 						}
 						if(d.conditionCancancel != undefined && d.conditionCancancel =="1")
 						{
-							xml += "<a href=\"${ctx}/workinvoiceAll/workInvoiceAll/conditionCancelInvalidate?id="+ d.id +"\" onclick=\"return confirmx('确认要强制撤回？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 作废撤回</a>";
+							xml += "<a href=\"${ctx}/workinvoiceAll/workInvoiceAll/conditionCancelInvalidate?id="+ d.id +"\" onclick=\"return confirmx('确认要强制撤回？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\"\" > 作废撤回</a>";
 						}
 
 						if(d.adminFlag != undefined && d.adminFlag =="1")
 						{
-							xml += "<a href=\"${ctx}/workinvoiceAll/workInvoiceAll/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}/workinvoiceAll/workInvoiceAll/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/workinvoice/workInvoiceForm.jsp

@@ -31,6 +31,28 @@
             return false;
         }
         $(document).ready(function() {
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+				form.on("radio(invoiceType)", function(event){
+					var radioVal = $(this).val();
+					//专票必填
+					if(radioVal == 1){
+						$(".invoicetype").show();
+						$("#bank").attr("class","form-control required layui-input");
+						$("#bankNumber").attr("class","form-control number required layui-input");
+						$("#orUnicode").attr("class","form-control isUscCode required layui-input");
+						$("#address").attr("class","form-control required layui-input");
+						$("#telephone").attr("class","form-control isTel required layui-input");
+					}else if(radioVal == 2){
+						$(".invoicetype").hide();
+						$("#bank").attr("class","form-control layui-input");
+						$("#bankNumber").attr("class","form-control number layui-input");
+						$("#orUnicode").attr("class","form-control isUscCode layui-input");
+						$("#address").attr("class","form-control layui-input");
+						$("#telephone").attr("class","form-control isTel layui-input");
+					}
+				});
+			});
             /*$('#money').keyup(function(){
                 var c=$(this);
                 if(/[^\d]/.test(c.val())){//替换非数字字符
@@ -90,28 +112,7 @@
             /*--------------*/
 
         });
-		layui.use(['form', 'layer'], function () {
-			var form = layui.form;
-			form.on("radio(invoiceType)", function(event){
-				var radioVal = $(this).val();
-				//专票必填
-				if(radioVal == 1){
-					$(".invoicetype").show();
-					$("#bank").attr("class","form-control required layui-input");
-					$("#bankNumber").attr("class","form-control number required layui-input");
-					$("#orUnicode").attr("class","form-control isUscCode required layui-input");
-					$("#address").attr("class","form-control required layui-input");
-					$("#telephone").attr("class","form-control isTel required layui-input");
-				}else if(radioVal == 2){
-					$(".invoicetype").hide();
-					$("#bank").attr("class","form-control layui-input");
-					$("#bankNumber").attr("class","form-control number layui-input");
-					$("#orUnicode").attr("class","form-control isUscCode layui-input");
-					$("#address").attr("class","form-control layui-input");
-					$("#telephone").attr("class","form-control isTel layui-input");
-				}
-			});
-		});
+
         function setValuee(obj){
             $.ajax({
                 type:'post',
@@ -158,8 +159,8 @@
                     $("#officeName").val(d.officeName);
                     $("#officeId").val(d.officeId);
 					$("#prdNumber").val(d.prdNumber);
-				})
-                }
+				}
+                })
         }
 
         function addRow(list, idx, tpl, row){

src/main/webapp/webpage/modules/workinvoice/workInvoiceList.jsp

@@ -432,9 +432,11 @@
 						</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-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn " onclick="resetSearch()">重置</button>
+								</div>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -537,11 +539,14 @@
 		<div class="full-width fl">
 			<div class=" contentShadow shadowLBR layui-form contentDetails">
 				<div class="nav-btns">
-					<shiro:hasPermission name="workinvoice:workInvoice:add">
-						<button class="nav-btn nav-btn-add" title="发票管理" onclick="openDialogre('发票管理','${ctx}//workinvoice/workInvoice/form','95%','95%')"><i class="fa fa-plus"></i>&nbsp;添加</button>
-					</shiro:hasPermission>
+					<div class="layui-btn-group" style="margin-left: 20px;">
+						<shiro:hasPermission name="workinvoice:workInvoice:add">
+							<button class="layui-btn  layui-bg-blue" title="发票管理" onclick="openDialogre('发票管理','${ctx}//workinvoice/workInvoice/form','95%','95%')">&nbsp;添加</button>
+						</shiro:hasPermission>
+						<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> 刷新</button>
 					<%--<shiro:hasPermission name="workinvoice:workInvoice:del">
 						<table:delRow url="${ctx}/workinvoice/workInvoice/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->
 					</shiro:hasPermission>--%>
@@ -623,30 +628,31 @@
                     }}
                 ,{field:'op',align:'center',title:"操作",fixed: 'right',width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
+
 						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
 						{
-							xml+="<a href=\"#\" onclick=\"notifyDialogre('发票审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=invoice','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+							xml+="<button onclick=\"notifyDialogre('发票审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=invoice','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</button>";
 						}
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改发票', '${ctx}/workinvoice/workInvoice/form?id=" + d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改发票', '${ctx}/workinvoice/workInvoice/form?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改发票', '${ctx}/workinvoice/workInvoice/form?id=" + d.id + "&tabId=3','"+ d.id +"','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改发票', '${ctx}/workinvoice/workInvoice/form?id=" + d.id + "&tabId=3','"+ d.id +"','95%','95%')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                         }
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请发票', '${ctx}/workinvoice/workInvoice/form?id=" + d.id + "&tabId=4','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请发票', '${ctx}/workinvoice/workInvoice/form?id=" + d.id + "&tabId=4','95%','95%')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                         }
                         if(d.candelete != undefined && d.candelete =="1")
                         {
-                            xml += "<a href=\"${ctx}/workinvoice/workInvoice/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}/workinvoice/workInvoice/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}/workinvoice/workInvoice/cancelInvalidate?id="+ d.id +"\" onclick=\"return confirmx('确认要强制撤回？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+                            xml += "<a href=\"${ctx}/workinvoice/workInvoice/cancelInvalidate?id="+ d.id +"\" onclick=\"return confirmx('确认要强制撤回？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回</a>";
                         }
                         /*if(d.canalter != undefined && d.canalter =="1")
                         {
@@ -655,33 +661,34 @@
 
 						if(d.financeFlag != undefined && d.financeFlag =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"receiptInvoice('发票收款', '${ctx}/workinvoice/workInvoice/receiptForm?id=" + d.id + "','95%','95%')\" class=\"op-btn layui-btn\" ><i class=\"fa fa-edit\"></i> 收款</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"receiptInvoice('发票收款', '${ctx}/workinvoice/workInvoice/receiptForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs \" > 收款</a>";
 						}
 						if(d.cancellationFlag != undefined && d.cancellationFlag =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废发票', '${ctx}/workinvoice/workInvoice/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-invalid\" ><i class=\"fa fa-trash-o\"></i> 作废</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废发票', '${ctx}/workinvoice/workInvoice/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-gray\" > 作废</a>";
 						}
 						if(d.conditionCanedit != undefined && d.conditionCanedit =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废修改发票', '${ctx}/workinvoice/workInvoice/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('作废修改发票', '${ctx}/workinvoice/workInvoice/cancellationForm?id=" + d.id + "&tabId=3','95%','95%')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
 						}
 						if(d.conditionCanedit3 != undefined && d.conditionCanedit3 =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请发票', '${ctx}/workinvoice/workInvoice/cancellationForm?id=" + d.id + "&tabId=4','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请发票', '${ctx}/workinvoice/workInvoice/cancellationForm?id=" + d.id + "&tabId=4','95%','95%')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
 						}
 						if(d.conditionCandelete != undefined && d.conditionCandelete =="1")
 						{
-							xml += "<a href=\"${ctx}/workinvoice/workInvoice/cancellationDelete?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}/workinvoice/workInvoice/cancellationDelete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该发票作废记录吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
 						}
 						if(d.conditionCancancel != undefined && d.conditionCancancel =="1")
 						{
-							xml += "<a href=\"${ctx}/workinvoice/workInvoice/conditionCancelInvalidate?id="+ d.id +"\" onclick=\"return confirmx('确认要强制撤回？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 作废撤回</a>";
+							xml += "<a href=\"${ctx}/workinvoice/workInvoice/conditionCancelInvalidate?id="+ d.id +"\" onclick=\"return confirmx('确认要强制撤回？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 作废撤回</a>";
 						}
 
 						if(d.adminFlag != undefined && d.adminFlag =="1")
 						{
-							xml += "<a href=\"${ctx}/workinvoice/workInvoice/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}/workinvoice/workInvoice/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/workreimbursement/workReimbursementAllList.jsp

@@ -76,9 +76,11 @@
 
                         <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>
                             </div>
                         </div>
                         <div style="    clear:both;"></div>
@@ -124,10 +126,12 @@
             <div class="contentShadow layui-form contentDetails">
                 <div class="nav-btns">
                     <%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
-                    <shiro:hasPermission name="workreimbursement:workReimbursementAll:add">
-                        <a href="javascript:void(0)" onclick="openDialogre('新增报销单', '${ctx}/workreimbursement/workReimbursementAll/form?tabId=0','95%','95%')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i>&nbsp;添加</a>
-                    </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: 20px;">
+                        <shiro:hasPermission name="workreimbursement:workReimbursementAll:add">
+                            <a href="javascript:void(0)" onclick="openDialogre('新增报销单', '${ctx}/workreimbursement/workReimbursementAll/form?tabId=0','95%','95%')" class="layui-btn layui-btn layui-bg-blue" >&nbsp;添加</a>
+                        </shiro:hasPermission>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
                     <div style="clear: both;"></div>
                 </div>
                 <table class="oa-table layui-table" id="contentTable"></table>
@@ -194,18 +198,19 @@
                 // ,{fixed: 'right',align:'center', toolbar: '#op',title:"操作"}
                 ,{align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml = "";
+                        var xml = "<div class=\"layui-btn-group\">";
                         if(d.cancancel != undefined && d.cancancel == "1")
-                            xml += "<a href=\"${ctx}/workreimbursement/workReimbursementAll/cancelInvalidate?id=" + d.id + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"op-btn op-btn-cancel\"><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+                            xml += "<a href=\"${ctx}/workreimbursement/workReimbursementAll/cancelInvalidate?id=" + d.id + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"layui-btn layui-btn-xs\">撤回</a>";
                         if(d.canedit1 != undefined && d.canedit1 == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改报销单', '${ctx}/workreimbursement/workReimbursementAll/form?id="+ d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改报销单', '${ctx}/workreimbursement/workReimbursementAll/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\">修改</a>";
                         if(d.canedit2 != undefined && d.canedit2 == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改报销单', '${ctx}/workreimbursement/workReimbursementAll/form?id="+ d.id + "&tabId=3','"+ d.id +"','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改报销单', '${ctx}/workreimbursement/workReimbursementAll/form?id="+ d.id + "&tabId=3','"+ d.id +"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\">修改</a>";
                         if(d.canedit3 != undefined && d.canedit3 == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请报销单', '${ctx}/workreimbursement/workReimbursementAll/form?id=" + d.id + "&tabId=4','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请报销单', '${ctx}/workreimbursement/workReimbursementAll/form?id=" + d.id + "&tabId=4','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" >修改</a>";
                         if(d.candelete != undefined && d.candelete == "1")
-                            xml +="<a href=\"${ctx}/workreimbursement/workReimbursementAll/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}/workreimbursement/workReimbursementAll/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/workreimbursement/workReimbursementList.jsp

@@ -132,9 +132,11 @@
 
                         <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>
                             </div>
                         </div>
                         <div style="    clear:both;"></div>
@@ -180,10 +182,12 @@
             <div class="contentShadow layui-form contentDetails">
                 <div class="nav-btns">
                     <%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
-                    <shiro:hasPermission name="workreimbursement:workReimbursement:add">
-                        <a href="javascript:void(0)" onclick="openDialogre('新增报销单', '${ctx}/workreimbursement/workReimbursement/form?tabId=0','95%','95%')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i>&nbsp;添加</a>
-                    </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: 20px;">
+                        <shiro:hasPermission name="workreimbursement:workReimbursement:add">
+                            <button onclick="openDialogre('新增报销单', '${ctx}/workreimbursement/workReimbursement/form?tabId=0','95%','95%')" class="layui-btn layui-btn layui-bg-blue" >&nbsp;添加</button>
+                        </shiro:hasPermission>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
                     <div style="clear: both;"></div>
                 </div>
                 <table class="oa-table layui-table" id="contentTable"></table>
@@ -250,22 +254,23 @@
                 // ,{fixed: 'right',align:'center', toolbar: '#op',title:"操作"}
                 ,{align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml = "";
+                        var xml = "<div class=\"layui-btn-group\">";
                         if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
                         {
-                            xml+="<a href=\"#\" onclick=\"notifyDialogre('报销审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=reimbursement','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+                            xml+="<a href=\"#\" onclick=\"notifyDialogre('报销审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=reimbursement','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel == "1")
-                            xml += "<a href=\"${ctx}/workreimbursement/workReimbursement/cancelInvalidate?id=" + d.id + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"op-btn op-btn-cancel\"><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+                            xml += "<a href=\"${ctx}/workreimbursement/workReimbursement/cancelInvalidate?id=" + d.id + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-blue\"> 撤回</a>";
                         if(d.canedit1 != undefined && d.canedit1 == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改报销单', '${ctx}/workreimbursement/workReimbursement/form?id="+ d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改报销单', '${ctx}/workreimbursement/workReimbursement/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                         if(d.canedit2 != undefined && d.canedit2 == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改报销单', '${ctx}/workreimbursement/workReimbursement/form?id="+ d.id + "&tabId=3','"+ d.id +"','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreModify('修改报销单', '${ctx}/workreimbursement/workReimbursement/form?id="+ d.id + "&tabId=3','"+ d.id +"','95%','95%')\" class=\"layui-btn layui-btn-xs\" >修改</a>";
                         if(d.canedit3 != undefined && d.canedit3 == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请报销单', '${ctx}/workreimbursement/workReimbursement/form?id=" + d.id + "&tabId=4','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogreplay('重新申请报销单', '${ctx}/workreimbursement/workReimbursement/form?id=" + d.id + "&tabId=4','95%','95%')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                         if(d.candelete != undefined && d.candelete == "1")
-                            xml +="<a href=\"${ctx}/workreimbursement/workReimbursement/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}/workreimbursement/workReimbursement/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

@@ -112,9 +112,14 @@
                     </div>
                     <div class="layui-item athird fr">
                         <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,13 +251,14 @@
                 ,{field:'entryDate', align:'center',sort:true,title: '入职日期',width:100}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml = "";
+                        var xml = "<div class=\"layui-btn-group\">";
 
                         if(d.canedit != undefined && d.canedit == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改', '${ctx}/workstaff/workStaffBasicInfo/form?id="+ 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}/workstaff/workStaffBasicInfo/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 修改</a>";
 
                         if(d.candelete != undefined && d.candelete == "1")
-                            xml +="<a href=\"${ctx}/workstaff/workStaffBasicInfo/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}/workstaff/workStaffBasicInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除信息吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
+                        xml+="</div>"
                         return xml;
                     }}
             ]]