Merge branch 'master' of http://192.168.2.4:3000/user5/simple_xg_total_process_master

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectViewController.java

@@ -11,10 +11,12 @@ import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryRelationInfo;
 import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryRelationService;
+import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectReportDataService;
+import com.jeeplus.modules.projectcontentinfo.service.ProjectReportRecordService;
 import com.jeeplus.modules.projectcontentinfo.service.ProjectcontentinfoService;
 import com.jeeplus.modules.projectrecord.entity.ProjectPlanInfo;
 import com.jeeplus.modules.projectrecord.service.ProjectPlanService;
@@ -38,6 +40,8 @@ import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.checkerframework.checker.units.qual.A;
@@ -87,6 +91,12 @@ public class RuralProjectViewController extends BaseController {
     private RuralProjectRecordsService ruralProjectRecordsService;
     @Autowired
     private SubProjectInfoService subProjectInfoService;
+    @Autowired
+    private ProjectReportRecordService projectReportRecordService;
+    @Autowired
+    private ProjectTemplateService projectTemplateService;
+    @Autowired
+    private ActTaskService actTaskService;
 
     /**
      * 项目查看
@@ -165,6 +175,10 @@ public class RuralProjectViewController extends BaseController {
             model.addAttribute("projectRecords", projectRecords);
         }
         workContractInfo = workContractInfoService.get(workContractInfo.getId());
+        if (null == workContractInfo){
+            model.addAttribute("workContractInfo", workContractInfo);
+            return "modules/ruralprojectrecords/view/workClientAndContractView";
+        }
         if("0".equals(workContractInfo.getExt())){
             WorkBidProject workBidProject = workBidProjectService.get(workContractInfo.getProject().getId());
             workContractInfo.setProject(workBidProject);
@@ -207,7 +221,15 @@ public class RuralProjectViewController extends BaseController {
             model.addAttribute("projectRecords", projectRecords);
         }
         Projectcontentinfo projectcontentinfo1 = projectcontentinfoService.getByProjectId(projectcontentinfo.getProjectId());
+        if (null ==projectcontentinfo1){
+            model.addAttribute("projectReportData",null);
+            return "modules/ruralprojectrecords/view/reportView";
+        }
         ProjectReportData projectReportData = projectReportDataService.getOnRural(projectcontentinfo1.getInfoId());
+        if (null ==projectReportData){
+            model.addAttribute("projectReportData",null);
+            return "modules/ruralprojectrecords/view/reportView";
+        }
         projectReportData = projectReportDataService.get(projectReportData.getId());
         RuralProjectRecords ruralProjectRecords = projectRecordsService.getQueryProjectUsers(projectcontentinfo1.getProject().getId());
         Projectcontentinfo projectcontent = projectcontentinfoService.getByInfoId(projectReportData.getId());
@@ -436,7 +458,7 @@ public class RuralProjectViewController extends BaseController {
     }
     /**
      * 文件上传查看页面
-     * 附件信息
+     * 档案信息
      * @param projectRecords
      * @param model
      * @return
@@ -473,4 +495,89 @@ public class RuralProjectViewController extends BaseController {
         model.addAttribute("flagProjectReportData",projectReportData);
         return "modules/ruralprojectrecords/view/projectAccessoryView";
     }
+
+    /**
+     * 线上归档信息
+     * @param projectRecords
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "formRecordModify")
+    public String formRecordModify(RuralProjectRecords projectRecords, Model model) {
+        projectRecords = projectRecordsService.get(projectRecords.getId());
+        if (null == projectRecords.getPrrId()){
+            model.addAttribute("projectReportRecord", null);
+            return "modules/ruralprojectrecords/view/projectReportRecordView";
+        }
+        ProjectReportRecord projectReportRecord = projectReportRecordService.get(projectRecords.getPrrId());
+        if(StringUtils.isBlank(projectReportRecord.getId())){
+            projectReportRecord.setCreateDate(new Date());
+            projectReportRecord.setCreateBy(UserUtils.getUser());
+        }
+        projectReportRecord.setView("modify");
+        //获取项目信息
+        RuralProjectRecords ruralProjectRecords = projectRecordsService.get(projectReportRecord.getReport().getProject().getId());
+        //根据条件查询附件必填项
+        //判断项目类别是否为打包项目(1：打包项目，0：非打包项目)
+        /*Integer projectSort = projectAccessoryRelationService.decideAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+
+        Boolean flag = false;
+        //如果是打包项目或者报告送审价不为null则可进行查询附件类型
+        if(1 == projectSort || null != projectReportRecord.getReport().getReviewFee()){
+            flag = true;
+        }
+        if(flag) {*/
+        ProjectAccessoryRelationInfo relateInfo = new ProjectAccessoryRelationInfo();
+        //添加项目类型
+        relateInfo.setAttachmentProjectType(ruralProjectRecords.getProjectType());
+        relateInfo.setAttachmentProjectSort(ruralProjectRecords.getAttachmentProjectSort());
+        //判断是否为打包项目，打包项目无需查看项目送审金额是否为500w以上判定
+        //if(0 == projectSort){
+        //查看送审金额是否为500w以上金额
+        Integer approvalMoney = projectAccessoryRelationService.decideAttachmentProjectApprovalMoney(projectReportRecord.getReport().getReviewFee());
+        approvalMoney = 2;
+        switch (approvalMoney){
+            case 0:
+                //金额为0
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+                break;
+            case 1:
+                //500w以下金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("1");
+                break;
+            case 2:
+                //500w以上金额状态
+                relateInfo.setAttachmentProjectApprovalMoney("2");
+                break;
+        }
+            /*}else{
+                relateInfo.setAttachmentProjectApprovalMoney(null);
+            }*/
+
+        //添加报告类型
+        relateInfo.setRequiredStage(2);
+        relateInfo.setId(ruralProjectRecords.getId());
+        //查询报告文件、依据性文件、其他文件必填列表以及数据
+        List<MainDictDetail> mainDictDetails = projectTemplateService.attachmentTemplateList();
+        for (MainDictDetail mainDict : mainDictDetails) {
+            relateInfo.setAttachType(mainDict.getValue());
+            switch (mainDict.getValue()) {
+                case "11":
+                    projectReportRecord.setFileAttachmentList(projectTemplateService.getProjectTemplateList(relateInfo));
+                    break;
+                case "12":
+                    projectReportRecord.setFileGistdataList(projectTemplateService.getProjectTemplateList(relateInfo));
+                    break;
+                case "13":
+                    projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
+                    break;
+            }
+
+        }
+        //}
+
+        model.addAttribute("projectReportRecord", projectReportRecord);
+        model.addAttribute("project", projectReportRecord.getReport().getProject());
+        return "modules/ruralprojectrecords/view/projectReportRecordView";
+    }
 }

src/main/java/com/jeeplus/modules/sys/web/MenuController.java

@@ -202,7 +202,7 @@ public class MenuController extends BaseController {
 	@RequiresPermissions("user")
 	@ResponseBody
 	@RequestMapping(value = "treeData")
-	public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response) {
+	public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide,@RequestParam(required=false) String selectName, HttpServletResponse response) {
 		List<Map<String, Object>> mapList = Lists.newArrayList();
 		List<Menu> list = systemService.findAllMenu();
 		for (int i=0; i<list.size(); i++){

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -64,11 +64,13 @@
         ,su.name AS "createBy.name"
         ,o.top_company AS "office.name"
 		,prd.number AS "projectReportNumber"
+		,prr.id As "prrid"
         FROM rural_project_records a
         <include refid="projectRecordsJoins"/>
-		left join project_report_data prd on prd.project_id = a.id
         LEFT JOIN sys_user su ON su.id = a.create_by
-        LEFT JOIN sys_office o ON o.id = a.office_id
+		left join project_report_data prd on prd.project_id = a.id
+		LEFT JOIN rural_project_report_record prr on prd.id = prr.report_id
+		LEFT JOIN sys_office o ON o.id = a.office_id
 		WHERE a.id = #{id}
 	</select>
 

src/main/webapp/WEB-INF/tags/sys/treeselectArae.tag

@@ -0,0 +1,106 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ attribute name="id" type="java.lang.String" required="true" description="编号"%>
+<%@ attribute name="name" type="java.lang.String" required="true" description="隐藏域名称（ID）"%>
+<%@ attribute name="value" type="java.lang.String" required="true" description="隐藏域值（ID）"%>
+<%@ attribute name="labelName" type="java.lang.String" required="true" description="输入框名称（Name）"%>
+<%@ attribute name="labelValue" type="java.lang.String" required="true" description="输入框值（Name）"%>
+<%@ attribute name="title" type="java.lang.String" required="true" description="选择框标题"%>
+<%@ attribute name="url" type="java.lang.String" required="true" description="树结构数据地址"%>
+<%@ attribute name="checked" type="java.lang.Boolean" required="false" description="是否显示复选框，如果不需要返回父节点，请设置notAllowSelectParent为true"%>
+<%@ attribute name="extId" type="java.lang.String" required="false" description="排除掉的编号（不能选择的编号）"%>
+<%@ attribute name="isAll" type="java.lang.Boolean" required="false" description="是否列出全部数据，设置true则不进行数据权限过滤（目前仅对Office有效）"%>
+<%@ attribute name="notAllowSelectRoot" type="java.lang.Boolean" required="false" description="不允许选择根节点"%>
+<%@ attribute name="notAllowSelectParent" type="java.lang.Boolean" required="false" description="不允许选择父节点"%>
+<%@ attribute name="module" type="java.lang.String" required="false" description="过滤栏目模型（只显示指定模型，仅针对CMS的Category树）"%>
+<%@ attribute name="selectScopeModule" type="java.lang.Boolean" required="false" description="选择范围内的模型（控制不能选择公共模型，不能选择本栏目外的模型）（仅针对CMS的Category树）"%>
+<%@ attribute name="allowClear" type="java.lang.Boolean" required="false" description="是否允许清除"%>
+<%@ attribute name="allowInput" type="java.lang.Boolean" required="false" description="文本框可填写"%>
+<%@ attribute name="cssClass" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="cssStyle" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="smallBtn" type="java.lang.Boolean" required="false" description="缩小按钮显示"%>
+<%@ attribute name="hideBtn" type="java.lang.Boolean" required="false" description="是否显示按钮"%>
+<%@ attribute name="disabled" type="java.lang.String" required="false" description="是否限制选择，如果限制，设置为disabled"%>
+<%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
+<%@ attribute name="rule" type="java.lang.String" required="false" description="考勤规则模块用"%>
+	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}" />
+	<div class="input-group">
+		<input id="${id}Name" placeholder="请选择${title}" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		class="${cssClass} required" style="${cssStyle}"/>
+       		 <span class="input-group-btn">
+	       		 <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>
+	             </button> 
+       		 </span>
+
+    </div>
+	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>
+<script type="text/javascript">
+	$("#${id}Button, #${id}Name").click(function(){
+		// 是否限制选择，如果限制，设置为disabled
+		if ($("#${id}Button").hasClass("disabled")){
+			return true;
+		}
+		// 正常打开
+		top.layer.open({
+		    type: 2,
+		    area: ['300px', '420px'],
+		    title:"选择${title}",
+		    ajaxData:{selectIds: $("#${id}Id").val()},
+		    content: "${ctx}/tag/treeselectArae?url="+encodeURIComponent("${url}")+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}&unit=${unit}" ,
+		    btn: ['确定', '关闭']
+    	       ,yes: function(index, layero){ //或者使用btn1
+						var tree = layero.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
+						var ids = [], names = [], nodes = [];
+						if ("${checked}" == "true"){
+							nodes = tree.getCheckedNodes(true);
+						}else{
+							nodes = tree.getSelectedNodes();
+						}
+						for(var i=0; i<nodes.length; i++) {//<c:if test="${checked && notAllowSelectParent}">
+							if (nodes[i].isParent){
+								continue; // 如果为复选框选择，则过滤掉父节点
+							}//</c:if><c:if test="${notAllowSelectRoot}">
+							if (nodes[i].level == 0){
+								//top.$.jBox.tip("不能选择根节点（"+nodes[i].name+"）请重新选择。");
+								top.layer.msg("不能选择根节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								return false;
+							}//</c:if><c:if test="${notAllowSelectParent}">
+							if (nodes[i].isParent){
+								//top.$.jBox.tip("不能选择父节点（"+nodes[i].name+"）请重新选择。");
+								//layer.msg('有表情地提示');
+								top.layer.msg("不能选择父节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								return false;
+							}//</c:if><c:if test="${not empty module && selectScopeModule}">
+							if (nodes[i].module == ""){
+								//top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
+								top.layer.msg("不能选择公共模型（"+nodes[i].name+"）请重新选择。", {icon: 0});
+								return false;
+							}else if (nodes[i].module != "${module}"){
+								//top.$.jBox.tip("不能选择当前栏目以外的栏目模型，请重新选择。");
+								top.layer.msg("不能选择当前栏目以外的栏目模型，请重新选择。", {icon: 0});
+								return false;
+							}//</c:if>
+							ids.push(nodes[i].id);
+							names.push(nodes[i].name);//<c:if test="${!checked}">
+							break; // 如果为非复选框选择，则返回第一个选择  </c:if>
+						}
+						$("#${id}Id").val(ids.join(",").replace(/u_/ig,"")).change();
+						$("#${id}Name").val(names.join(",")).change();
+						$("#${id}Name").focus();
+						var rule="${rule}";
+						var id="${id}";
+						if(rule=='rule'){
+                            var _placeName =  id.split("_")[0]+"_placeName";
+                            var _itude =  id.split("_")[0]+"_itude";
+                            $("#"+_placeName).val("");
+                            $("#"+_itude).val("");
+						}
+						top.layer.close(index);
+				    	       },
+    	cancel: function(index){ //或者使用btn2
+    	           //按钮【按钮二】的回调
+    	       }
+		});
+
+	});
+</script>

src/main/webapp/WEB-INF/tags/sys/treeselectt.tag

@@ -45,7 +45,7 @@
 		    area: ['300px', '420px'],
 		    title:"选择${title}",
 		    ajaxData:{selectIds: $("#${id}Id").val()},
-		    content: "${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}" ,
+		    content: "${ctx}/tag/treeselectReimbur?url="+encodeURIComponent("${url}")+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}" ,
 		    btn: ['确定', '关闭']
     	       ,yes: function(index, layero){ //或者使用btn1
 						var tree = layero.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();

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

@@ -3,7 +3,7 @@
 <%@ attribute name="id" type="java.lang.String" required="true"%>
 <%@ attribute name="url" type="java.lang.String" required="true"%>
 <%@ attribute name="label" type="java.lang.String" required="false"%>
-<button class="layui-btn layui-bg-red" onclick="deleteAll()" data-toggle="tooltip" data-placement="top">
+<button class="layui-btn layui-btn-sm layui-bg-blue" onclick="deleteAll()" data-toggle="tooltip" data-placement="top">
 <%--    <i class="fa fa-trash-o"> </i>--%>
     ${label==null?'删除':label}
                         </button>

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

@@ -7,7 +7,7 @@
 <%@ 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="layui-btn layui-bg-green" data-toggle="tooltip" data-placement="left" onclick="edit()" title="修改">
+<button class="layui-btn layui-btn-sm layui-bg-blue" data-toggle="tooltip" data-placement="left" onclick="edit()" title="修改">
 <%--    <i class="fa fa-file-text-o"></i> --%>
     ${label==null?'修改':label}</button>
 <%--                        </button>--%>

src/main/webapp/WEB-INF/tags/table/subProjectAddRow.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-sm 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/static/common/css/style.css

@@ -5560,6 +5560,10 @@ dd.project-people {
 .clients-list {
     margin-top: 20px;
 }
+.topMar {
+    margin-top: 70px;
+    margin-left: 20px;
+}
 
 .clients-list .tab-pane {
     position: relative;
@@ -9540,6 +9544,14 @@ a.attention-info.a_visited{
     width:50%;
     float: left;
 }
+
+/*滚动条tap页固定*/
+.tapfixed{
+    position: fixed;
+    top: 0;
+    width: 100%;
+    z-index: 100;
+}
 /*form表单完成*/
 
 a.dropdown-toggle:hover{

src/main/webapp/static/layer-v2.3/layim/layui/lay/pc/modules/layim.js

@@ -18,7 +18,7 @@ layui.define(['jquery', 'layer', 'laytpl', 'upload'], function(exports){
 
   //回调
   var call = {};
-  
+  var friendMap = {}
   //对外API
   var LAYIM = function(){
     this.v = v;
@@ -307,8 +307,10 @@ layui.define(['jquery', 'layer', 'laytpl', 'upload'], function(exports){
       ,type: options.type || 'get'
       ,data: options.data
       ,dataType: options.dataType || 'json'
+      ,async: false
       ,cache: false
       ,success: function(res){
+        friendMap = res.data.friend;
         res.code == 0 
           ? callback && callback(res.data||{})
         : layer.msg(res.msg || ((tips||'Error') + ': LAYIM_NOT_GET_DATA'), {

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

@@ -306,10 +306,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+<%--								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -324,10 +324,10 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
-						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+						<button class="layui-btn layui-btn-sm" 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>--%>
@@ -468,7 +468,7 @@
 				if(1 == d.operationSign) {
 					return [
 						'<div class=\"layui-btn-group\">'+
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增跟踪咨询报告\', \'${ctx}/project/constructionContract/followForm?project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增跟踪咨询报告\', \'${ctx}/project/constructionContract/followForm?project.id=' + d.id +'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-blue" > 新增</a>',
 						+'</div>'
 					].join('');
 				}else{
@@ -481,7 +481,7 @@
 					if(d.status == 1){
 						return [
 							'<div class=\"layui-btn-group\">'+
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改跟踪咨询报告内容\', \'${ctx}/project/constructionContract/followForm?id='+d.id+'&project.id='+d.pid+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" >  编辑</a>',
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改跟踪咨询报告内容\', \'${ctx}/project/constructionContract/followForm?id='+d.id+'&project.id='+d.pid+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-btn-green" >  编辑</a>',
 							'<a href="${ctx}/project/constructionContract/deleteFollow?project.id='+d.pid+'&id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该跟踪咨询报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>',
 
 							+'</div>'

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

@@ -72,11 +72,11 @@
 								</select>
 							</div>
 						</div>
-						<div class="layui-item athird">
+						<div class="layui-item athird fr">
 							<div class="input-group">
-								<div class="layui-btn-group" style="margin-left: 10px;">
-									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
-									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -97,7 +97,7 @@
 						<shiro:hasPermission name="act:model:del">
 							<table:delRow url="${ctx}/act/model/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->
 						</shiro:hasPermission>
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 <%--					<shiro:hasPermission name="act:model:create">--%>
 <%--						<table:addRow url="${ctx}/act/model/create"  title="新建模型"></table:addRow><!-- 增加按钮 -->--%>

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

@@ -40,9 +40,9 @@
 
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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 class="layui-btn-group search-spacing" >
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -56,8 +56,8 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" 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>

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

@@ -73,11 +73,11 @@
 								</select>
 							</div>
 						</div>
-						<div class="layui-item athird">
+						<div class="layui-item athird fr">
 							<div class="input-group">
-								<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 class="layui-btn-group search-spacing	">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -93,7 +93,7 @@
 				<div class="nav-btns">
 					<div class="layui-btn-group" style="margin-left: 15px;">
 						<table:addRow url="${ctx}/act/process/deploy/" label="上传流程文件" title="新建模型"></table:addRow><!-- 增加按钮 -->
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<button class="layui-btn layui-btn-sm " data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 					<%--<shiro:hasPermission name="act:process:deploy">--%>
 <%--						<table:addRow url="${ctx}/act/process/deploy/" label="上传流程文件" title="新建模型"></table:addRow><!-- 增加按钮 -->--%>

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

@@ -40,9 +40,9 @@
 
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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 class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -56,8 +56,8 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" 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>

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

@@ -159,10 +159,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm" 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>--%>
@@ -211,8 +211,8 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" 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>
@@ -260,11 +260,11 @@
 						var xml="<div class=\"layui-btn-group\">";
 						if(d.canedit3 != undefined && d.canedit3 =="1")
 						{
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/processProject/processProjectPlan/form?view=view&id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" > 详情</a>";
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/processProject/processProjectPlan/form?view=view&id='+encodeURIComponent('" + d.id + "'),'95%','95%')\"  class=\"layui-btn layui-btn-xs layui-bg-green\" > 详情</a>";
 						}
 						if(d.canedit4 != undefined && d.canedit4 =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/processProject/processProjectPlan/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs\" > 编辑</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/processProject/processProjectPlan/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 编辑</a>";
 						}
 						xml+="</div>"
 						return xml;

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

@@ -39,11 +39,11 @@
 								<form:input path="typeName" htmlEscape="false" class=" form-control layui-input"></form:input>
 							</div>
 						</div>
-						<div class="layui-item athird">
+						<div class="layui-item athird fr">
 							<div class="input-group">
-								<div class="layui-btn-group" style="margin-left: 20px;">
-									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
-									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
 								</div>
 <%--								<button id="searchReset" style="margin-right: 0px;" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
 <%--								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
@@ -58,7 +58,7 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
+					<div class="layui-btn-group">
 						<shiro:hasPermission name="project:projectType:add">
 							<table:addRow url="${ctx}/projectType/projectType/form" title="项目内容类型"></table:addRow><!-- 增加按钮 -->
 						</shiro:hasPermission>
@@ -68,7 +68,7 @@
 						<shiro:hasPermission name="project:projectType:export">
 							<table:exportExcel url="${ctx}/projectType/projectType/export"></table:exportExcel><!-- 导出按钮 -->
 						</shiro:hasPermission>
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 <%--					<shiro:hasPermission name="project:projectType:add">--%>
 <%--						<table:addRow url="${ctx}/projectType/projectType/form" title="项目内容类型"></table:addRow><!-- 增加按钮 -->--%>
@@ -162,14 +162,14 @@
 			if(d.tier == 3){
 				return [
 					'<div class=\"layui-btn-group\">'+
-					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('新增宜居性文件类型信息','${ctx}/project/projectAccordingType/form?view=saveSubordinateInfo&id="+d.id+"','60%', '95%');\" class=\"layui-btn layui-btn-xs layui-bg-green\"> 新增下级项目类型</a>",
+					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('新增宜居性文件类型信息','${ctx}/project/projectAccordingType/form?view=saveSubordinateInfo&id="+d.id+"','60%', '95%');\" class=\"layui-btn layui-btn-xs layui-bg-blue\"> 新增下级项目类型</a>",
 
 					+'</div>'
 				].join('');
 			}else if(d.tier == 4){
 				return [
 					'<div class=\"layui-btn-group\">'+
-					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('修改项目类型信息','${ctx}/project/projectAccordingType/form?view=updateSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"layui-btn layui-btn-xs\">修改</a>",
+					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('修改项目类型信息','${ctx}/project/projectAccordingType/form?view=updateSubordinateInfo&id="+d.id+"','95%', '95%');\" class=\"layui-btn layui-btn-xs layui-bg-green\">修改</a>",
 					'<a href="${ctx}/projectType/projectType/delete?id='+d.id+'" onclick="return confirmxRefresh(\'确认要删除该项目类型信息吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red">删除</a>',
 
 					+'</div>'

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

@@ -39,11 +39,11 @@
 								<form:input path="typeName" htmlEscape="false" class=" form-control layui-input"></form:input>
 							</div>
 						</div>
-						<div class="layui-item athird">
+						<div class="layui-item athird fr">
 							<div class="input-group">
-								<div class="layui-btn-group" style="margin-left: 10px;">
-									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
-									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
 								</div>
 <%--								<button id="searchReset" style="margin-right: 0px;" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
 <%--								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
@@ -57,8 +57,8 @@
 		</div>
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
-				<div class="nav-btns"><div class="layui-btn-group" style="margin-left: 15px;">
-					<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+				<div class="nav-btns"><div class="layui-btn-group">
+					<button class="layui-btn layui-btn-sm" 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>
@@ -143,7 +143,7 @@
 			if(d.tier == 3){
 				return [
 					'<div class=\"layui-btn-group\">'+
-					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('新增模板文件信息','${ctx}/project/projectResultsFileTemplate/form?view=saveSubordinateInfo&id="+d.id+"','80%', '95%');\" class=\"layui-btn layui-btn-xs layui-bg-green\"> 新增模板文件</a>",
+					"<a href=\"javascript:void(0)\" onclick=\"openProjectType('新增模板文件信息','${ctx}/project/projectResultsFileTemplate/form?view=saveSubordinateInfo&id="+d.id+"','80%', '95%');\" class=\"layui-btn layui-btn-xs layui-bg-blue\"> 新增模板文件</a>",
 
 					+'</div>'
 				].join('');

src/main/webapp/webpage/modules/projectAccessory/projectAccessoryRelation/projectAccessoryRelationList.jsp

@@ -264,9 +264,9 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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 class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm" 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>--%>
@@ -292,10 +292,10 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
-						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+						<button class="layui-btn layui-btn-sm" 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>--%>
@@ -425,12 +425,16 @@
 			}
 			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="layui-btn layui-btn-xs" > 新增附件关系</a>',
+					'<div class="layui-btn-group">'+
+					'<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 layui-bg-blue" > 新增附件关系</a>',
+					+'</div>'
 				].join('');
 			} else if (d.condition ==2){
 				return [
-					'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改必填阶段\', \'${ctx}/projectAccessoryRelation/projectAccessoryRelation/form?id='+d.id+'\',\'80%\',\'60%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
+					'<div class="layui-btn-group">'+
+					'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改必填阶段\', \'${ctx}/projectAccessoryRelation/projectAccessoryRelation/form?id='+d.id+'\',\'80%\',\'60%\')" class="layui-btn layui-btn-xs layui-bg-green" > 编辑</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>'
+					+'</div>'
 				].join('');
 			}else{
 				return [

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

@@ -43,9 +43,9 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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 class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -63,8 +63,8 @@
 						<%--<shiro:hasPermission name="projectAccessory:projectAccessory:add">
 							<table:addRow url="${ctx}/projectTemplate/projectTemplate/form" title="项目"></table:addRow><!-- 增加按钮 -->
 						</shiro:hasPermission>--%>
-							<div class="layui-btn-group" style="margin-left: 15px;">
-								<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+							<div class="layui-btn-group">
+								<button class="layui-btn layui-btn-sm" 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>
@@ -104,15 +104,15 @@
 									<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="layui-btn layui-btn-sm"> 添加下级结构</a>
+												<a href="javascript:void(0);" onclick="openDialog('添加附件结构', '${ctx}/projectTemplate/projectTemplate/form?parent.id=${projectAccessory.id}','80%','80%')" class="layui-btn layui-btn-xs layui-bg-blue"> 添加下级结构</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="layui-btn layui-btn-sm layui-bg-blue" > 修改</a>
+											<a href="javascript:void(0);" onclick="openDialog('修改附件结构', '${ctx}/projectTemplate/projectTemplate/form?id=${projectAccessory.id}','80%','80%')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>
 										</shiro:hasPermission>
 										<shiro:hasPermission name="projectTemplate:projectTemplate:del">
-											<a href="${ctx}/projectTemplate/projectTemplate/delete?id=${projectAccessory.id}" onclick="return confirmx('确认要删除该复附件结构及其子附件结构吗？', this.href)"   class="layui-btn layui-btn-sm layui-bg-red"> 删除</a>
+											<a href="${ctx}/projectTemplate/projectTemplate/delete?id=${projectAccessory.id}" onclick="return confirmx('确认要删除该复附件结构及其子附件结构吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>
 										</shiro:hasPermission>
 										</c:if>
 									</div>

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

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

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

@@ -254,10 +254,10 @@
                         </div>
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <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>
+                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group search-spacing">
+                                    <button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -293,16 +293,16 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <div class="layui-btn-group" style="margin-left: 15px;">
-                        <button class="layui-btn" id="btn-expand">全部展开</button>
-                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+                    <div class="layui-btn-group">
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" 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>
+                        <button class="layui-btn layui-btn-sm" 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><!-- 增加按钮 -->--%>
@@ -454,18 +454,18 @@
                 }
                 if(d.flag == 1){
                     if(d.status == 1){
-                        xml+="<a href=\"#\" onclick=\"openDialogre('修改批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                        xml+="<a href=\"#\" onclick=\"openDialogre('修改批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改</a>";
                     }
                     if(d.status == 2){
-                        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>";
+                        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-red\" > 撤回</a>";
                     }
                     if(d.status == 3){
                         //撤回操作
-                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改</a>";
                     }
                     if(d.status == 4){
                         //驳回操作
-                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"olayui-btn layui-btn-xs\" > 修改</a>";
+                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"olayui-btn layui-btn-xs layui-bg-green\" > 修改</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=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";

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

@@ -180,10 +180,10 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <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>
+<%--                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+                                <div class="layui-btn-group search-spacing">
+                                    <button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn  layui-btn-sm " 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>--%>
@@ -199,9 +199,9 @@
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
                     <div class="layui-btn-group" style="margin-left: 15px;">
-                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
-                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn layui-btn-sm" 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>--%>
@@ -329,7 +329,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增甲供物资信息\', \'${ctx}/project/armorForMaterials/form?project.id='+d.pid+'&contract.id='+d.id+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增甲供物资信息\', \'${ctx}/project/armorForMaterials/form?project.id='+d.pid+'&contract.id='+d.id+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-blue" > 新增</a>',
                         +'</div>'
                     ].join('');
                 }else{

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

@@ -189,10 +189,10 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <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>
+<%--                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+                                <div class="layui-btn-group search-spacing">
+                                    <button id="searchQuery" class="layui-btn  layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -207,10 +207,10 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <div class="layui-btn-group" style="margin-left: 15px;">
-                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
-                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    <div class="layui-btn-group">
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn layui-btn-sm" 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>--%>
@@ -368,7 +368,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" >  领取报告号</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs  layui-bg-orange" >  领取报告号</a>',
 
                         +'</div>'
                     ].join('');
@@ -387,7 +387,7 @@
                 }else if(d.status == 2){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-blue"> 撤回</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 撤回</a>',
 
                         +'</div>'
                     ].join('');
@@ -412,7 +412,7 @@
                 }else if(d.status == null || d.status == '' || d.status == 10){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=claim&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 复核</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=claim&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs  layui-bg-orange" > 复核</a>',
 
                         +'</div>'
                     ].join('');

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

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

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

@@ -189,10 +189,10 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <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>
+<%--                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+                                <div class="layui-btn-group search-spacing">
+                                    <button id="searchQuery" class="layui-btn  layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -207,10 +207,10 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <div class="layui-btn-group" style="margin-left: 15px;">
-                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
-                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    <div class="layui-btn-group">
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn layui-btn-sm" 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>--%>
@@ -366,7 +366,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 领取报告号</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectType=${projectType}&projectId='+d.pid+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs  layui-bg-orange" > 领取报告号</a>',
 
                         +'</div>'
                     ].join('');
@@ -385,7 +385,7 @@
                 }else if(d.status == 2){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-blue"> 撤回</a>',
+                        '<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 撤回</a>',
 
                         +'</div>'
                     ].join('');
@@ -410,7 +410,7 @@
                 }else if(d.status == null || d.status == '' || d.status == 10){
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=distribution&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 复核</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/checkInterimPayment/reviewForm?view=report&condition=distribution&dictType=&reportType=${reportType}&projectType=${projectType}&project.id='+d.projectId+'&id='+d.id+'&parentIds=&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs  layui-bg-orange" > 复核</a>',
 
                         +'</div>'
                     ].join('');

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

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

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

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

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

@@ -180,10 +180,10 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <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>
+<%--                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+                                <div class="layui-btn-group search-spacing">
+                                    <button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn layui-btn-sm" 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>--%>
@@ -198,10 +198,10 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <div class="layui-btn-group" style="margin-left: 15px;">
-                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
-                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    <div class="layui-btn-group">
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn layui-btn-sm" 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>--%>
@@ -349,7 +349,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增索赔内容\', \'${ctx}/project/projectClaim/form?type=3&project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class=" layui-btn layui-btn-xs" > 新增</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增索赔内容\', \'${ctx}/project/projectClaim/form?type=3&project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" class=" layui-btn layui-btn-xs layui-bg-blue" > 新增</a>',
                         +'</div>'
                     ].join('');
                 }else{

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

@@ -181,10 +181,10 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <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>
+<%--                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+                                <div class="layui-btn-group search-spacing">
+                                    <button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -199,10 +199,10 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <div class="layui-btn-group" style="margin-left: 15px;">
-                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
-                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    <div class="layui-btn-group">
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn layui-btn-sm" 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>--%>
@@ -330,7 +330,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增隐蔽工程量\', \'${ctx}/project/concealProject/form?project.id='+d.pid+'&contract.id='+d.id+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增隐蔽工程量\', \'${ctx}/project/concealProject/form?project.id='+d.pid+'&contract.id='+d.id+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" class="layui-btn layui-btn-xs  layui-bg-blue" > 新增</a>',
                         +'</div>'
                     ].join('');
                 }else{

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

@@ -181,10 +181,10 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <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>
+<%--                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+                                <div class="layui-btn-group search-spacing">
+                                    <button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -199,10 +199,10 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <div class="layui-btn-group" style="margin-left: 15px;">
-                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
-                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    <div class="layui-btn-group">
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn layui-btn-sm" 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>--%>
@@ -330,7 +330,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/contractMaterial/form?project.id='+d.pid+'&contract.id='+d.id+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/contractMaterial/form?project.id='+d.pid+'&contract.id='+d.id+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')"  class="layui-btn layui-btn-xs layui-bg-blue" > 新增</a>',
                         +'</div>'
                     ].join('');
                 }else{

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

@@ -180,10 +180,10 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <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>
+<%--                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+                                <div class="layui-btn-group search-spacing">
+                                    <button id="searchQuery" class="layui-btn layui-btn-sm  layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn layui-btn-sm  " 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>--%>
@@ -198,10 +198,10 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <div class="layui-btn-group" style="margin-left: 15px;">
-                        <button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
-                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    <div class="layui-btn-group" >
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+                        <button class="layui-btn layui-btn-sm " 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>--%>
@@ -329,7 +329,7 @@
                 if(1 == d.operationSign) {
                     return [
                         '<div class=\"layui-btn-group\">'+
-                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增分布结算信息\', \'${ctx}/project/distributionSettlement/form?project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+                        '<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增分布结算信息\', \'${ctx}/project/distributionSettlement/form?project.id='+d.pid+'&contract.id='+d.id+'&projectContentId='+d.projectContentId+'&contract.contractName='+d.contractName+' \',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-blue" > 新增</a>',
                         +'</div>'
                     ].join('');
                 }else{

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

@@ -196,10 +196,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -229,10 +229,10 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
-						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn  layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+						<button class="layui-btn layui-btn-sm" 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>--%>
@@ -388,7 +388,7 @@
 				if(1 == d.operationSign) {
 					return [
 						'<div class=\"layui-btn-group\">'+
-						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 领取报告号</a>',
+						'<a href="javascript:void(0)" onclick="openDialogWork1(\'领取报告号\', \'${ctx}/projectreportnum/projectReportNum/skipMethod?reportType=${reportType}&projectId='+d.id+'\',\'60%\',\'95%\',false,\'inputForm\')" class="layui-btn layui-btn-xs layui-bg-orange" > 领取报告号</a>',
 						+'</div>'
 					].join('');
 				}else{
@@ -410,7 +410,7 @@
 					}else if(d.status == 2){
 						return [
 							'<div class=\"layui-btn-group\">'+
-							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-blue">  撤回</a>',
+							'<a href="${ctx}/projectcontentinfo/projectcontentinfo/cancelInvalidate?infoId='+d.reportId+'&id='+d.contentPId+'&type=8" onclick="return confirmxRefresh(\'确认要撤回该工作内容报告吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red">  撤回</a>',
 
 							+'</div>'
 						].join('');
@@ -437,7 +437,7 @@
 					}else if(d.status == null || d.status == '' || d.status == 10){
 						return [
 							'<div class=\"layui-btn-group\">'+
-							'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectCompletionReview/reviewForm?condition=completion&reportType=${reportType}&view=report&dictType='+d.dictType+'&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 复核</a>',
+							'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectCompletionReview/reviewForm?condition=completion&reportType=${reportType}&view=report&dictType='+d.dictType+'&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'&projectId='+d.projectId+'&project.projectName='+d.projectName+ '\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-orange" > 复核</a>',
 
 							+'</div>'
 						].join('');

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

@@ -196,10 +196,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -229,10 +229,10 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
-						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+						<button class="layui-btn layui-btn-sm" 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>--%>
@@ -386,7 +386,7 @@
 				if(1 == d.operationSign) {
 					return [
 						'<div class=\"layui-btn-group\">'+
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/projectImplementCompletion/form?view=before&dictType=&parentIds=&projectContentId='+d.projectContentId+'&projectContentData.name='+d.projectName+'&project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增</a>',
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/projectImplementCompletion/form?view=before&dictType=&parentIds=&projectContentId='+d.projectContentId+'&projectContentData.name='+d.projectName+'&project.id=' + d.id +'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-blue" > 新增</a>',
 
 						+'</div>'
 					].join('');
@@ -401,7 +401,7 @@
 						//子级内容
 						return [
 							'<div class=\"layui-btn-group\">'+
-							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工作内容\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=complement&flag=modify&dictType=&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
+							'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改工作内容\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=content&condition=complement&flag=modify&dictType=&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="layui-btn layui-btn-xs layui-bg-green" > 编辑</a>',
 							'<a href="javascript:void(0)" onclick="confirmxHintContent(\'提示内容\', \'${ctx}/projectType/projectType/getHintContent?id='+d.projectTypeId+'\',\'95%\',\'95%\')" class="fa fa-search-plus layui-bg-orange layui-btn layui-btn-xs" > 提示</a>',
 
 							+'</div>'

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp

@@ -159,10 +159,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -211,8 +211,8 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 20px;">
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm layui-bg-green" 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>
@@ -265,11 +265,11 @@
 						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=\"layui-btn layui-btn-xs\" > 详情</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-green\" > 详情</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=\"layui-btn layui-btn-xs layui-bg-blue\" > 编辑</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-green\" > 编辑</a>";
 						}
 						xml+="</div>"
 						return xml;

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

@@ -61,10 +61,10 @@
 							</div>
 							<div class="layui-item athird">
 								<div class="input-group">
-									<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>
+									<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+									<div class="layui-btn-group search-spacing">
+										<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+										<button id="searchReset" class="layui-btn layui-btn-sm" 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>--%>
@@ -100,8 +100,8 @@
 			<div class="full-width fl">
 				<div class="contentShadow layui-form contentDetails">
 					<div class="nav-btns">'
-						<div class="layui-btn-group" style="margin-left: 15px;">
-							<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<div class="layui-btn-group">
+							<button class="layui-btn layui-btn-sm" 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>
@@ -151,7 +151,7 @@
                         ////对操作进行初始化
                         var xml="<div class=\"layui-btn-group\">";
                         if(d.signature != undefined && d.signature =="1"){
-                            xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogView('项目成员管理', '${ctx}/project/projectRecordUsers/form?id=" + d.id +"','95%', '95%')\" class=\"layui-btn layui-btn-xs\" > 进入</a>";
+                            xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogView('项目成员管理', '${ctx}/project/projectRecordUsers/form?id=" + d.id +"','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-btn-orange\" > 进入</a>";
                         }
 						xml+="</div>"
 						return xml;

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

@@ -144,10 +144,10 @@
 								</div>
 							<div class="layui-item athird">
 								<div class="input-group">
-									<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>
+									<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+									<div class="layui-btn-group search-spacing">
+										<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+										<button id="searchReset" class="layui-btn layui-btn-sm" 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>--%>
@@ -189,8 +189,8 @@
 			<div class="full-width fl">
 				<div class="layui-form contentDetails contentShadow shadowLBR">
 					<div class="nav-btns">
-						<div class="layui-btn-group" style="margin-left: 15px;">
-							<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<div class="layui-btn-group">
+							<button class="layui-btn layui-btn-sm" 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>
@@ -252,15 +252,15 @@
                             var xml="<div class=\"layui-btn-group\">";
                             if(d.canedit1 != undefined && d.canedit1 =="1")
                             {
-                                xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/project/projectRecordsAlter/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                                xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/project/projectRecordsAlter/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                             }
                             if(d.canedit2 != undefined && d.canedit2 =="1")
                             {
-                                xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecordsAlter/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                                xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecordsAlter/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                             }
                             if(d.canrecall != undefined && d.canrecall =="1")
                             {
-                                xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecordsAlter/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                                xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecordsAlter/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                             }
                             if(d.candel != undefined && d.candel =="1")
                             {
@@ -268,7 +268,7 @@
                             }
                             if(d.cancancel != undefined && d.cancancel =="1")
                             {
-                                xml+="<a href=\"${ctx}/project/projectRecordsAlter/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回</a>";
+                                xml+="<a href=\"${ctx}/project/projectRecordsAlter/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回</a>";
                             }
                             xml+="</div>"
                             return xml;

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

@@ -240,10 +240,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -294,7 +294,7 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
+					<div class="layui-btn-group">
 						<shiro:hasPermission name="project:projectRecords:add">
 							<table:addRow url="${ctx}/project/projectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->
 						</shiro:hasPermission>
@@ -304,7 +304,7 @@
 						<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>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 <%--					<shiro:hasPermission name="project:projectRecords:add">--%>
 <%--						<table:addRow url="${ctx}/project/projectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->--%>
@@ -380,15 +380,15 @@
                         var xml="<div class=\"layui-btn-group\">";
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/project/projectRecords/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/project/projectRecords/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecords/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecords/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecords/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/project/projectRecords/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改</a>";
                         }
                         if(d.candel != undefined && d.candel =="1")
                         {
@@ -396,11 +396,11 @@
                         }
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {
-                            xml+="<a href=\"${ctx}/project/projectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回</a>";
+                            xml+="<a href=\"${ctx}/project/projectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回</a>";
                         }
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {
-                            xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogre('项目变更管理', '${ctx}/project/projectRecordsAlter/form?alterBeforeRecords.id='+encodeURIComponent('" + d.id + "'),'95%','95%','','送审,暂存,关闭')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" > 变更</a>";
+                            xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogre('项目变更管理', '${ctx}/project/projectRecordsAlter/form?alterBeforeRecords.id='+encodeURIComponent('" + d.id + "'),'95%','95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-orange\" > 变更</a>";
                         }
                         xml+="</div>"
                         return xml;

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

@@ -229,10 +229,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -274,8 +274,8 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group" >
+						<button class="layui-btn layui-btn-sm" 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>
@@ -319,7 +319,7 @@
                         var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看甲供物资信息', '${ctx}/project/armorSummarizing/form?view=contentView&condition=interim&type=411&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" >详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看甲供物资信息', '${ctx}/project/armorSummarizing/form?view=contentView&condition=interim&type=411&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >详情</a>"
                         /*}*/
 						xml+="</div>";
 

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

@@ -229,10 +229,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee" ><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -274,8 +274,8 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" 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>
@@ -319,7 +319,7 @@
                         var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/claimSummarizing/form?view=contentView&condition=interim&type=46&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" > 详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/claimSummarizing/form?view=contentView&condition=interim&type=46&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 详情</a>"
                         /*}*/
 						xml+="</div>";
 

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

@@ -229,10 +229,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -274,8 +274,8 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" 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>
@@ -319,7 +319,7 @@
                         var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看隐蔽工程量信息', '${ctx}/project/concealSummarizing/form?view=contentView&condition=interim&type=410&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" >详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看隐蔽工程量信息', '${ctx}/project/concealSummarizing/form?view=contentView&condition=interim&type=410&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >详情</a>"
                         /*}*/
 						xml+="</div>";
 

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

@@ -229,10 +229,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee" ><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing" >
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -274,10 +274,10 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
+					<div class="layui-btn-group">
 <%--						<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>
+						<button class="layui-btn layui-btn-sm" 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>
@@ -321,7 +321,7 @@
                         var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/designSummarizing/form?view=contentView&condition=interim&type=43&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" >详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/designSummarizing/form?view=contentView&condition=interim&type=43&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >详情</a>"
                         /*}*/
 						xml+="</div>";
                         return xml;

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

@@ -229,10 +229,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -274,8 +274,8 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" 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>
@@ -319,7 +319,7 @@
                         var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/distributionSummarizing/form?view=contentView&condition=interim&type=412&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" > 详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/distributionSummarizing/form?view=contentView&condition=interim&type=412&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 详情</a>"
                         /*}*/
 						xml+="</div>";
 

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

@@ -229,10 +229,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing" >
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -274,8 +274,8 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" 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>
@@ -319,7 +319,7 @@
                         var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/materialSummarizing/form?view=contentView&condition=material&type=421&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" > 详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/materialSummarizing/form?view=contentView&condition=material&type=421&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 详情</a>"
                         /*}*/
 						xml+="</div>";
 

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

@@ -229,10 +229,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -274,8 +274,8 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" 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>
@@ -323,7 +323,7 @@
                         var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/interimPaymentSummarizing/form?view=contentView&condition=interim&type=420&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" >详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/interimPaymentSummarizing/form?view=contentView&condition=interim&type=420&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs \" >详情</a>"
                         /*}*/
 						xml+="</div>";
                         return xml;

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

@@ -229,10 +229,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -274,8 +274,8 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" 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>
@@ -319,7 +319,7 @@
                         var xml="<div class=\"layui-btn-group\">";
                         /*if(d.canedit3 != undefined && d.canedit3 =="1")
                         {*/
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/visaSummarizing/form?view=contentView&condition=interim&type=45&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs\" > 详情</a>"
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看工程进度款信息', '${ctx}/project/visaSummarizing/form?view=contentView&condition=interim&type=45&infoId="+d.id+"&id="+d.contentPId+"','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 详情</a>"
                         /*}*/
 						xml+="</div>";
                         return xml;

src/main/webapp/webpage/modules/ruralprojectrecords/check/all/ruralProjectRecordsAllList.jsp

@@ -220,10 +220,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -280,8 +280,8 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" 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>
@@ -377,7 +377,7 @@
                         }
                         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=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回</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-red\" > 撤回</a>";
                         }
                         return xml;
 

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

@@ -312,10 +312,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm" 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>--%>
@@ -372,8 +372,8 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn  layui-btn-sm" 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>
@@ -451,7 +451,7 @@
 						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=\"layui-btn layui-btn-xs layui-bg-green\" > 提交线下归档</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-blue\" > 提交线下归档</a>";
 							}else{
 								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>";
 							}

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportForm.jsp

@@ -859,7 +859,7 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>专业咨询员：</label>
 					<div class="layui-input-block  with-icon">
-						<sys:treeselect id="consultant" name="projectReportData.consultant.id" value="${projectReportData.consultant.id}" labelName="projectReportData.consultant.name" labelValue="${projectReportData.consultant.name}"
+						<sys:inquireselectUser id="consultant" name="projectReportData.consultant.id" value="${projectReportData.consultant.id}" labelName="projectReportData.consultant.name" labelValue="${projectReportData.consultant.name}"
 									 cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
@@ -872,7 +872,7 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
 					<div class="layui-input-block  with-icon">
-						<sys:treeselect id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
+						<sys:inquireselectUser id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
 									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
@@ -980,7 +980,7 @@
 			</script>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div class="form-group-label"><h2>依据性文件</h2></div>
 <%--				<div class="layui-item nav-btns">--%>
 					<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
 <%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllLists.jsp

@@ -377,10 +377,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -456,9 +456,9 @@
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
 					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn layui-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>
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+						<button class="layui-btn layui-btn-sm" 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>--%>
@@ -669,11 +669,11 @@
 				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=\"layui-btn layui-btn-xs\" > 上传文件</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>";
 					}
 					</shiro:hasPermission>
 					<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:adminAccessory">
-						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>";
+						xml+="<a href=\"#\" onclick=\"openDialogView('归档管理员文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 上传文件</a>";
 					</shiro:hasPermission>
 				}
 				xml+="</div>"

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit.jsp

@@ -704,29 +704,6 @@
 					</div>
 				</div>
 			</div>
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审批意见</h2></div>
-				<div class="layui-item layui-col-sm8 lw6 with-textarea">
-					<div class="layui-input-block" style="margin-left:10px;position: relative">
-						<form:textarea path="projectReportData.act.comment" placeholder="请输入意见" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
-						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
-						<input type="file" name="upload_files" style="display: none;">
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm4 lw6 with-textarea">
-					<div class="layui-input-block" style="margin-left:10px;">
-						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
-						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
-						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
-						<div style="padding: 5px 0px;">
-							<form:select path="projectReportData.act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
-								<form:option value=""/>
-								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-							</form:select>
-						</div>
-					</div>
-				</div>
-			</div>
 <%--			<div class="form-group layui-row">--%>
 <%--				<div class="form-group-label"><h2>审批意见</h2></div>--%>
 <%--				<div class="layui-item layui-col-sm12 lw6 with-textarea">--%>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify.jsp

@@ -608,7 +608,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>专业咨询员：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="consultant" name="projectReportData.consultant.id" value="${projectReportData.consultant.id}" labelName="projectReportData.consultant.name" labelValue="${projectReportData.consultant.name}"
+                        <sys:inquireselectUser id="consultant" name="projectReportData.consultant.id" value="${projectReportData.consultant.id}" labelName="projectReportData.consultant.name" labelValue="${projectReportData.consultant.name}"
                                      cssStyle="background-color:#FFF"   title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
@@ -621,7 +621,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
+                        <sys:inquireselectUser id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
                                       cssStyle="background-color:#fff"  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm.jsp

@@ -859,7 +859,7 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>专业咨询员：</label>
 					<div class="layui-input-block  with-icon">
-						<sys:treeselect id="consultant" name="projectReportData.consultant.id" value="${projectReportData.consultant.id}" labelName="projectReportData.consultant.name" labelValue="${projectReportData.consultant.name}"
+						<sys:inquireselectUser id="consultant" name="projectReportData.consultant.id" value="${projectReportData.consultant.id}" labelName="projectReportData.consultant.name" labelValue="${projectReportData.consultant.name}"
 										cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
@@ -872,7 +872,7 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
 					<div class="layui-input-block  with-icon">
-						<sys:treeselect id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
+						<sys:inquireselectUser id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
 									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>

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

@@ -434,10 +434,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -512,10 +512,10 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<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 class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+						<button class="layui-btn layui-btn-sm layui-bg-green" 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>--%>
@@ -664,7 +664,7 @@
 								return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
 							}
 						}},
-					{align:'center', title: '报告',  width:70,templet:function(d){
+					{align:'center', title: '报告',  width:90,templet:function(d){
 							var st = getAuditState(""+d.projectReportStatus);
 							if(d.pid ==0){
 								if(st.action)
@@ -676,7 +676,7 @@
 								return '';
 							}
 						}},
-					{align:'center', title: '电子',  width:70,templet:function(d){
+					{align:'center', title: '电子',  width:90,templet:function(d){
 							var st = getRuralProjectArchiveState(""+d.projectReportRecordStatus);
 							if(d.pid ==0){
 								if(st.action)
@@ -688,7 +688,7 @@
 								return '';
 							}
 						}},
-					{align:'center', title: '批量',  width:70,templet:function(d){
+					{align:'center', title: '批量',  width:90,templet:function(d){
 							var st = getRuralProjectArchiveState(""+d.filingProjectStatus);
 							if(d.pid ==0){
 								if(st.action)
@@ -753,23 +753,23 @@
 				}
 				if(d.flag == 1){
 					if(d.projectReportStatus == 0){
-						xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 新增报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 新增报告</a>";
 					}
 					if(d.projectReportStatus == 1){
-						xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改报告</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>";
 						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=\"layui-btn layui-btn-xs layui-btn-blue\" > 撤回报告</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-red\" > 撤回报告</a>";
 					}
 					if(d.projectReportStatus == 3){
 						//撤回操作
-						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralProjectMessage/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告</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=\"layui-btn layui-btn-xs\" > 修改报告</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 layui-bg-green\" > 修改报告</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>";
 					}
 
@@ -777,19 +777,19 @@
 					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=\"layui-btn layui-btn-xs layui-bg-green\" > 线上归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 						}
 						if(d.projectReportRecordStatus == 1){
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-btn-blue\" > 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 						}
 						if(d.projectReportRecordStatus == 2){
-							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>";
+							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-bg-red\" > 撤回线上归档</a>";
 						}
 						if(d.projectReportRecordStatus == 3){
-							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-btn-blue\" > 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 						}
 						if(d.projectReportRecordStatus == 4){
-							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>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线上重新归档</a>";
 						}
 					}
 
@@ -817,32 +817,32 @@
 						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=\"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>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上报</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  layui-bg-blue\" > 个人上报</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=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回上报</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-red\" > 撤回上报</a>";
 								}
 								/*撤回修改*/
 								if(d.reportedState == 3){
-									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>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
 								}
 								/*驳回修改*/
 								if(d.reportedState == 4){
-									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>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改上报</a>";
 								}
 							}
 						}
 					}
 					if('1' == d.flagAdmin && d.projectReportStatus == 5)
 					{
-						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>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralProjectMessage/adminModifyForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogView('历史报告', '${ctx}/ruralProject/ruralProjectMessage/getReportModifyList?projectId=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-orange\" > 历史报告</a>";
 					}
 					if('1' == d.flagArchive && d.projectReportRecordStatus == 5)
 					{
-						xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralProjectMessage/adminRecordModifyForm?id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改归档</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralProjectMessage/adminRecordModifyForm?id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改归档</a>";
 					}
 				}
 				xml+="</div>"
@@ -850,7 +850,7 @@
 			}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=\"layui-btn layui-btn-xs\" ><i class=\"fa fa-edit\"></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 layui-bg-green\" > 修改</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>"

src/main/webapp/webpage/modules/ruralprojectrecords/subProjectInfo/subProjectInfoList.jsp

@@ -215,22 +215,23 @@
 </head>
 <body>
 <div class="wrapper wrapper-content">
-	<div style="position: fixed;top: 0;width: 100%;z-index: 100">
+	<div class="tapfixed">
 	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 		<ul class="list-tabs" >
 			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-			<c:if test="${projectRecords.workContractInfo.id!=''}">
-				<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>
-			</c:if>
-			<c:if test="${flagProjectReportData.id!=null}">
-				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-			</c:if>
-			<c:if test="${reportedId!=null}">
-				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-			</c:if>
+<%--			<c:if test="${projectRecords.workContractInfo.id!=''}">--%>
+				<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同合同详情</a></li>
+<%--			</c:if>--%>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
+<%--			<c:if test="${reportedId!=null}">--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+<%--			</c:if>--%>
+<%--			<c:if test="${flagProjectReportData.id!=null}">--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+<%--			</c:if>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 		</ul>
 <%--		<ul class="list-tabs" >--%>
 <%--			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
@@ -246,7 +247,7 @@
 	</div>
 	</div>
 	<sys:message content="${message}"/>
-	<div class="layui-row" style="margin-top: 40px;">
+	<div class="layui-row" style="margin-top: 60px;">
 		<div class="full-width fl">
 			<div class="layui-row contentShadow shadowLR" id="queryDiv">
 				<form:form id="searchForm" modelAttribute="subProjectInfo" action="${ctx}/subProject/subProject/list?parentProId=${subProjectInfo.parentProId}&projectType=${subProjectInfo.projectType}" method="post" class="form-inline">
@@ -267,11 +268,13 @@
 								<form:input path="projectName" htmlEscape="false" maxlength="64"  class=" form-control  layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item athird">
+						<div class="layui-item 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>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm  layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm" onclick="resetSearch()">重置</button>
+								</div>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -309,13 +312,16 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<shiro:hasPermission name="ruralProject:ruralProjectRecords:add">
-						<table:subProjectAddRow url="${ctx}/subProject/subProject/form?parentProId=${subProjectInfo.parentProId}" title="项目"></table:subProjectAddRow><!-- 增加按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="ruralProject:ruralProjectRecords:export">
-						<button id="btnImport" class="nav-btn nav-btn-import" data-toggle="tooltip" data-placement="left" onclick="btnImport()" title="导入"><i class="fa fa-folder-open-o"></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>&nbsp;刷新</button>
+					<div class="layui-btn-group ">
+
+						<shiro:hasPermission name="ruralProject:ruralProjectRecords:add">
+							<table:subProjectAddRow url="${ctx}/subProject/subProject/form?parentProId=${subProjectInfo.parentProId}" title="项目"></table:subProjectAddRow><!-- 增加按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="ruralProject:ruralProjectRecords:export">
+							<button id="btnImport" class="layui-btn layui-btn-sm layui-bg-blue" data-toggle="tooltip" data-placement="left" onclick="btnImport()" title="导入">导入</button>
+						</shiro:hasPermission>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新">&nbsp;刷新</button>
+					</div>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable1"></table>
@@ -360,8 +366,8 @@
                         var xml="";
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${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=\"openDialogre('修改项目', '${ctx}/subProject/subProject/form?id=" + d.id + "','95%', '95%','','inputForm','layui-border-box')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</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>";
                         }
                         return xml;
 

src/main/webapp/webpage/modules/ruralprojectrecords/view/projectAccessoryView.jsp

@@ -53,22 +53,23 @@
 </head>
 <body>
 <div class="single-form">
-	<div style="position: fixed;top: 0;width: 100%;z-index: 100">
+	<div class="tapfixed">
 	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 		<ul class="list-tabs">
 			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-			<c:if test="${projectRecords.workContractInfo.id!=''}">
-				<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>
-			</c:if>
-			<c:if test="${flagProjectReportData.id!=null}">
-				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-			</c:if>
-			<c:if test="${reportedId!=null}">
-				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-			</c:if>
+<%--			<c:if test="${projectRecords.workContractInfo.id!=''}">--%>
+				<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
+<%--			</c:if>--%>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
+<%--			<c:if test="${reportedId!=null}">--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+<%--			</c:if>--%>
+<%--			<c:if test="${flagProjectReportData.id!=null}">--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+<%--			</c:if>--%>
+			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 		</ul>
 <%--		<ul class="list-tabs" >--%>
 <%--			<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
@@ -83,7 +84,7 @@
 <%--		</ul>--%>
 	</div>
 	</div>
-	<div class="container${container}" style="margin-top: 40px;">
+	<div class="container${container}" style="margin-top: 60px;">
 		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralProjectMessage/saveReport" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
 		<form:hidden path="name"/>
@@ -112,7 +113,7 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -122,12 +123,12 @@
 							<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
 								<c:choose>
 									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
+										<td style="text-align:left;"><span style="color: red">* </span>${fileAttachment.attachName}</td>
 									</c:when>
 									<c:otherwise>
 										<c:choose>
 											<c:when test="${fileAttachment.flag == 0}">
-												<td>${fileAttachment.attachName}</td>
+												<td style="text-align:left;">${fileAttachment.attachName}</td>
 											</c:when>
 											<c:otherwise>
 												<td></td>
@@ -183,7 +184,7 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -194,12 +195,12 @@
 									<%-- <td>${status.index + 1}</td>--%>
 										<c:choose>
 											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
+												<td style="text-align:left;"><span style="color: red">* </span>${fileGistdata.attachName}</td>
 											</c:when>
 											<c:otherwise>
 												<c:choose>
 													<c:when test="${fileGistdata.flag == 0}">
-														<td>${fileGistdata.attachName}</td>
+														<td style="text-align:left;">${fileGistdata.attachName}</td>
 													</c:when>
 													<c:otherwise>
 														<td></td>
@@ -254,7 +255,7 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="55%">文件类型</th>
+							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
 							<th width="100px">操作</th>
 						</tr>
@@ -265,12 +266,12 @@
 									<%-- <td>${status.index + 1}</td>--%>
 										<c:choose>
 											<c:when test="${fileOther.mustFlag == 1}">
-												<td><span style="color: red">* </span>${fileOther.attachName}</td>
+												<td style="text-align:left;"><span style="color: red">* </span>${fileOther.attachName}</td>
 											</c:when>
 											<c:otherwise>
 												<c:choose>
 													<c:when test="${fileOther.flag == 0}">
-														<td>${fileOther.attachName}</td>
+														<td style="text-align:left;">${fileOther.attachName}</td>
 													</c:when>
 													<c:otherwise>
 														<td></td>

src/main/webapp/webpage/modules/ruralprojectrecords/view/projectPlanView.jsp

@@ -139,22 +139,23 @@
 </head>
 <body>
 <div class="single-form">
-    <div style="position: fixed;top: 0;width: 100%;z-index: 100">
+    <div class="tapfixed">
     <div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
         <ul class="list-tabs" >
             <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-            <c:if test="${projectRecords.workContractInfo.id!=''}">
-                <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>
-            </c:if>
-            <c:if test="${flagProjectReportData.id!=null}">
-                <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-            </c:if>
-            <c:if test="${reportedId!=null}">
-                <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-            </c:if>
+<%--            <c:if test="${projectRecords.workContractInfo.id!=''}">--%>
+                <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
+<%--            </c:if>--%>
             <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
+<%--            <c:if test="${reportedId!=null}">--%>
+                <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+<%--            </c:if>--%>
+<%--            <c:if test="${flagProjectReportData.id!=null}">--%>
+                <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+<%--            </c:if>--%>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
         </ul>
 <%--        <ul class="list-tabs" >--%>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
@@ -169,7 +170,7 @@
 <%--        </ul>--%>
     </div>
     </div>
-    <div class="container" style="margin-top: 40px;">
+    <div class="container" style="margin-top: 50px;">
         <sys:message content="${message}"/>
         <form:form id="inputForm" modelAttribute="projectRecords" action="${ctx}/project/projectPlan/save" method="post" class="form-horizontal">
             <form:hidden path="id"/>

src/main/webapp/webpage/modules/ruralprojectrecords/view/projectReportRecordView.jsp

@@ -0,0 +1,835 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>合同归档管理</title>
+	<meta name="decorator" content="default"/>
+	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<style>
+		label.error:nth-child(2){
+			top:40px;
+			left:0;
+		}
+		.layui-table th{
+			font-size: 14px;
+			/*表头内容居中显示*/
+			text-align: center;
+		}
+		.layui-table td{
+			/*表头内容居中显示*/
+			text-align: left;
+		}
+		span{
+			font-size: 14px;
+		}
+	</style>
+	<script type="text/javascript">
+		var validateForm;
+		function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+			if(validateForm.form()){
+				var projectId = '${project.id}';
+				var leng = $("#file_attachment tr").length;
+				var boolFlag = true;
+				for(var i=0; i<leng; i++) {
+					var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
+					var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
+					if(second == 1){
+						if(numberStr != undefined && numberStr !=null && numberStr !=''){
+							$.ajax({
+								type: 'post',
+								url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',
+								data: {"attachmentId":numberStr,"projectId":projectId},
+								dataType: "json",
+								async: false
+							}).success(function (result) {
+								if(result == 0){
+									boolFlag = false;
+									top.layer.msg("请上传成果文件！", {icon: 0});
+									return false;
+								}
+							}).error(function () {
+								top.layer.msg("文件载入失败！");
+							});
+						}
+					}
+				}
+				if(boolFlag){
+					var gistdata = $("#file_gistdata tr").length;
+					for(var i=0; i<gistdata; i++) {
+						var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
+						var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
+						if(second == 1){
+							if(numberStr != undefined && numberStr !=null && numberStr !=''){
+								$.ajax({
+									type: 'post',
+									url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',
+									data: {"attachmentId":numberStr,"projectId":projectId},
+									dataType: "json",
+									async: false
+								}).success(function (result) {
+									if(result == 0){
+										boolFlag = false;
+										top.layer.msg("请上传依据性文件！", {icon: 0});
+										return false;
+									}
+								}).error(function () {
+									top.layer.msg("文件载入失败！");
+								});
+							}
+						}
+					}
+				}
+				if(boolFlag){
+					var other = $("#file_other tr").length;
+					for(var i=0; i<other; i++) {
+						var numberStr = $("#file_other tr").eq(i).find("td:first").html();
+						var second = $("#file_other tr").eq(i).find("td:eq(1)").html();
+						if(second == 1){
+							if(numberStr != undefined && numberStr !=null && numberStr !=''){
+								$.ajax({
+									type: 'post',
+									url:'${ctx}/projectAccessoryRelation/projectAccessoryRelation/getAttachmentCount',
+									data: {"attachmentId":numberStr,"projectId":projectId},
+									dataType: "json",
+									async: false
+								}).success(function (result) {
+									if(result == 0){
+										boolFlag = false;
+										top.layer.msg("请上传其他文件！", {icon: 0});
+										return false;
+									}
+								}).error(function () {
+									top.layer.msg("文件载入失败！");
+								});
+							}
+						}
+					}
+				}
+				if(boolFlag){
+					if(obj == 2){
+						//$("#inputForm").attr("action","${ctx}/projectcontentinfo/projectReportRecord/store");
+						$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/holdSaveRecord");
+					}else{
+						$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessage/saveRecord");
+					}
+					$("#inputForm").submit();
+					return true;
+				}
+			}else {
+				parent.layer.msg("信息未填写完整!", {icon: 5});
+			}
+			return false;
+
+		}
+		$(document).ready(function() {
+			validateForm = $("#inputForm").validate({
+				submitHandler: function(form){
+					loading('正在提交，请稍等...');
+					form.submit();
+				},
+				errorContainer: "#messageBox",
+				errorPlacement: function(error, element) {
+					$("#messageBox").text("输入有误，请先更正。");
+					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+						error.appendTo(element.parent().parent());
+					} else {
+						error.insertAfter(element);
+					}
+				}
+			});
+			$("#attachment_btn").click(function () {
+				$("#attachment_file").click();
+			});
+
+		});
+		<%--function insertTitle(tValue){--%>
+		<%--	var list = "${projectReportRecord.workAttachments}";--%>
+		<%--	var size = (list.split('url')).length-1;--%>
+		<%--	var files = $("#attachment_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];--%>
+		<%--		var attachmentId = "";--%>
+		<%--		var attachmentFlag = "99";--%>
+		<%--		console.log(file);--%>
+		<%--		var timestamp=new Date().getTime();--%>
+
+		<%--		var storeAs = "projectRecords";--%>
+		<%--		var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/--%>
+		<%--		var divId = "_attachment";--%>
+		<%--		$("#addFile"+divId).show();--%>
+		<%--		multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size);}--%>
+		<%--}--%>
+
+		function setValuee(obj){
+			$("#reportId").val(obj.id);
+			$("#reportnumber").val(obj.number);
+			$("#reportName").val(obj.name);
+			$("#reportDate").val(obj.reportDate);
+			$("#contractNum").val(obj.contractNum);
+			$("#contractName").val(obj.contractName);
+			$("#clientName").val(obj.clientName);
+			$("#projectName").val(obj.projectName);
+			$("#projectNum").val(obj.projectNum);
+			$.ajax({
+				type:'post',
+				url:'${ctx}/projectcontentinfo/projectReportRecord/getNumber',
+				data:{
+					"reportId":obj.id
+				},
+				success:function(data){
+					var numberCount = data.numberCount;
+					$("#recordNum").val(obj.number+"-"+numberCount);
+					$("#numberCount").val(numberCount);
+				}
+			})
+		}
+	</script>
+</head>
+<body>
+<div class="single-form">
+	<div class="tapfixed">
+		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
+			<ul class="list-tabs" >
+				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
+				<%--            <c:if test="${projectRecords.workContractInfo.id!=''}">--%>
+				<li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
+				<%--            </c:if>--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
+				<%--            <c:if test="${reportedId!=null}">--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+				<%--            </c:if>--%>
+				<%--            <c:if test="${flagProjectReportData.id!=null}">--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+				<%--            </c:if>--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
+				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
+			</ul>
+		</div>
+	</div>
+	<c:if test="${projectReportRecord.id==null}">
+		<div class="topMar">
+			<h2>暂无归档信息</h2>
+		</div>
+	</c:if>
+	<c:if test="${projectReportRecord.id!=null}">
+	<div class="container">
+		<form:form id="inputForm" modelAttribute="projectReportRecord" method="post" class="form-horizontal">
+			<form:hidden path="id"/>
+			<form:hidden path="view"/>
+			<form:hidden path="numberCount"/>
+			<form:hidden id="reportId" path="report.id"/>
+			<form:hidden path="report.name"/>
+			<form:hidden path="report.project.id"/>
+			<input type="hidden" name="saveAuditFlag" value="1">
+			<div class="form-group layui-row first lw12">
+				<div class="form-group-label"><h2>基本信息</h2></div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>报告号：</label>
+					<div class="layui-input-block">
+						<form:input id="reportNumber" path="report.number" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
+					</div>
+				</div>
+					<%--<div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label"><span class="require-item">*</span>归档申请编号：</label>
+                        <div class="layui-input-block">
+                            <div class="input-group">
+                                <form:input id="recordNum" path="recordNum" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
+                                <span class="input-group-btn">
+                                    <label class="form-status">
+                                        <c:choose>
+                                            <c:when test="${not empty projectReportRecord.status}">${fns:getDictLabel(projectReportRecord.status, 'audit_record_state', '')}
+                                            </c:when>
+                                            <c:otherwise>新添</c:otherwise>
+                                        </c:choose></label>
+                                 </span>
+                            </div>
+                        </div>
+                    </div>--%>
+					<%--<div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label"><span class="require-item">*</span>签字造价师一：</label>
+                        <div class="layui-input-block with-icon">
+                            <sys:treeselect id="signCostOne" name="signCostOne.id" value="${projectReportRecord.signCostOne.id}" labelName="signCostOne.name" labelValue="${projectReportRecord.signCostOne.name}"
+                                            title="签字造价师一" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/></div>
+                    </div>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label"><span class="require-item">*</span>签字造价师二：</label>
+                        <div class="layui-input-block with-icon">
+                            <sys:treeselect id="signCostTwo" name="signCostTwo.id" value="${projectReportRecord.signCostTwo.id}" labelName="signCostTwo.name" labelValue="${projectReportRecord.signCostTwo.name}"
+                                            title="签字造价师二" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input required" allowClear="true" notAllowSelectParent="true"/>
+                        </div>
+                    </div>--%>
+					<%--<div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label"><span class="require-item">*</span>报告名称：</label>
+                        <div class="layui-input-block">
+                            <form:input id="reportName" path="report.name" htmlEscape="false"   readonly="true" class="form-control layui-input required"/>
+                        </div>
+                    </div>--%>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>报告日期：</label>
+					<div class="layui-input-block">
+						<input id="reportDate" name="report.reportDate"  htmlEscape="false" readonly="true" class="form-control  layui-input required" value="<fmt:formatDate value="${projectReportRecord.report.reportDate}" pattern="yyyy-MM-dd"/>"/>
+							<%--<input class="laydate-icondate form-control layui-input layer-date laydate-icon" id="createDate" name="createDate" value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>">--%>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同编号：</label>
+					<div class="layui-input-block">
+						<form:input id="contractNum" path="contractNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同名称：</label>
+					<div class="layui-input-block">
+						<form:input id="contractName" path="contractName" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">委托方：</label>
+					<div class="layui-input-block">
+						<form:input id="clientName" path="clientName" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">项目编号：</label>
+					<div class="layui-input-block">
+						<form:input id="projectNum" path="projectNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
+					<div class="layui-input-block">
+						<form:input id="projectName" path="projectName" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>归档申请人：</label>
+					<div class="layui-input-block">
+						<form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true" class="form-control  layui-input required"/>
+					</div>
+				</div>
+					<%--<div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label"><span class="require-item">*</span>申请日期：</label>
+                        <div class="layui-input-block">
+                            <input id="createDate" name="createDate"  htmlEscape="false" readonly="true" class="laydate-icondate form-control layer-date required layui-input laydate-icon"
+                                   value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
+                        </div>
+                    </div>--%>
+					<%--<div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">档案号：</label>
+                        <div class="layui-input-block">
+                            <form:input path="fileNum" htmlEscape="false"    class="form-control  layui-input"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">档案名称：</label>
+                        <div class="layui-input-block">
+                            <form:input path="name" htmlEscape="false"    class="form-control  layui-input"/>
+                        </div>
+                    </div>--%>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">归档时间：</label>
+					<div class="layui-input-block">
+						<input id="recordDate" name="recordDate"  htmlEscape="false" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${projectReportRecord.createDate}" pattern="yyyy-MM-dd"/>"/>
+					</div>
+				</div>
+					<%--<div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">归档完成日期：</label>
+                        <div class="layui-input-block">
+                            <input id="accomplishDate" name="accomplishDate"  htmlEscape="false" readonly="true" class="form-control  layui-input"
+                                   value="<fmt:formatDate value="${projectReportRecord.accomplishDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
+                        </div>
+                    </div>--%>
+				<div class="layui-item layui-col-sm12  with-textarea">
+					<label class="layui-form-label">说明：</label>
+					<div class="layui-input-block">
+						<form:textarea readonly="true" path="remarks" htmlEscape="false" rows="4" maxLength="255"   class="form-control "/>
+					</div>
+				</div>
+			</div>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<act:flowChart procInsId="${projectReportRecord.processInstanceId}"/>
+					<act:histoicFlow procInsId="${projectReportRecord.processInstanceId}"/>
+				</div>
+			</div>
+			<div class="form-group layui-row page-end"></div>
+		</form:form>
+	</div>
+	</c:if>
+</div>
+<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
+<script>
+	function openBill2(title,url,width,height,target,formId,tableId,obj){
+		var rows = $(this).parent().prevAll().length + 1;
+		var tbody="#"+$(obj).parent().parent().parent().parent().attr("id");
+		var trname=$(obj).parent().parent().parent().attr("id");
+		var filetr="."+$(obj).parent().parent().parent().attr("id");
+		var frameIndex = parent.layer.getFrameIndex(window.name);
+		var urls = url+"&index="+frameIndex;
+		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+			width='auto';
+			height='auto';
+		}else{//如果是PC端，根据用户设置的width和height显示。
+
+		}
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			skin:"two-btns",
+			maxmin: false, //开启最大化最小化按钮
+			content: urls ,
+			btn: ['确定','关闭'],
+			yes: function(index, layero){
+				var body = top.layer.getChildFrame('body', index);
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var inputForm = body.find('#inputForm');
+				var top_iframe;
+				if(target){
+					top_iframe = target;//如果指定了iframe，则在改frame中跳转
+				}else{
+					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+				}
+				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+				inputForm.attr("action","${ctx}/projectAccessory/projectAccessory/saveWorkAttachment");//表单提交成功后，从服务器返回的url在当前tab中展示
+				var $document = iframeWin.contentWindow.document;
+				var files=iframeWin.contentWindow.showfile()
+				var xias=iframeWin.contentWindow.showfileXia()
+				// if(files.length!=0){
+				// 	// var name=filetr
+				// 	$(filetr).remove();
+				// 	for (var i=0;i<files.length;i++){
+				// 		$(tbody).append(
+				// 				"<tr class='"+trname+"'>" +
+				// 				"<td></td>" +
+				// 				"<td>" +
+				// 				files[i]+
+				// 				"</td>" +
+				// 				"<td>" +
+				// 				"</td>" +
+				// 				"</tr>"
+				// 	)
+				// 	}
+				// }
+				formSubmit2($document,formId,index,tableId);
+
+			},
+			cancel: function(index){
+			}
+		});
+	}
+	function formSubmit2($document,inputForm,index,tableId){
+
+		var validateForm = $($document.getElementById(inputForm)).validate({
+			submitHandler: function(form){
+				loading('正在提交，请稍等...');
+				form.submit();
+			},
+			errorContainer: "#messageBox",
+			errorPlacement: function(error, element) {
+				$($document.getElementById("#messageBox")).text("输入有误，请先更正。");
+				if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+					error.appendTo(element.parent().parent());
+				} else {
+					error.insertAfter(element);
+				}
+			}
+		});
+		if(validateForm.form()){
+			$($document.getElementById(inputForm)).ajaxSubmit({
+				success:function(data) {
+					var d = data;
+					//输出提示信息
+					if(d.str.length>0){
+						parent.layer.msg(d.str,{icon:1});
+					}
+					$("#"+tableId).load(location.href + " #"+tableId);
+					//关闭当前页
+					top.layer.close(index)
+				}
+			});
+		}
+	}
+
+
+	//新增行方法
+	var fileAttachmentTpl = $("#fileAttachmentTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+	var gistdataTpl = $("#gistdataTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+	var otherTpl = $("#otherTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
+
+	function formAttachment(title,url,width,height,target,formId,divId){
+		var rows = $(this).parent().prevAll().length + 1;
+		var frameIndex = parent.layer.getFrameIndex(window.name);
+		var urls = url;
+		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+			width='auto';
+			height='auto';
+		}else{//如果是PC端，根据用户设置的width和height显示。
+
+		}
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			skin:"two-btns",
+			maxmin: false, //开启最大化最小化按钮
+			content: urls ,
+			btn: ['确定','关闭'],
+			yes: function(index, layero){
+				var body = top.layer.getChildFrame('body', index);
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var inputForm = body.find('#inputForm');
+				var top_iframe;
+				inputForm.attr("action","${ctx}/projectTemplate/projectTemplate/getProjectTemplateInfo");//表单提交成功后，从服务器返回的url在当前tab中展示
+				var $document = iframeWin.contentWindow.document;
+				formSubmitAjax($document,formId,index,divId);
+
+			},
+			cancel: function(index){
+			}
+		});
+	}
+	function formSubmitAjax($document,inputForm,index,divId){
+		var validateForm = $($document.getElementById(inputForm)).validate({
+			submitHandler: function(form){
+				loading('正在提交，请稍等...');
+				form.submit();
+			},
+			errorContainer: "#messageBox",
+			errorPlacement: function(error, element) {
+				$($document.getElementById("#messageBox")).text("输入有误，请先更正。");
+				if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+					error.appendTo(element.parent().parent());
+				} else {
+					error.insertAfter(element);
+				}
+			}
+		});
+		if(validateForm.form()){
+			$($document.getElementById(inputForm)).ajaxSubmit({
+				success:function(data) {
+					if(!data.success){
+						top.layer.msg("保存依据资料信息异常!",{icon:2});
+						return false;
+					}
+					var idx = ''
+					if(divId == 'file_attachment'){
+						idx = $("#file_attachment tr").length;
+						addRowBaseData("#file_attachment",idx,fileAttachmentTpl,data.body.projectAccessoryInfo);
+					}else if(divId == 'file_gistdata'){
+						idx = $("#file_gistdata tr").length;
+						addRowBaseData("#file_gistdata",idx,gistdataTpl,data.body.projectAccessoryInfo);
+					}else if(divId == 'file_other'){
+						idx = $("#file_other tr").length;
+						addRowBaseData("#file_other",idx,otherTpl,data.body.projectAccessoryInfo);
+					}
+					parent.layer.msg(data.msg,{icon:1});
+					top.layer.close(index)
+				}
+			});
+		}
+	}
+
+
+	function hasInArr(id,idArr) {
+		for(var i=0;i<idArr.length;i++){
+			if(id==$(idArr[i]).val()){
+				return true;
+			}
+		}
+		return false;
+	}
+	function existBaseData(id,length) {
+		for (var i=0;i<length;i++) {
+			var val = $('#file_attachment'+i+'_id').val();
+			if(id==val){
+				return true;
+			}
+		}
+		return false;
+	}
+
+	function addRowBaseData(list, idx, tpl, row){
+		bornTemplete(list, idx, tpl, row, idx);
+	}
+
+	function bornTemplete(list, idx, tpl, row, idx1){
+		var idx1 = '';
+		if(list == 'file_attachment'){
+			idx1 = $("#file_attachment tr").length +1;
+		}else if(list == 'file_gistdata'){
+			idx1 = $("#file_gistdata tr").length +1;
+		}else if(list == 'file_other'){
+			idx1 = $("#file_other tr").length +1;
+		}
+
+		$(list).append(Mustache.render(tpl, {
+			idx: idx, delBtn: true, row: row,
+			order:idx1 + 1, idx1:idx1
+		}));
+		$(list+idx).find("select").each(function(){
+			$(this).val($(this).attr("data-value"));
+		});
+		$(list+idx).find("input[type='checkbox'], input[type='radio']").each(function(){
+			var ss = $(this).attr("data-value").split(',');
+			for (var i=0; i<ss.length; i++){
+				if($(this).val() == ss[i]){
+					$(this).attr("checked","checked");
+				}
+			}
+		});
+	}
+	function delRowBaseData(obj, prefix,userId){
+		var id = $(prefix+"_id").val();
+		var currentUser = '${fns:getUser().id}';
+		var contentId = '${projectcontentinfo.projectContentData.id}';
+		console.log(contentId);
+		var condition = "${flag}";
+		$.ajax({
+			type:"post",
+			url:'${ctx}/projectcontentinfo/projectContentData/ajaxdelete',
+			data:{"contentId":contentId,"basedId":id,"condition":condition},
+			dataType:"json",
+			success:function(data){
+				if(data.success) {
+					if("according" == condition || "completion" == condition || "early" == condition || "claim" == condition || "design" == condition || "visa" == condition || "interim" == condition || "distribution" == condition || "material" == condition || "armor" == condition ){
+						$(obj).parent().parent().remove();
+					}else{
+						$(obj).parent().parent().remove();
+					}
+					if(data.body.inuse){
+						return;
+					}
+					if (currentUser == userId) {
+						confirmDelete('是否同步删除资料库的文件？','${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+id+'&id=${projectcontentinfo.id}&type=1');
+					}
+				}else {
+					top.layer.msg("删除依据资料失败！", {icon: 0});
+				}
+			}
+		})
+		return;
+	}
+
+	function delBaseData(obj, prefix,userId){
+		var id = $(prefix+"_id").val();
+		var currentUser = '${fns:getUser().id}';
+		var contentId = '${projectcontentinfo.projectContentData.id}';
+		console.log(contentId);
+		var condition = "${flag}";
+		$.ajax({
+			type:"post",
+			url:'${ctx}/projectcontentinfo/projectContentData/ajaxdelete',
+			data:{"contentId":contentId,"basedId":id,"condition":condition},
+			dataType:"json",
+			success:function(data){
+				if(data.success) {
+					if("according" == condition || "completion" == condition || "early" == condition || "claim" == condition || "design" == condition || "visa" == condition || "interim" == condition || "distribution" == condition || "material" == condition || "armor" == condition ){
+						$(obj).parent().parent().parent().remove();
+					}else{
+						$(obj).parent().parent().remove();
+					}
+					if(data.body.inuse){
+						return;
+					}
+					if (currentUser == userId) {
+						confirmDelete('是否同步删除资料库的文件？','${ctx}/projectcontentinfo/projectcontentinfo/delete?infoId='+id+'&id=${projectcontentinfo.id}&type=1');
+					}
+				}else {
+					top.layer.msg("删除依据资料失败！", {icon: 0});
+				}
+			}
+		})
+		return;
+	}
+	function listTr(obj){
+		var name=$(obj).attr("id");
+		var tiao="."+name;
+		var span=$(obj).find("td").eq(2);
+		// var ss=$(span).val().split(" ")[4];
+		$(span).toggle(function () {
+			$(tiao).hide();
+			$(span).find("span").attr("class","treeTable-icon")
+		},function () {
+			$(tiao).show();
+			$(span).find("span").attr("class","treeTable-icon open")
+		});
+	}
+	function confirmDelete(mess, href){
+		top.layer.confirm(mess, {icon: 3, title:'系统提示'}, function(index){
+			//do something
+			if (typeof href == 'function') {
+				href();
+			}else{
+				$.ajax({
+					url:href,
+					type:"post",
+					success:function(data){
+						if(data.success){
+							top.layer.msg("删除依据资料成功！", {icon: 0});
+						}
+					}
+				});
+			}
+			top.layer.close(index);
+		});
+		return false;
+	}
+</script>
+<%--<script>
+	/*使用模块加载的方式 加载文件*/
+	layui.config({
+		base: '${ctx}/resoueces/css/layui/module/'
+	}).extend({
+		treetable: 'treetable-lay/treetable'
+	}).use(['layer', 'table', 'treetable'], function () {
+		var $ = layui.jquery;
+		var table = layui.table;
+		var layer = layui.layer;
+		var treetable = layui.treetable;
+
+		// 渲染表格
+		window.renderTable = function () {//树桩表格参考文档：https://gitee.com/whvse/treetable-lay
+			layer.load(2);
+			treetable.render({
+				treeColIndex: 1,//树形图标显示在第几列
+				treeSpid: 0,//最上级的父级id
+				treeIdName: 'permissionId',//id字段的名称
+				treePidName: 'pid',//pid字段的名称
+				treeDefaultClose: false,//是否默认折叠
+				treeLinkage: true,//父级展开时是否自动展开所有子级
+				elem: '#permissionTable',
+				url: '${ctx}/projectAccessory/projectAccessory/getProjectAccessoryTreeData?projectId=${project.id}',
+				page: false,
+				cols: [[
+					{type: 'numbers', title: '编号' ,width:80},
+					{field: 'type', title: '电子件名称'},
+					{field: 'workAttachments',title: '附件',templet:function(d){
+							if(d.pid !='0'){
+								if(null == d.workAttachments || '' == d.workAttachments){
+									return "<span style=\"color:red\" title='无附件'>无附件</span>";
+								}else{
+									var html = '';
+									for (var x in d.workAttachments) {
+										html += "<div style='display:inline;float:left;'><a style='width:100px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;' class=\"attention-info\" href=\"javascript:void(0)\" onclick=\"preview('预览','"+d.workAttachments[x].url+"','90%','90%')\" title='"+d.workAttachments[x].attachmentName+"'>"+d.workAttachments[x].attachmentName+"</a></div>"
+										if(x != d.workAttachments.length-1){
+											html += "<div style='display:inline;float:left;'> ; </div>";
+										}
+									}
+									return html;
+								}
+							}else{
+								return "";
+							}
+						}},
+					{templet: complain, title: '附件管理',width:80}
+				]],
+				done: function () {
+					layer.closeAll('loading');
+				}
+			});
+		};
+
+		renderTable();
+
+		//触发三个button按钮
+		$('#btn-expand').click(function () {
+			treetable.expandAll('#permissionTable');
+		});
+
+		$('#btn-fold').click(function () {
+			treetable.foldAll('#permissionTable');
+		});
+
+		$('#btn-refresh').click(function () {
+			renderTable();
+		});
+
+
+		function complain(d){//操作中显示的内容
+			if(d.pid !=0){
+				return [
+					'<a href="javascript:void(0)"  onclick="openBill2(\'编辑附件\', \'${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId='+d.id+'&projectId='+d.projectId+'\',\'70%\',\'80%\',false,\'inputForm\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
+				].join('');
+			}else{
+				return[''].join('');
+			}
+		}
+	});
+
+	function openBill2(title,url,width,height,target,formId){
+		var rows = $(this).parent().prevAll().length + 1;
+		var frameIndex = parent.layer.getFrameIndex(window.name);
+		var urls = url+"&index="+frameIndex;
+		if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
+			width='auto';
+			height='auto';
+		}else{//如果是PC端，根据用户设置的width和height显示。
+
+		}
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			skin:"two-btns",
+			maxmin: false, //开启最大化最小化按钮
+			content: urls ,
+			btn: ['确定','关闭'],
+			yes: function(index, layero){
+				var body = top.layer.getChildFrame('body', index);
+				var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+				var inputForm = body.find('#inputForm');
+				var top_iframe;
+				if(target){
+					top_iframe = target;//如果指定了iframe，则在改frame中跳转
+				}else{
+					top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
+				}
+				inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
+				inputForm.attr("action","${ctx}/projectAccessory/projectAccessory/saveWorkAttachment");//表单提交成功后，从服务器返回的url在当前tab中展示
+				var $document = iframeWin.contentWindow.document;
+
+				formSubmit2($document,formId,index);
+
+			},
+			cancel: function(index){
+			}
+		});
+	}
+	function formSubmit2($document,inputForm,index){
+
+		var validateForm = $($document.getElementById(inputForm)).validate({
+			submitHandler: function(form){
+				loading('正在提交，请稍等...');
+				form.submit();
+			},
+			errorContainer: "#messageBox",
+			errorPlacement: function(error, element) {
+				$($document.getElementById("#messageBox")).text("输入有误，请先更正。");
+				if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+					error.appendTo(element.parent().parent());
+				} else {
+					error.insertAfter(element);
+				}
+			}
+		});
+		if(validateForm.form()){
+			$($document.getElementById(inputForm)).ajaxSubmit({
+				success:function(data) {
+					var d = data;
+					//调用layui.use中的renderTable()方法刷新列表
+					renderTable()
+					//输出提示信息
+					if(d.str.length>0){
+						parent.layer.msg(d.str,{icon:1});
+					}
+					//关闭当前页
+					top.layer.close(index)
+				}
+			});
+		}
+	}
+</script>--%>
+</body>
+</html>

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportView.jsp

@@ -8,6 +8,10 @@
 	<script type="text/javascript">
 
 		$(document).ready(function() {
+			var achievementType=$("#achievementType").val();
+			if (achievementType==null || achievementType==""){
+
+			}
 			$("#upTable").treeTable({expandLevel : 5},{ expandable: true });
 			$("#gistdata_upTable").treeTable({expandLevel : 5},{ expandable: true });
 			$("#upTable_other").treeTable({expandLevel : 5},{ expandable: true });
@@ -105,22 +109,23 @@
 <%--				<li><a href="${ctx}/ruralProject/ruralProjectMessage/getReportedView?id=${reportedId}&projectId=${projectId}">上报信息详情</a></li>--%>
 <%--			</ul>--%>
 <%--		</div>--%>
-	<div style="position: fixed;top: 0;width: 100%;z-index: 100">
+	<div class="tapfixed">
 		<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 			<ul class="list-tabs" >
 				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-				<c:if test="${projectRecords.workContractInfo.id!=''}">
-					<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>
-				</c:if>
-<%--				<c:if test="${flagProjectReportData!=null and flagProjectReportData.id!=''}">--%>
-					<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+<%--				<c:if test="${projectRecords.workContractInfo.id!=''}">--%>
+					<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
 <%--				</c:if>--%>
-				<c:if test="${reportedId!=null}">
-					<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-				</c:if>
 				<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
+<%--				<c:if test="${reportedId!=null}">--%>
+					<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+<%--				</c:if>--%>
+				<%--				<c:if test="${flagProjectReportData!=null and flagProjectReportData.id!=''}">--%>
+				<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+				<%--				</c:if>--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 			</ul>
 <%--			<ul class="list-tabs" >--%>
 <%--				<li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
@@ -136,6 +141,12 @@
 		</div>
 	</div>
 <%--	</c:if>--%>
+	<c:if test="${projectReportData.id==null}">
+		<div class="topMar">
+			<h2>暂无报告</h2>
+		</div>
+	</c:if>
+	<c:if test="${projectReportData.id!=null}">
 	<div class="container${container}  view-form" style="margin-top: 40px;">
 		<form:form id="inputForm" modelAttribute="projectcontentinfo"  method="post" class="form-horizontal">
 			<div class="form-group layui-row first lw12">
@@ -143,7 +154,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>成果类型：</label>
 					<div class="layui-input-block">
-						<form:input path="projectReportData.achievementType" cssStyle="background-color: #f1f1f1" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<form:input path="projectReportData.achievementType" cssStyle="background-color: #f1f1f1" htmlEscape="false" id="achievementType" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
 					<%--<div class="layui-item layui-col-sm6">
@@ -275,18 +286,19 @@
 					</div>
 				</div>
 			</div>
-			<c:if test="${not empty projectcontentinfo.projectReportData.act.procInsId}">
+			<c:if test="${not empty processInstanceId}">
 				<div class="form-group layui-row">
 					<div class="form-group-label"><h2>审批流程</h2></div>
 					<div class="layui-item layui-col-xs12 form-table-container" >
-						<act:flowChart procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>
-						<act:histoicFlow procInsId="${projectcontentinfo.projectReportData.act.procInsId}"/>
+						<act:flowChart procInsId="${processInstanceId}"/>
+						<act:histoicFlow procInsId="${processInstanceId}"/>
 					</div>
 				</div>
 			</c:if>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>
+	</c:if>
 </div>
 <script>
 	function openBill2(title,url,width,height,target,formId,tableId){

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportedView.jsp

@@ -77,22 +77,23 @@
 </head>
 <body>
 <div class="single-form">
-    <div style="position: fixed;top: 0;width: 100%;z-index: 100">
+    <div  class="tapfixed">
     <div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
         <ul class="list-tabs" >
             <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-            <c:if test="${projectRecords.workContractInfo.id!=''}">
-                <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>
-            </c:if>
-            <c:if test="${flagProjectReportData.id!=null}">
-                <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-            </c:if>
-            <c:if test="${reportedId!=null}">
-                <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-            </c:if>
+<%--            <c:if test="${projectRecords.workContractInfo.id!=''}">--%>
+                <li ><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
+<%--            </c:if>--%>
             <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
+<%--            <c:if test="${reportedId!=null}">--%>
+                <li class="active"><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+<%--            </c:if>--%>
+<%--            <c:if test="${flagProjectReportData.id!=null}">--%>
+                <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+<%--            </c:if>--%>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
         </ul>
 <%--        <ul class="list-tabs" >--%>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
@@ -107,6 +108,12 @@
 <%--        </ul>--%>
     </div>
     </div>
+    <c:if test="${ruralProjectRecordsReported.id==null}">
+        <div class="topMar">
+            <h2>暂无上报信息</h2>
+        </div>
+    </c:if>
+    <c:if test="${ruralProjectRecordsReported.id!=null}">
     <div class="container" style="margin-top: 40px">
         <sys:message content="${message}"/>
         <form:form id="inputForm" modelAttribute="ruralProjectRecordsReported" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralProjectMessage/auditSaveReported" method="post" class="form-horizontal layui-form">
@@ -462,10 +469,19 @@
                     </div>
                 </div>
             </div>
-
+            <c:if test="${not empty ruralProjectRecordsReported.processInstanceId}">
+                <div class="form-group layui-row">
+                    <div class="form-group-label"><h2>审批流程</h2></div>
+                    <div class="layui-item layui-col-xs12 form-table-container" >
+                        <act:flowChart procInsId="${ruralProjectRecordsReported.processInstanceId}"/>
+                        <act:histoicFlow procInsId="${ruralProjectRecordsReported.processInstanceId}"/>
+                    </div>
+                </div>
+            </c:if>
             <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>
+    </c:if>
 </div>
 
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>

src/main/webapp/webpage/modules/ruralprojectrecords/view/ruralProjectRecordsView.jsp

@@ -24,26 +24,28 @@
 </head>
 <body>
 <div class="single-form">
-	<div style="position: fixed;top: 0;width: 100%;z-index: 100">
+	<div class="tapfixed">
 	<div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
 		<ul class="list-tabs" >
 			<li class="active"><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-			<c:if test="${projectRecords.workContractInfo!=null and projectRecords.workContractInfo.id!=''}">
-				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>
-			</c:if>
-			<c:if test="${flagProjectReportData.id!=null}">
-				<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-			</c:if>
-			<c:if test="${reportedId!=null}">
-				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-			</c:if>
+<%--			<c:if test="${projectRecords.workContractInfo!=null and projectRecords.workContractInfo.id!=''}">--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
+<%--			</c:if>--%>
 			<li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
+
+<%--			<c:if test="${reportedId!=null}">--%>
+				<li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+<%--			</c:if>--%>
+			<%--			<c:if test="${flagProjectReportData.id!=null}">--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+			<%--			</c:if>--%>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
+			<li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
 		</ul>
 	</div>
 	</div>
-	<div class="container view-form" style="margin-top: 40px;">
+	<div class="container view-form" style="margin-top: 50px;">
 		<form:form id="inputForm" modelAttribute="projectRecords" method="post" class="form-horizontal">
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目合同信息</h2></div>
@@ -272,7 +274,13 @@
 					</table>
 				</div>
 			</div>
-
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审批流程</h2></div>
+				<div class="layui-item layui-col-xs12 form-table-container" >
+					<act:flowChart procInsId="${projectRecords.processInstanceId}"/>
+					<act:histoicFlow procInsId="${projectRecords.processInstanceId}"/>
+				</div>
+			</div>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/view/workClientAndContractView.jsp

@@ -18,22 +18,23 @@
 </head>
 <body >
 <div class="single-form view-form">
-    <div style="position: fixed;top: 0;width: 100%;z-index: 100">
+    <div class="tapfixed">
     <div class="list-form-tab contentShadow shadowLTR" id="tabDiv">
         <ul class="list-tabs" >
             <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>
             <li><a href="${ctx}/ruralProject/ruralProjectView/list?parentProId=${projectRecords.id}&projectType=${projectRecords.projectType}">子项目列表</a></li>
-            <c:if test="${projectRecords.workContractInfo.id!=''}">
-                <li  class="active"><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">合同详情</a></li>
-            </c:if>
-            <c:if test="${flagProjectReportData.id!=null}">
-                <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
-            </c:if>
-            <c:if test="${reportedId!=null}">
-                <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
-            </c:if>
+<%--            <c:if test="${projectRecords.workContractInfo.id!=''}">--%>
+                <li  class="active"><a href="${ctx}/ruralProject/ruralProjectView/workContractView?id=${projectRecords.workContractInfo.id}&projectId=${projectRecords.id}">客户合同详情</a></li>
+<%--            </c:if>--%>
             <li><a href="${ctx}/ruralProject/ruralProjectView/planView?id=${projectRecords.id}">项目计划信息</a></li>
-            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">附件信息</a></li>
+<%--            <c:if test="${reportedId!=null}">--%>
+                <li><a href="${ctx}/ruralProject/ruralProjectView/getReportedView?projectId=${projectRecords.id}&id=${reportedId}">上报信息</a></li>
+<%--            </c:if>--%>
+            <%--            <c:if test="${flagProjectReportData.id!=null}">--%>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/modify?projectId=${projectRecords.id}">报告信息</a></li>
+            <%--            </c:if>--%>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/getAccessoryView?id=${projectRecords.id}">档案信息</a></li>
+            <li><a href="${ctx}/ruralProject/ruralProjectView/formRecordModify?id=${projectRecords.id}">线上归档信息</a></li>
         </ul>
 <%--        <ul class="list-tabs" >--%>
 <%--            <li><a href="${ctx}/ruralProject/ruralProjectView/view?id=${projectRecords.id}">项目详情</a></li>--%>
@@ -48,11 +49,17 @@
 <%--        </ul>--%>
     </div>
     </div>
-    <form class="container" style="margin-top: 40px;">
+    <c:if test="${workContractInfo.id==null}">
+        <div class="topMar">
+            <h2>暂无客户合同信息</h2>
+        </div>
+    </c:if>
+    <c:if test="${workContractInfo.id!=null}">
+    <div class="container" style="margin-top: 50px;">
         <form:form id="inputForm" modelAttribute="workContractInfo"  method="post" class="layui-form">
         <div class="form-group layui-row first">
             <input type="hidden" id="id" value="${workClientInfo.id}">
-            <div class="form-group-label"><h2>基本信息</h2></div>
+            <div class="form-group-label"><h2>委托方信息</h2></div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">客户名称：</label>
                 <div class="layui-input-block">
@@ -93,16 +100,16 @@
                     <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="<c:set value="${fn:split(workClientInfo.clientType, ',') }" var="clientTypes" /><c:forEach items="${clientTypes}" var="cType" varStatus="status">${fns:getMainDictLabel(cType, 'client_type', '')}<c:if test="${!status.last}">, </c:if></c:forEach>"/>
                 </div>
             </div>
-            <div class="layui-item layui-col-sm6 lw7">
-                <label class="layui-form-label">代表单位：</label>
-                <div class="layui-input-block">
-                    <div class="input-group">
-                        <div >
-                            <div id="jobType" style="pointer-events: none;background-color: #f1f1f1" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
+<%--            <div class="layui-item layui-col-sm6 lw7">--%>
+<%--                <label class="layui-form-label">代表单位：</label>--%>
+<%--                <div class="layui-input-block">--%>
+<%--                    <div class="input-group">--%>
+<%--                        <div >--%>
+<%--                            <div id="jobType" style="pointer-events: none;background-color: #f1f1f1" class="xm-select-demo" tabindex="0" contenteditable="true"></div>--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
+<%--                </div>--%>
+<%--            </div>--%>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">法人代表：</label>
                 <div class="layui-input-block">
@@ -453,9 +460,17 @@
                     </table>
                 </div>
             </div>
+            <div class="form-group layui-row">
+                <div class="form-group-label"><h2>审批流程</h2></div>
+                <div class="layui-item layui-col-xs12 form-table-container" >
+                    <act:flowChart procInsId="${workContractInfo.processInstanceId}"/>
+                    <act:histoicFlow procInsId="${workContractInfo.processInstanceId}"/>
+                </div>
+            </div>
         <div class="form-group layui-row page-end"></div>
     </form:form>
     </div>
+    </c:if>
 </div>
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 <script>

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

@@ -89,9 +89,9 @@
 					</div>
 					<div class="layui-item athird fr">
 						<div class="input-group">
-							<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 class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -106,12 +106,12 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
+					<div class="layui-btn-group">
 						<shiro:hasPermission name="serialnum:serialNumTpl:add">
 							<%--<table:addRow url="${ctx}/serialnum/serialNumTpl/form" title="编号模板"></table:addRow><!-- 增加按钮 -->--%>
-							<button class="layui-btn layui-bg-blue" data-toggle="tooltip" data-placement="left" onclick="openDialogre('修改编号模板', '${ctx}/serialnum/serialNumTpl/form?id=${serialNumTpl.id}','95%', '95%','','生成模板,提交,关闭')" title="添加"> 添加</button>
+							<button class="layui-btn layui-btn-sm layui-bg-blue" data-toggle="tooltip" data-placement="left" onclick="openDialogre('修改编号模板', '${ctx}/serialnum/serialNumTpl/form?id=${serialNumTpl.id}','95%', '95%','','生成模板,提交,关闭')" title="添加"> 添加</button>
 						</shiro:hasPermission>
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 <%--					<shiro:hasPermission name="serialnum:serialNumTpl:add">--%>
 <%--						&lt;%&ndash;<table:addRow url="${ctx}/serialnum/serialNumTpl/form" title="编号模板"></table:addRow><!-- 增加按钮 -->&ndash;%&gt;--%>

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

@@ -54,7 +54,7 @@
 						<a href="javascript:void(0)" onclick="openDialogView('查看区域', '${ctx}/sys/area/form?id={{d.id}}&view=1','95%','95%')" class="layui-btn layui-btn-xs layui-bg-green" > 查看</a>
 					</shiro:hasPermission>
 					<shiro:hasPermission name="sys:area:edit">
-						<a href="javascript:void(0)" onclick="openDialog('修改区域', '${ctx}/sys/area/form?id={{d.id}}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-blue" > 修改</a>
+						<a href="javascript:void(0)" onclick="openDialog('修改区域', '${ctx}/sys/area/form?id={{d.id}}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>
 					</shiro:hasPermission>
 					<shiro:hasPermission name="sys:area:del">
 						<a href="${ctx}/sys/area/delete?id={{d.id}}" onclick="return confirmx('要删除该区域及所有子区域项吗？', this.href)" class="layui-btn layui-btn-xs layui-bg-red" > 删除</a>
@@ -82,7 +82,7 @@
 							<shiro:hasPermission name="sys:menu:add">
 								<table:addRow url="${ctx}/sys/area/form" title="菜单"></table:addRow><!-- 增加按钮 -->
 							</shiro:hasPermission>
-							<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+							<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 						</div>
 <%--						<shiro:hasPermission name="sys:menu:add">--%>
 <%--							<table:addRow url="${ctx}/sys/area/form" title="菜单"></table:addRow><!-- 增加按钮 -->--%>

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

@@ -48,9 +48,9 @@
 					</div>
 					<div class="layui-item athird">
 						<div class="input-group">
-							<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 class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -75,7 +75,7 @@
 						<shiro:hasPermission name="sys:dict:del">
 							<table:delRow url="${ctx}/sys/dict/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->
 						</shiro:hasPermission>
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 <%--					<shiro:hasPermission name="sys:dict:add">--%>
 <%--						<table:addRow url="${ctx}/sys/dict/form" title="字典"></table:addRow><!-- 增加按钮 -->--%>
@@ -120,13 +120,13 @@
 											<a href="javascript:void(0)" onclick="openDialogView('查看字典', '${ctx}/sys/dict/form?id=${dict.id}&view=1','95%','95%')" class="layui-btn layui-btn-xs layui-bg-green" > 查看</a>
 										</shiro:hasPermission>
 										<shiro:hasPermission name="sys:dict:edit">
-											<a href="javascript:void(0)" onclick="openDialog('修改字典', '${ctx}/sys/dict/form?id=${dict.id}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-blue" > 修改</a>
+											<a href="javascript:void(0)" onclick="openDialog('修改字典', '${ctx}/sys/dict/form?id=${dict.id}','95%','95%')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>
 										</shiro:hasPermission>
 										<shiro:hasPermission name="sys:dict:del">
 											<a href="${ctx}/sys/dict/delete?id=${dict.id}&type=${dict.type}" onclick="return confirmx('确认要删除该字典吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>
 										</shiro:hasPermission>
 										<shiro:hasPermission name="sys:dict:add">
-											<a href="javascript:void(0)" onclick="openDialog('添加键值', '<c:url value='${fns:getAdminPath()}/sys/dict/form?type=${dict.type}&sort=${dict.sort+10}'><c:param name='description' value='${dict.description}'/></c:url>','95%','95%')" class="layui-btn layui-btn-xs layui-bg-green" > 添加键值</a>
+											<a href="javascript:void(0)" onclick="openDialog('添加键值', '<c:url value='${fns:getAdminPath()}/sys/dict/form?type=${dict.type}&sort=${dict.sort+10}'><c:param name='description' value='${dict.description}'/></c:url>','95%','95%')" class="layui-btn layui-btn-xs layui-bg-blue" > 添加键值</a>
 										</shiro:hasPermission>
 									</div>
 								</div>

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

@@ -110,10 +110,10 @@
 					</div>
 					<div class="layui-item athird">
 						<div class="input-group">
-							<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>
+							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+							<div class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -142,7 +142,7 @@
 						<c:if test="<%=admin%>">
 							<table:addRow url="${ctx}/sys/mainDict/form" title="字典类型"></table:addRow><!-- 增加按钮 -->
 						</c:if>
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 <%--					<c:if test="<%=admin%>">--%>
 <%--							<table:addRow url="${ctx}/sys/mainDict/form" title="字典类型"></table:addRow><!-- 增加按钮 -->--%>
@@ -192,14 +192,14 @@
 										<a href="#" onclick="openDialogView('字典明细', '${ctx}/sys/mainDict/form?id=${mainDict.id}&view=2','95%', '95%')"   class="layui-btn layui-btn-xs layui-bg-orange"> 自定义</a>
 										<c:if test="<%=admin%>">
 											<shiro:hasPermission name="sys:mainDict:edit">
-												<a href="#" onclick="openDialog('修改字典', '${ctx}/sys/mainDict/form?id=${mainDict.id}','95%', '95%')" class="layui-btn layui-btn-xs layui-bg-blue" > 修改</a>
+												<a href="#" onclick="openDialog('修改字典', '${ctx}/sys/mainDict/form?id=${mainDict.id}','95%', '95%')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>
 											</shiro:hasPermission>
 											<shiro:hasPermission name="sys:mainDict:del">
 												<a href="${ctx}/sys/mainDict/delete?id=${mainDict.id}" onclick="return confirmx('确认要删除该字典吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red">删除</a>
 											</shiro:hasPermission>
 										</c:if>
 										<shiro:hasPermission name="sys:mainDict:view">
-											<a href="#" onclick="openDialogView('默认字典', '${ctx}/sys/mainDict/form?id=${mainDict.id}&view=1','95%', '95%')" class="layui-btn layui-btn-xs layui-bg-green" > 默认字典</a>
+											<a href="#" onclick="openDialogView('默认字典', '${ctx}/sys/mainDict/form?id=${mainDict.id}&view=1','95%', '95%')" class="layui-btn layui-btn-xs layui-bg-orange" > 默认字典</a>
 										</shiro:hasPermission>
 									</div>
 <%--								<a href="#" onclick="openDialogView('字典明细', '${ctx}/sys/mainDict/form?id=${mainDict.id}&view=2','95%', '95%')"   class="op-btn op-btn-submit"><i class="fa fa-edit"></i> 自定义</a>--%>

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

@@ -69,18 +69,18 @@
 		</td>
 		<td style="text-align: center">
 			<div class="btn-group">
-				<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+				<div class="layui-btn-group">
 					<shiro:hasPermission name="sys:menu:view">
 						<a href="javascript:void(0)" style="margin-left: 2px;margin-right: 2px;" onclick="openDialogView('查看菜单', '${ctx}/sys/menu/form?id={{d.id}}','80%', '80%')" class="layui-btn layui-btn-xs layui-bg-green"> 查看</a>&nbsp&nbsp
 					</shiro:hasPermission>
 					<shiro:hasPermission name="sys:menu:edit">
-						<a href="javascript:void(0)" style="margin-left: 2px;margin-right: 2px;" onclick="openDialog('修改菜单', '${ctx}/sys/menu/form?id={{d.id}}','80%', '80%')" class="layui-btn layui-btn-xs layui-bg-blue"> 修改</a>
+						<a href="javascript:void(0)" style="margin-left: 2px;margin-right: 2px;" onclick="openDialog('修改菜单', '${ctx}/sys/menu/form?id={{d.id}}','80%', '80%')" class="layui-btn layui-btn-xs layui-bg-green"> 修改</a>
 					</shiro:hasPermission>
 					<shiro:hasPermission name="sys:menu:del">
 						<a href="${ctx}/sys/menu/delete?id={{d.id}}" onclick="return confirmx('要删除该菜单及所有子菜单项吗？', this.href)" style="margin-left: 2px;margin-right: 2px;" class="layui-btn layui-btn-xs layui-bg-red" > 删除</a>
 					</shiro:hasPermission>
 					<shiro:hasPermission name="sys:menu:add">
-						<a href="javascript:void(0)" style="margin-left: 2px;margin-right: 2px;" onclick="openDialog('添加下级菜单', '${ctx}/sys/menu/form?parent.id={{d.id}}','80%', '80%')" class="layui-btn layui-btn-xs layui-bg-green"> 添加下级菜单</a>
+						<a href="javascript:void(0)" style="margin-left: 2px;margin-right: 2px;" onclick="openDialog('添加下级菜单', '${ctx}/sys/menu/form?parent.id={{d.id}}','80%', '80%')" class="layui-btn layui-btn-xs layui-bg-blue"> 添加下级菜单</a>
 					</shiro:hasPermission>
 				</div>
 <%--				<shiro:hasPermission name="sys:menu:view">--%>
@@ -114,7 +114,7 @@
 				<shiro:hasPermission name="sys:menu:add">
 					<table:addRow url="${ctx}/sys/menu/form" title="菜单"></table:addRow><!-- 增加按钮 -->
 				</shiro:hasPermission>
-				<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+				<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 			</div>
 <%--			<shiro:hasPermission name="sys:menu:add">--%>
 <%--				<table:addRow url="${ctx}/sys/menu/form" title="菜单"></table:addRow><!-- 增加按钮 -->--%>

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

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

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

@@ -65,9 +65,9 @@
 
 						<div class="layui-item athird fr">
 							<div class="input-group">
-								<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 class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -85,7 +85,7 @@
 						<shiro:hasPermission name="sys:role:add">
 							<table:addRow url="${ctx}/sys/role/form?office=" title="岗位"></table:addRow><!-- 增加按钮 -->
 						</shiro:hasPermission>
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 <%--					<shiro:hasPermission name="sys:role:add">--%>
 <%--						<table:addRow url="${ctx}/sys/role/form?office=" title="岗位"></table:addRow><!-- 增加按钮 -->--%>

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

@@ -48,9 +48,9 @@
 
 					<div class="layui-item athird fr">
 						<div class="input-group">
-							<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 class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -75,7 +75,7 @@
 						<shiro:hasPermission name="sys:sysroleactivity:export">
 							<table:exportExcel url="${ctx}/sys/sysroleactivity/export"></table:exportExcel><!-- 导出按钮 -->
 						</shiro:hasPermission>
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 <%--					<shiro:hasPermission name="sys:sysroleactivity:add">--%>
 <%--						<table:addRow url="${ctx}/sys/sysroleactivity/form" title="工作流角色信息" width="95%" height="95%"></table:addRow><!-- 增加按钮 -->--%>

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

@@ -0,0 +1,219 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<title>数据选择</title>
+	<meta name="decorator" content="blank"/>
+	<%@include file="/webpage/include/treeview.jsp" %>
+	<script type="text/javascript">
+		var key, lastValue = "", nodeList = [], type = getQueryString("type", "${url}");
+		var tree, setting = {view:{selectedMulti:false,dblClickExpand:false},check:{enable:"${checked}",nocheckInherit:true},
+				async:{enable:(type==3),url:"${ctx}/sys/user/treeData",autoParam:["id=officeId","projectId=projectId","selectName=selectName"]},
+				data:{simpleData:{enable:true}},callback:{<%--
+					beforeClick: function(treeId, treeNode){
+						if("${checked}" == "true"){
+							//tree.checkNode(treeNode, !node.checked, true, true);
+							tree.expandNode(treeNode, true, false, false);
+						}
+					}, --%>
+					onClick:function(event, treeId, treeNode){
+						tree.expandNode(treeNode);
+					},onCheck: function(e, treeId, treeNode){
+						var nodes = tree.getCheckedNodes(true);
+						for (var i=0, l=nodes.length; i<l; i++) {
+							tree.expandNode(nodes[i], true, false, false);
+						}
+						return false;
+					},onAsyncSuccess: function(event, treeId, treeNode, msg){
+						var nodes = tree.getNodesByParam("pId", treeNode.id, null);
+						for (var i=0, l=nodes.length; i<l; i++) {
+							try{tree.checkNode(nodes[i], treeNode.checked, true);}catch(e){}
+							//tree.selectNode(nodes[i], false);
+						}
+						selectCheckNode();
+					},onDblClick: function(){//<c:if test="${!checked}">
+						top.$.jBox.getBox().find("button[value='ok']").trigger("click");
+						//$("input[type='text']", top.mainFrame.document).focus();//</c:if>
+					}
+				}
+			};
+		function expandNodes(nodes) {
+			if (!nodes) return;
+			for (var i=0, l=nodes.length; i<l; i++) {
+				tree.expandNode(nodes[i], true, false, false);
+				if (nodes[i].isParent && nodes[i].zAsync) {
+					expandNodes(nodes[i].children);
+				}
+			}
+		}
+		$(document).ready(function(){
+			$.get("${ctx}${url}${fn:indexOf(url,'?')==-1?'?':'&'}&extId=${extId}&isAll=${isAll}&module=${module}&t="
+					+ new Date().getTime()+"&flagOffice=${flagOffice}"+"&branchOffice=${branchOffice}", function(zNodes){
+				// 初始化树结构
+				tree = $.fn.zTree.init($("#tree"), setting, zNodes);
+				
+				// 默认展开一级节点
+				var nodes = tree.getNodesByParam("level", 0);
+				for(var i=0; i<nodes.length; i++) {
+					tree.expandNode(nodes[i], true, false, false);
+				}
+				//异步加载子节点（加载用户）
+				var nodesOne = tree.getNodesByParam("isParent", true);
+				for(var j=0; j<nodesOne.length; j++) {
+					tree.reAsyncChildNodes(nodesOne[j],"!refresh",true);
+				}
+				selectCheckNode();
+			});
+			key = $("#key");
+			key.bind("focus", focusKey).bind("blur", blurKey).bind("change cut input propertychange", searchNode);
+			key.bind('keydown', function (e){if(e.which == 13){searchNode();}});
+			setTimeout("search();", "300");
+		});
+		
+		// 默认选择节点
+		function selectCheckNode(){
+			var ids = "${selectIds}".split(",");
+			for(var i=0; i<ids.length; i++) {
+				var node = tree.getNodeByParam("id", (type==3?"u_":"")+ids[i]);
+				if("${checked}" == "true"){
+					try{tree.checkNode(node, true, true);}catch(e){}
+					tree.selectNode(node, false);
+				}else{
+					tree.selectNode(node, true);
+				}
+			}
+		}
+	  	function focusKey(e) {
+			if (key.hasClass("empty")) {
+				key.removeClass("empty");
+			}
+		}
+		function blurKey(e) {
+			if (key.get(0).value === "") {
+				key.addClass("empty");
+			}
+			searchNode(e);
+		}
+		
+		//搜索节点
+		function searchNode() {
+			// 取得输入的关键字的值
+			var value = $.trim(key.get(0).value);
+			
+			// 按名字查询
+			var keyType = "name";<%--
+			if (key.hasClass("empty")) {
+				value = "";
+			}--%>
+			
+			// 如果和上次一次，就退出不查了。
+			if (lastValue === value) {
+				return;
+			}
+			
+			// 保存最后一次
+			lastValue = value;
+			
+			var nodes = tree.getNodes();
+			// 如果要查空字串，就退出不查了。
+			if (value == "") {
+				showAllNode(nodes);
+				return;
+			}
+			hideAllNode(nodes);
+			nodeList = tree.getNodesByParamFuzzy(keyType, value);
+			updateNodes(nodeList);
+		}
+		
+		//隐藏所有节点
+		function hideAllNode(nodes){			
+			nodes = tree.transformToArray(nodes);
+			for(var i=nodes.length-1; i>=0; i--) {
+				tree.hideNode(nodes[i]);
+			}
+		}
+		
+		//显示所有节点
+		function showAllNode(nodes){			
+			nodes = tree.transformToArray(nodes);
+			for(var i=nodes.length-1; i>=0; i--) {
+				/* if(!nodes[i].isParent){
+					tree.showNode(nodes[i]);
+				}else{ */
+					if(nodes[i].getParentNode()!=null){
+						tree.expandNode(nodes[i],false,false,false,false);
+					}else{
+						tree.expandNode(nodes[i],true,true,false,false);
+					}
+					tree.showNode(nodes[i]);
+					showAllNode(nodes[i].children);
+				/* } */
+			}
+		}
+		
+		//更新节点状态
+		function updateNodes(nodeList) {
+			tree.showNodes(nodeList);
+			for(var i=0, l=nodeList.length; i<l; i++) {
+				
+				//展开当前节点的父节点
+				tree.showNode(nodeList[i].getParentNode()); 
+				//tree.expandNode(nodeList[i].getParentNode(), true, false, false);
+				//显示展开符合条件节点的父节点
+				while(nodeList[i].getParentNode()!=null){
+					tree.expandNode(nodeList[i].getParentNode(), true, false, false);
+					nodeList[i] = nodeList[i].getParentNode();
+					tree.showNode(nodeList[i].getParentNode());
+				}
+				//显示根节点
+				tree.showNode(nodeList[i].getParentNode());
+				//展开根节点
+				tree.expandNode(nodeList[i].getParentNode(), true, false, false);
+			}
+		}
+		function copyText() {
+			var selectName = $("#selectName").val();
+			$.ajax({
+				url:"${ctx}/sys/area/treeDataReimbur",
+				async:false,
+				type:"post",
+				success:function (result) {
+					$.get("${ctx}${url}${fn:indexOf(url,'?')==-1?'?':'&'}&extId=${extId}&isAll=${isAll}&module=${module}&t="
+							+ new Date().getTime()+"&flagOffice=${flagOffice}"+"&branchOffice=${branchOffice}"+"&selectName="+selectName, function(zNodes){
+						// 初始化树结构
+						tree = $.fn.zTree.init($("#tree"), setting, zNodes);
+
+						// 默认展开一级节点
+						var nodes = tree.getNodesByParam("level", 0);
+						for(var i=0; i<nodes.length; i++) {
+							tree.expandNode(nodes[i], true, false, false);
+						}
+						//异步加载子节点（加载用户）
+						var nodesOne = tree.getNodesByParam("isParent", true);
+						for(var j=0; j<nodesOne.length; j++) {
+							tree.reAsyncChildNodes(nodesOne[j],"!refresh",true);
+						}
+						selectCheckNode();
+					});
+					key = $("#key");
+					key.bind("focus", focusKey).bind("blur", blurKey).bind("change cut input propertychange", searchNode);
+					key.bind('keydown', function (e){if(e.which == 13){searchNode();}});
+					setTimeout("search();", "300");
+				}
+			})
+
+		}
+		
+		
+	</script>
+</head>
+<body>
+<div class="input-group">
+	<input htmlEscape="false"  class="form-control layui-input" id="selectName" name="selectName" value="" placeholder="区域搜索">
+	<span class="input-group-btn">
+				 <button type="button"  id="Button" onclick="copyText()" style="height: 40px;" class="layui-btn layui-btn-sm"><i class="fa fa-search"> 查询</i>
+				 </button>
+			</span>
+</div>
+	<div id="tree" class="ztree" style="padding:15px 20px;"></div>
+</body>

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

@@ -78,10 +78,10 @@
 
 						<div class="layui-item athird">
 							<div class="input-group">
-								<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>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " 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>--%>
@@ -110,9 +110,9 @@
 							<table:addRow url="${ctx}/sys/user/form?office.id=${user.office.id}&office.name=${user.office.name}&office.type=${user.office.type}" title="用户" target=""></table:addRow><!-- 增加按钮 -->
 						</shiro:hasPermission>
 						<c:if test="${manager}">
-							<a href="javascript:void(0)" onclick="openDialog('邀请加入企业', '${ctx}/sys/company/addUserInfo','75%','400px;')" class="layui-btn nav-btn-add" > 邀请</a>
+							<a href="javascript:void(0)" onclick="openDialog('邀请加入企业', '${ctx}/sys/company/addUserInfo','75%','400px;')" class="layui-btn  layui-btn-sm  layui-bg-blue" > 邀请</a>
 						</c:if>
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 <%--					<shiro:hasPermission name="sys:user:add">--%>
 <%--						<table:addRow url="${ctx}/sys/user/form?office.id=${user.office.id}&office.name=${user.office.name}&office.type=${user.office.type}" title="用户" target=""></table:addRow><!-- 增加按钮 -->--%>