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

src/main/java/com/jeeplus/common/utils/ThisLocalityDownloadUtil.java

@@ -23,10 +23,10 @@ public class ThisLocalityDownloadUtil {
             Boolean isWindows = System.getProperty("os.name").toLowerCase().contains("linux");
             String path = "";
             if(!isWindows){
-                path = filePath+"WEB-INF/classes/dot/"+fileName;
+                path = filePath+"dot/"+fileName;
             }else{
                 //如果是linux系统 则需要在路径前加上一个 /
-                path = "/"+filePath+"WEB-INF/classes/dot/"+fileName;
+                path = "/"+filePath+"dot/"+fileName;
             }
             downCfg(fileName, request, response);
             OutputStream out;

src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -1026,7 +1026,9 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             }
         }
         if(!tiao || proInfos[1].length()>50){
+            boolean flag=false;
             Integer count=0;
+            String prid="";
             for (int i=0;i<proInfos.length;i++){
                 if (proInfos[i]!=""&& !"".equals(proInfos[i])) {
                     json = JSONObject.fromObject(proInfos[i]);
@@ -1036,7 +1038,10 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
                     info.setProInfofilingBatch(json.get("filingId").toString());
                     info.setProInfoName(json.get("names").toString());
                     info.setProInfoType(json.get("types").toString());
-                    if(count==0){ DelProInfo(info);count++;}
+                    if(count==0 || !prid.equals(json.get("proId").toString())){
+                        DelProInfo(info);count++;
+                    }
+                    prid=json.get("proId").toString();
                     proInfoDao.proInfoInsert(info);
                 }
             }

src/main/java/com/jeeplus/modules/workstaff/dao/WorkStaffBasicInfoDao.java

@@ -82,4 +82,6 @@ public interface WorkStaffBasicInfoDao extends CrudDao<WorkStaffBasicInfo> {
      * @return
      */
     Integer updateAuditUser(WorkStaffBasicInfo workStaffBasicInfo);
+
+    List<WorkStaffBasicInfo> getByName(String name);
 }

src/main/java/com/jeeplus/modules/workstaff/dao/WorkStaffCertificateDao.java

@@ -6,6 +6,9 @@ package com.jeeplus.modules.workstaff.dao;
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificateImport;
+
+import java.util.List;
 
 /**
  * 执业资格证书DAO接口
@@ -15,5 +18,22 @@ import com.jeeplus.modules.workstaff.entity.WorkStaffCertificate;
 @MyBatisDao
 public interface WorkStaffCertificateDao extends CrudDao<WorkStaffCertificate> {
     int updateFalt(String id);
-	
+
+    /**
+     * 根据用户id查询对应数据信息
+     * @param userId
+     * @return
+     */
+    List<WorkStaffCertificate> getByUserId(String userId);
+    /**
+     * 批量添加职业资格信息添加
+     * @param info
+     */
+    void saveImport(WorkStaffCertificateImport info);
+
+    /**
+     * 修改批量添加职业资格信息
+     * @param info
+     */
+    void updateImport(WorkStaffCertificateImport info);
 }

src/main/java/com/jeeplus/modules/workstaff/entity/WorkStaffCertificateImport.java

@@ -0,0 +1,150 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.workstaff.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jeeplus.common.persistence.DataEntity;
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Date;
+
+/**
+ * 执业资格证书Entity
+ * @author ssrh
+ * @version 2018-07-27
+ */
+public class WorkStaffCertificateImport extends DataEntity<WorkStaffCertificateImport> {
+
+	private static final long serialVersionUID = 1L;
+	private String staffId;		// 员工ID
+	private String userName;		// 员工名称
+	private String name;		// 证书名称
+	private String num;		// 证书编号
+	private String issuingAuthority;		// 发证机关
+	private Date issuingDate;		// 发证日期
+	private Date registDate;		// 注册日期
+	private String registNum;		// 注册证书编号
+	private String major;		// 专业
+	private String filePath;		// 文件
+    private String fileName;		// 文件名
+    private MultipartFile file;
+
+	public String getStaffId() {
+		return staffId;
+	}
+
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
+	}
+
+	public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public MultipartFile getFile() {
+        return file;
+    }
+
+    public void setFile(MultipartFile file) {
+        this.file = file;
+    }
+
+    public WorkStaffCertificateImport() {
+		super();
+	}
+
+	public WorkStaffCertificateImport(String id){
+		super(id);
+	}
+
+	@ExcelField(title="员工名称", align=2, sort=1)
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	
+	@ExcelField(title="证书名称", align=2, sort=2)
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	@ExcelField(title="证书编号", align=2, sort=3)
+	public String getNum() {
+		return num;
+	}
+
+	public void setNum(String num) {
+		this.num = num;
+	}
+
+	@ExcelField(title="专业", align=2, sort=4)
+	public String getMajor() {
+		return major;
+	}
+
+	public void setMajor(String major) {
+		this.major = major;
+	}
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ExcelField(title="注册日期", align=2, sort=5)
+	public Date getRegistDate() {
+		return registDate;
+	}
+
+	public void setRegistDate(Date registDate) {
+		this.registDate = registDate;
+	}
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ExcelField(title="发证日期", align=2, sort=6)
+	public Date getIssuingDate() {
+		return issuingDate;
+	}
+
+	public void setIssuingDate(Date issuingDate) {
+		this.issuingDate = issuingDate;
+	}
+	
+	@ExcelField(title="发证机关", align=2, sort=7)
+	public String getIssuingAuthority() {
+		return issuingAuthority;
+	}
+
+	public void setIssuingAuthority(String issuingAuthority) {
+		this.issuingAuthority = issuingAuthority;
+	}
+
+	public static long getSerialVersionUID() {
+		return serialVersionUID;
+	}
+
+	public String getRegistNum() {
+		return registNum;
+	}
+
+	public void setRegistNum(String registNum) {
+		this.registNum = registNum;
+	}
+
+	public String getFilePath() {
+		return filePath;
+	}
+
+	public void setFilePath(String filePath) {
+		this.filePath = filePath;
+	}
+}

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffCertificateService.java

@@ -10,6 +10,7 @@ import java.lang.reflect.Method;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -22,9 +23,12 @@ import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.IdGen;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.sys.dao.UserDao;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.DictUtils;
+import com.jeeplus.modules.workstaff.dao.WorkStaffBasicInfoDao;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificateImport;
 import com.jeeplus.modules.workstaff.entity.WorkStaffEducation;
 import com.jeeplus.modules.workstaffachiveslog.entity.WorkStaffAchivesLog;
 import com.jeeplus.modules.workstaffachiveslog.service.WorkStaffAchivesLogService;
@@ -50,6 +54,8 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
     private WorkStaffAchivesLogService workStaffAchivesLogService;
     @Autowired
     private UserDao userDao;
+    @Autowired
+    private WorkStaffBasicInfoDao workStaffBasicInfoDao;
 	public WorkStaffCertificate get(String id) {
 		return super.get(id);
 	}
@@ -107,6 +113,70 @@ public class WorkStaffCertificateService extends CrudService<WorkStaffCertificat
         return flag;
     }
 
+    /**
+     * 导入职业资格文件处理
+     * @param list
+     * @return
+     */
+    @Transactional(readOnly = false)
+    public Map<String,List<String>> saveByImport(List<WorkStaffCertificateImport> list){
+	    Map map =new HashMap();
+	    //没有该用户集合
+	    List<String> nullUser = Lists.newArrayList();
+	    //该名称成员数量大于1
+	    List<String> multitudeUser = Lists.newArrayList();
+	    //该名称成员信息修改list
+	    List<String> updateUser = Lists.newArrayList();
+	    Map<String,String> updateMap = new HashMap();
+        List<WorkStaffBasicInfo> userList = null;
+        for (WorkStaffCertificateImport entity : list) {
+            boolean flag = false;
+            //判断人员姓名是否为空，不为空则进行查询人员信息
+            if(StringUtils.isNotBlank(entity.getUserName())){
+                userList = workStaffBasicInfoDao.getByName(entity.getUserName());
+                if(0 == userList.size()){
+                    //将该成员名称添加到 没有该用户集合中
+                    nullUser.add(entity.getUserName());
+                }else if(1 == userList.size()){
+                    entity.setStaffId(userList.get(0).getId());
+                    //根据 职业资格名称查询字典表并比对当前人员是否已添加该职业资格信息
+                    List<WorkStaffCertificate> certificateList = dao.getByUserId(userList.get(0).getId());
+                    for (WorkStaffCertificate certificate : certificateList) {
+                        if(entity.getName().equals(certificate.getName())){
+                            entity.setId(certificate.getId());
+                            flag = true;
+                            break;
+                        }
+                    }
+                    if(flag){
+                        entity.preUpdate();
+                        dao.updateImport(entity);
+                        //查询updateMap中是否已含有相同人员被替换的职业资格证书名称的数据，有则再value值中进行添加新的数据
+                        String mapStr = updateMap.get(entity.getUserName());
+                        if(StringUtils.isNotBlank(mapStr)){
+                            updateMap.put(entity.getUserName(),mapStr +"、"+ entity.getName());
+                        }else{
+                            updateMap.put(entity.getUserName(),entity.getName());
+                        }
+                    }else{
+                        entity.preInsert();
+                        dao.saveImport(entity);
+                    }
+                }else{
+                    //将该成员名称添加到 该名称成员数量大于1集合中
+                    multitudeUser.add(entity.getUserName());
+                }
+            }
+        }
+        for (String key:updateMap.keySet()) {
+            updateUser.add(key+ "：" + updateMap.get(key));
+        }
+        map.put("nullUser",nullUser);
+        map.put("multitudeUser",multitudeUser);
+        map.put("updateUser",updateUser);
+	    return map;
+    }
+
     /*public String uploadFile(MultipartFile file, String filePath) {
         if (file != null && !file.isEmpty() &&file.getSize()>0) {
             String key = "";

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -12,6 +12,7 @@ import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.common.utils.ThisLocalityDownloadUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
@@ -26,9 +27,12 @@ import com.jeeplus.modules.sysimportinfo.service.SysImportInfoService;
 import com.jeeplus.modules.wexinpackage.access.service.WeChatCallbackService;
 import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
 import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
+import com.jeeplus.modules.workreceiptsregister.entity.ResponseEntity;
 import com.jeeplus.modules.workrelationship.entity.WorkRelationship;
 import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
+import com.jeeplus.modules.workstaff.entity.WorkStaffCertificateImport;
 import com.jeeplus.modules.workstaff.service.WorkStaffBasicInfoService;
+import com.jeeplus.modules.workstaff.service.WorkStaffCertificateService;
 import com.jeeplus.modules.workstaffachiveslog.dao.WorkStaffAchivesLogDao;
 import com.jeeplus.modules.workstaffachiveslog.entity.WorkStaffAchivesLog;
 import com.jeeplus.modules.workstaffachiveslog.service.WorkStaffAchivesLogService;
@@ -79,6 +83,8 @@ public class WorkStaffBasicInfoController extends BaseController {
 	private UserService userService;
     @Autowired
 	private WeChatCallbackService weChatCallbackService;
+    @Autowired
+	private WorkStaffCertificateService workStaffCertificateService;
 
 	@ModelAttribute
 	public WorkStaffBasicInfo get(@RequestParam(required=false) String id) {
@@ -281,9 +287,6 @@ public class WorkStaffBasicInfoController extends BaseController {
 	/**
 	 * 修改员工总审人员信息
 	 * @param workStaffBasicInfo
-	 * @param model
-	 * @param redirectAttributes
-	 * @param request
 	 * @return
 	 * @throws Exception
 	 */
@@ -514,6 +517,86 @@ public class WorkStaffBasicInfoController extends BaseController {
 		return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/achivelist?repage";
     }
 
+
+	/**
+	 * 下载导入员工信息数据模板
+	 */
+	@RequestMapping(value = "import/template")
+	public String importTemplate(HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
+		try {
+			ThisLocalityDownloadUtil download = new ThisLocalityDownloadUtil();
+			download.download("职业资格证书表.xlsx",request,response);
+		} catch (Exception e) {
+			logger.error("职业资格证书表模板下载失败！",e);
+		}
+		return "redirect:"+Global.getAdminPath()+"/workstaff/workStaffBasicInfo/?repage";
+	}
+
+	/**
+	 * 导入职业资格证信息
+	 * @param file
+	 * @param redirectAttributes
+	 * @param request
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = "import", method=RequestMethod.POST)
+	public Object importWorkStaffBasicInfo(MultipartFile file, RedirectAttributes redirectAttributes,HttpServletRequest request) {
+		ResponseEntity<WorkStaffCertificateImport> responseEntity = new ResponseEntity<>();
+		int failureNum = 0;
+		try {
+			ImportExcel ei = new ImportExcel(file, 1, 0);
+			List<WorkStaffCertificateImport> list = ei.getDataList(WorkStaffCertificateImport.class);
+			List<WorkStaffCertificateImport> listAll = new ArrayList<>();
+			for (WorkStaffCertificateImport info : list) {
+				try {
+					if (StringUtils.isNotBlank(info.getUserName()) && null != info.getName() && null != info.getNum() && null != info.getIssuingDate()) {
+						listAll.add(info);
+					} else {
+						failureNum++;
+					}
+				} catch (Exception e) {
+					failureNum++;
+				}
+			}
+			//对数据进行新增修改处理
+			Map<String, List<String>> listMap = workStaffCertificateService.saveByImport(listAll);
+			List<String> nullUser = listMap.get("nullUser");
+			List<String> multitudeUser = listMap.get("multitudeUser");
+			List<String> updateUser = listMap.get("updateUser");
+			//计算新增和修改成功的数量（总量减去查无此人和人员数量超过1的数据量）
+			Integer successCount = listAll.size() -(nullUser.size() + multitudeUser.size());
+			//处理成员名数量超过1人的数据
+			String multitudeStr = String.join("，", multitudeUser);
+			//处理修改信息的数据
+			String updateStr = String.join("，", updateUser);
+
+			StringBuffer promptSB = new StringBuffer();
+			if(successCount>0){
+				promptSB.append("新增成功 "+ successCount + " 条数据。");
+			}
+			if(failureNum>0){
+				promptSB.append("有 "+ failureNum + " 条数据填写不正确，无法添加。");
+			}
+			if(nullUser.size()>0){
+				promptSB.append("有 "+ nullUser.size() + " 条数据查无此人，无法添加。");
+			}
+			if(multitudeUser.size()>0){
+				promptSB.append(multitudeStr + " 人员存在名称重复，无法添加。");
+			}
+			if(updateUser.size()>0){
+				promptSB.append(updateStr + " 数据已存在，已进行更新。");
+			}
+			responseEntity.setCode(0);
+			responseEntity.setMessage(promptSB.toString());
+		} catch (Exception e) {
+			responseEntity.setCode(400);
+			responseEntity.setMessage("导入执业资格证信息失败！");
+			logger.error("导入执业资格证信息失败！",e);
+		}
+		return responseEntity;
+	}
+
     @RequestMapping("idCard")
     @ResponseBody
 	public AjaxJson idCard(String idCard){

src/main/resources/mappings/modules/projectGuidang/ProjectFilingBatchProInfoDao.xml

@@ -38,7 +38,7 @@
 
 	<delete id="delete">
 		delete from project_filingbatch_proinfo
-		where filing_batch=#{proInfofilingBatch}
+		where filing_batch=#{proInfofilingBatch} and project_id=#{proId}
 	</delete>
 	<delete id="deleteById">
 		delete from project_filingbatch_proinfo

src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -667,4 +667,10 @@
 		where user_id = #{userId}
 	</update>
 
+	<select id="getByName" resultType="WorkStaffBasicInfo">
+		SELECT *
+		FROM work_staff_basic_info a
+		WHERE a.name = #{name} and a.del_flag = 0
+	</select>
+
 </mapper>

src/main/resources/mappings/modules/workstaff/WorkStaffCertificateDao.xml

@@ -170,4 +170,68 @@
 		WHERE id in (select l.son_id from work_staff_achives_log l
 		where l.staff_id=#{id} and l.module='执业资格证书' and l.type='删除')
 	</update>
+
+	<select id="getByUserId" resultType="WorkStaffCertificate" >
+		SELECT
+		<include refid="workStaffCertificateColumns"/>
+		FROM work_staff_certificate a
+		<include refid="workStaffCertificateJoins"/>
+		<where>
+			a.del_flag = 0 and a.staff_id = #{userId}
+		</where>
+	</select>
+
+	<insert id="saveImport">
+		INSERT INTO work_staff_certificate(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag,
+			staff_id,
+			name,
+			num,
+			issuing_authority,
+			issuing_date,
+			regist_date,
+			regist_num,
+			major,
+			file_name
+		) VALUES (
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag},
+			#{staffId},
+			#{name},
+			#{num},
+			#{issuingAuthority},
+			#{issuingDate},
+			#{registDate},
+			#{registNum},
+			#{major},
+			#{fileName}
+		)
+	</insert>
+	<update id="updateImport">
+		UPDATE work_staff_certificate SET
+			update_by = #{updateBy.id},
+			update_date = #{updateDate},
+			remarks = #{remarks},
+			staff_id = #{staffId},
+			name = #{name},
+			num = #{num},
+			issuing_authority = #{issuingAuthority},
+			issuing_date = #{issuingDate},
+			regist_date = #{registDate},
+			regist_num = #{registNum},
+			major = #{major},
+			file_name = #{fileName}
+		WHERE id = #{id}
+	</update>
 </mapper>

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

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

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

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

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

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

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

@@ -0,0 +1,58 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ attribute name="url" type="java.lang.String" required="true"%>
+<%-- 使用方法： 1.将本tag写在查询的form之前；2.传入controller的url --%>
+<button id="btnImport" class="nav-btn nav-btn-import" data-toggle="tooltip" data-placement="left" title="导入"><i class="fa fa-folder-open-o"></i> 导入</button>
+<div id="importBox" class="hide">
+	<form id="importForm2" action="${url}" method="post" enctype="multipart/form-data" onsubmit="loading('正在导入，请稍等...');">
+		<br/>
+		<input id="uploadFile" name="file" type="file" style="width:330px"/>导入文件不能超过5M，仅允许导入“xls”或“xlsx”格式文件！<br/>　　
+
+	</form>
+</div>
+<script type="text/javascript">
+	$(document).ready(function() {
+		$("#btnImport").click(function(){
+			top.layer.open({
+				type: 1,
+				area: [500, 300],
+				title:"导入数据",
+				content:$("#importBox").html() ,
+				btn: ['下载模板','确定', '关闭'],
+				btn1: function(index, layero){
+					window.location.href='${url}/template';
+				},
+				btn2: function(index, layero){
+					var formData = new FormData();
+					formData.append("file",top.$("#uploadFile")[0].files[0]);
+					$.ajax({
+						type: 'post',
+						url: "${url}",
+						data: formData,
+						dataType: "json",
+						cache: false,
+						processData: false,
+						contentType: false,
+					}).success(function (result) {
+						if(result.code == 0){
+							top.layer.open({
+								title: '通知'
+								,content: result.message
+							});
+						}else {
+							top.layer.msg("导入文件异常："+result.message);
+						}
+					}).error(function () {
+						top.layer.msg("导入文件失败！");
+					});
+					top.layer.close(index);
+				},
+				btn3: function(index){
+					top.layer.close(index);
+				}
+			});
+		});
+
+	});
+
+</script>

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

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

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

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

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

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

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

@@ -4,6 +4,8 @@
 <head>
     <title>通知管理</title>
     <meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 </head>
 <body>
 <style>
@@ -24,7 +26,7 @@
 </style>
 <div class="single-form">
     <div class="container view-form">
-        <form:form id="inputForm" modelAttribute="oaNotify" class="form-horizontal">
+        <form:form id="inputForm" modelAttribute="oaNotify" class="form-horizontal layui-form">
         <form:hidden path="id"/>
         <sys:message content="${message}"/>
 
@@ -33,28 +35,28 @@
             <div class="layui-item layui-col-sm6">
                 <label class="layui-form-label">公告标题：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" maxlength="30" class="form-control required layui-input"
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" maxlength="30" class="form-control required layui-input"
                            value="${oaNotify.title}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
                 <label class="layui-form-label">文号：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" maxlength="30" class="form-control required layui-input"
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" maxlength="30" class="form-control required layui-input"
                            value="${oaNotify.referenceNumber}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
                 <label class="layui-form-label">公告类型：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" maxlength="30" class="form-control required layui-input"
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" maxlength="30" class="form-control required layui-input"
                            value="${fns:getMainDictLabel(oaNotify.type, 'oa_notify_type', '')}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
                 <label class="layui-form-label">创建日期：</label>
                 <div class="layui-input-block">
-                    <input id="createDate" name="createDate" htmlEscape="false" readonly="true"
+                    <input id="createDate" name="createDate" htmlEscape="false" style="background-color: #f1f1f1" readonly="true"
                            class="laydate-icondate form-control layer-date layui-input laydate-icon"
                            value="<fmt:formatDate value="${oaNotify.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
                 </div>
@@ -62,7 +64,7 @@
             <div class="layui-item layui-col-sm6">
                 <label class="layui-form-label">开始日期：</label>
                 <div class="layui-input-block">
-                    <input id="startDate" name="startDate" htmlEscape="false" readonly="true"
+                    <input id="startDate" name="startDate" htmlEscape="false" readonly="true" style="background-color: #f1f1f1"
                            class="laydate-icondate form-control layer-date layui-input laydate-icon required"
                            value="<fmt:formatDate value="${oaNotify.startDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
                 </div>
@@ -70,7 +72,7 @@
             <div class="layui-item layui-col-sm6">
                 <label class="layui-form-label">结束日期：</label>
                 <div class="layui-input-block">
-                    <input id="endDate" name="endDate" htmlEscape="false" readonly="true"
+                    <input id="endDate" name="endDate" htmlEscape="false" readonly="true" style="background-color: #f1f1f1"
                            class="laydate-icondate form-control layer-date layui-input laydate-icon required"
                            value="<fmt:formatDate value="${oaNotify.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>"/>
                 </div>
@@ -78,14 +80,14 @@
             <div class="layui-item layui-col-sm6">
                 <label class="layui-form-label">创建人：</label>
                 <div class="layui-input-block">
-                    <form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true"
+                    <form:input id="cBName" path="createBy.name" htmlEscape="false" readonly="true" style="background-color: #f1f1f1"
                                 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="office" path="office.name" htmlEscape="false" readonly="true"
+                    <form:input id="office" path="office.name" htmlEscape="false" readonly="true" style="background-color: #f1f1f1"
                                 class="form-control  layui-input"/>
                 </div>
             </div>

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

@@ -264,8 +264,12 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<div class="layui-btn-group" style="float: right;margin-right: 20px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -288,9 +292,14 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
 				</div>
 				<table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
@@ -416,12 +425,12 @@
 			}
 			if(d.condition ==1) {
 				return [
-					'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增必填阶段\', \'${ctx}/projectAccessoryRelation/projectAccessoryRelation/form?attachmentProjectType='+attachmentProjectType +'&attachmentProjectSort='+attachmentProjectSort +'&attachmentProjectApprovalMoney='+attachmentProjectApprovalMoney+'&parentIds='+d.id+' \',\'80%\',\'60%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增附件关系</a>',
+					'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增必填阶段\', \'${ctx}/projectAccessoryRelation/projectAccessoryRelation/form?attachmentProjectType='+attachmentProjectType +'&attachmentProjectSort='+attachmentProjectSort +'&attachmentProjectApprovalMoney='+attachmentProjectApprovalMoney+'&parentIds='+d.id+' \',\'80%\',\'60%\')" style=\"color: white;background: darkseagreen\" class="layui-btn layui-btn-xs" > 新增附件关系</a>',
 				].join('');
 			} else if (d.condition ==2){
 				return [
-					'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改必填阶段\', \'${ctx}/projectAccessoryRelation/projectAccessoryRelation/form?id='+d.id+'\',\'80%\',\'60%\')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>',
-					'<a href="${ctx}/projectAccessoryRelation/projectAccessoryRelation/delete?id='+d.id+'" onclick="return confirmx(\'确认要删除该必填阶段吗？\', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>'
+					'<a href="javascript:void(0)" onclick="openDialogreAudit(\'修改必填阶段\', \'${ctx}/projectAccessoryRelation/projectAccessoryRelation/form?id='+d.id+'\',\'80%\',\'60%\')" class="layui-btn layui-btn-xs" > 编辑</a>',
+					'<a href="${ctx}/projectAccessoryRelation/projectAccessoryRelation/delete?id='+d.id+'" onclick="return confirmx(\'确认要删除该必填阶段吗？\', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>'
 				].join('');
 			}else{
 				return [

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

@@ -43,8 +43,12 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<button id="searchReset" style="margin-right: 10px;" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<button id="searchReset" style="margin-right: 10px;" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -59,7 +63,10 @@
 						<%--<shiro:hasPermission name="projectAccessory:projectAccessory:add">
 							<table:addRow url="${ctx}/projectTemplate/projectTemplate/form" title="项目"></table:addRow><!-- 增加按钮 -->
 						</shiro:hasPermission>--%>
-						<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+							<div class="layui-btn-group" style="margin-left: 15px;">
+								<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+							</div>
+<%--						<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 						<div style="clear: both;"></div>
 					</div>
 
@@ -93,21 +100,23 @@
 									${projectAccessory.indexNum}
 								</td>
 								<td class="op-td text-center">
+									<div class="layui-btn-group">
 									<div class="op-btn-box">
 										<c:if test="${projectAccessory.grade == 0}">
 											<shiro:hasPermission name="projectTemplate:projectTemplate:add">
-												<a href="javascript:void(0);" onclick="openDialog('添加附件结构', '${ctx}/projectTemplate/projectTemplate/form?parent.id=${projectAccessory.id}','80%','80%')" class="op-btn op-btn-add"><i class="fa fa-plus"></i> 添加下级结构</a>
+												<a href="javascript:void(0);" onclick="openDialog('添加附件结构', '${ctx}/projectTemplate/projectTemplate/form?parent.id=${projectAccessory.id}','80%','80%')" class="layui-btn layui-btn-sm"> 添加下级结构</a>
 											</shiro:hasPermission>
 										</c:if>
 										<c:if test="${projectAccessory.grade ==1}">
 										<shiro:hasPermission name="projectTemplate:projectTemplate:edit">
-											<a href="javascript:void(0);" onclick="openDialog('修改附件结构', '${ctx}/projectTemplate/projectTemplate/form?id=${projectAccessory.id}','80%','80%')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 修改</a>
+											<a href="javascript:void(0);" onclick="openDialog('修改附件结构', '${ctx}/projectTemplate/projectTemplate/form?id=${projectAccessory.id}','80%','80%')" class="layui-btn layui-btn-sm layui-bg-blue" > 修改</a>
 										</shiro:hasPermission>
 										<shiro:hasPermission name="projectTemplate:projectTemplate:del">
-											<a href="${ctx}/projectTemplate/projectTemplate/delete?id=${projectAccessory.id}" onclick="return confirmx('确认要删除该复附件结构及其子附件结构吗？', this.href)"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 删除</a>
+											<a href="${ctx}/projectTemplate/projectTemplate/delete?id=${projectAccessory.id}" onclick="return confirmx('确认要删除该复附件结构及其子附件结构吗？', this.href)"   class="layui-btn layui-btn-sm layui-bg-red"> 删除</a>
 										</shiro:hasPermission>
 										</c:if>
 									</div>
+									</div>
 								</td>
 							</tr>
 						</c:forEach>

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

@@ -254,9 +254,14 @@
                         </div>
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-                                <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-                                <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group" style="float: right;margin-right: 20px;">
+                                    <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                                </div>
+<%--                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--                                <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--                                <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
                             </div>
                         </div>
                         <div style="    clear:both;"></div>
@@ -288,16 +293,27 @@
         <div class="full-width fl">
             <div class="layui-form contentDetails contentShadow shadowLBR">
                 <div class="nav-btns">
-                    <shiro:hasPermission name="projectFilingBatch:projectFilingBatchInfo:add">
-                        <table:addRow url="${ctx}/projectFilingBatch/projectFilingBatchInfo/form" title="归档批次"></table:addRow><!-- 增加按钮 -->
-                    </shiro:hasPermission>
-                    <shiro:hasPermission name="project:projectRecords:export">
-                        <table:exportExcel url="${ctx}/project/projectRecords/export"></table:exportExcel><!-- 导出按钮 -->
-                    </shiro:hasPermission>
+                    <div class="layui-btn-group" style="margin-left: 15px;">
+                        <button class="layui-btn" id="btn-expand">全部展开</button>
+                        <button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+                        <shiro:hasPermission name="projectFilingBatch:projectFilingBatchInfo:add">
+                            <table:addRow url="${ctx}/projectFilingBatch/projectFilingBatchInfo/form" title="归档批次"></table:addRow><!-- 增加按钮 -->
+                        </shiro:hasPermission>
+                        <shiro:hasPermission name="project:projectRecords:export">
+                            <table:exportExcel url="${ctx}/project/projectRecords/export"></table:exportExcel><!-- 导出按钮 -->
+                        </shiro:hasPermission>
+                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                    </div>
+<%--                    <shiro:hasPermission name="projectFilingBatch:projectFilingBatchInfo:add">--%>
+<%--                        <table:addRow url="${ctx}/projectFilingBatch/projectFilingBatchInfo/form" title="归档批次"></table:addRow><!-- 增加按钮 -->--%>
+<%--                    </shiro:hasPermission>--%>
+<%--                    <shiro:hasPermission name="project:projectRecords:export">--%>
+<%--                        <table:exportExcel url="${ctx}/project/projectRecords/export"></table:exportExcel><!-- 导出按钮 -->--%>
+<%--                    </shiro:hasPermission>--%>
 
-                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-                    <button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+<%--                    <button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--                    <button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--                    <button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 
                     <div style="clear: both;"></div>
                 </div>
@@ -430,31 +446,32 @@
 
 
         function complain(d){//操作中显示的内容
-            var xml = '';
+            var xml = '<div class=\"layui-btn-group\">';
             if(d.pid=="0") {
                 if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
                 {
-                    xml+="<a href=\"#\" onclick=\"notifyDialogre('新增报告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=filingBatch','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 审批</a>";
+                    xml+="<a href=\"#\" onclick=\"notifyDialogre('新增报告审批', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=filingBatch','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审批</a>";
                 }
                 if(d.flag == 1){
                     if(d.status == 1){
-                        xml+="<a href=\"#\" onclick=\"openDialogre('修改批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                        xml+="<a href=\"#\" onclick=\"openDialogre('修改批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id +"','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                     }
                     if(d.status == 2){
-                        xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/revoke?id=" + d.id + "&filingStatus="+d.status+ "\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+                        xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/revoke?id=" + d.id + "&filingStatus="+d.status+ "\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回</a>";
                     }
                     if(d.status == 3){
                         //撤回操作
-                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
                     }
                     if(d.status == 4){
                         //驳回操作
-                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                        xml+="<a href=\"#\" onclick=\"openDialogre('调整批次信息', '${ctx}/projectFilingBatch/projectFilingBatchInfo/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"olayui-btn layui-btn-xs\" > 修改</a>";
                     }
                     if(d.status == 1 || d.status == 3 || d.status == 4){
-                        xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+                        xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
                     }
                 }
+                xml+="</div>"
                 return[xml].join('');
             }else{
                 var xml = '';

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

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

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

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

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

@@ -4,6 +4,8 @@
 <head>
     <title>项目变更管理</title>
     <meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
@@ -37,7 +39,49 @@
 
             return false;
         }
-        $(document).ready(function() {
+        $(document).ready(function() {var id;
+            var name;
+            var cname;
+            var cprice;
+            var ccname;
+            var cptype;
+            if ($("#contractIdId").val()!=null || $("#contractIdId").val()!=''){
+                id=$("#contractIdId").val();
+                name=$("#contractIdName").val();
+                cname=$("#contractName").val();
+                cprice=$("#contractPrice").val();
+                ccname=$("#contractClientName").val();
+                cptype=$("#constructionProjectType").val();
+            }
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+                //有无合同监听器
+                layui.form.on('radio(ext)', function(data){
+                    var span=data.value;
+                    if(span==0){
+                        $("#contractIdId").val(id);
+                        $("#contractIdName").val(name);
+                        $("#contractName").val(cname);
+                        $("#contractPrice").val(cprice);
+                        $("#contractClientName").val(ccname);
+                        $("#constructionProjectType").val(cptype);
+                        $("#div1").show();
+                        $("#div2").show();
+                        $("#div3").show();
+                    }else{
+                        var h=$("#d1").html();
+                        $("#contractIdId").val("");
+                        $("#contractIdName").val("");
+                        $("#contractName").val("");
+                        $("#contractPrice").val("");
+                        $("#contractClientName").val("");
+                        $("#constructionProjectType").val("");
+                        $("#div1").hide();
+                        $("#div2").hide();
+                        $("#div3").hide();
+                    }
+                });
+            });
             var radioVal ;
 
             validateForm = $("#inputForm").validate({
@@ -423,7 +467,7 @@
 <div class="single-form">
     <div class="container">
         <sys:message content="${message}"/>
-        <form:form id="inputForm" modelAttribute="projectRecordsAlter" action="${ctx}/project/projectRecordsAlter/save" method="post" class="form-horizontal">
+        <form:form id="inputForm" modelAttribute="projectRecordsAlter" action="${ctx}/project/projectRecordsAlter/save" method="post" class="form-horizontal layui-form">
             <form:hidden path="id"/>
             <form:hidden path="alterBeforeRecords.id"/>
             <form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
@@ -434,10 +478,10 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">合同情况：</label>
                         <div class="layui-input-block">
-                            <input type="radio" class="i-checks" name="ext" checked id="ext" value="0">
-                            <label for="ext">有合同</label>
-                            <input type="radio" class="i-checks" name="ext" id="ext1" value="1">
-                            <label for="ext1">无合同</label>
+                            <input type="radio" title="有合同" lay-filter="ext" name="ext" checked id="ext" value="0">
+                                <%--                            <label for="ext">有合同</label>--%>
+                            <input type="radio" title="无合同" lay-filter="ext" name="ext" id="ext1" value="1">
+                                <%--                            <label for="ext1">无合同</label>--%>
                         </div>
                     </div>
                 </div>
@@ -452,6 +496,7 @@
                                         type="" isTotal="1" id="contractId" name="workContractInfo.id"
                                         value="${projectRecordsAlter.workContractInfo.id}" title="选择合同"
                                         labelName="workContractInfo.name"
+                                        cssStyle="background-color:#fff"
                                         labelValue="${projectRecordsAlter.workContractInfo.name}"
                                         cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name"
                                         searchLabel="合同名称" searchKey="name"></sys:gridselectContract>
@@ -504,7 +549,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">
-                        <form:input path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="projectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -546,7 +591,7 @@
                     <label class="layui-form-label">项目所在地：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="area" name="area.id" value="${projectRecordsAlter.area.id}" labelName="area.name" labelValue="${projectRecordsAlter.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                                       cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -570,14 +615,14 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">建设地点：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectSite" htmlEscape="false"  class="form-control layui-input"/>
+                        <form:input path="projectSite" placeholder="请输入建设地点" htmlEscape="false"  class="form-control layui-input"/>
                     </div>
                 </div>
                 <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:treeselectt id="master" name="projectLeaders" value="${projectRecordsAlter.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecordsAlter.leaderNameStr}"
-                                         title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                        cssStyle="background-color:#fff" title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
 
@@ -638,7 +683,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">建筑面积或规模：</label>
                     <div class="layui-input-block"><%-- onchange="getFee()"--%>
-                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number"/>
+                        <form:input path="buildingScale" placeholder="请输入建筑面积或规模" htmlEscape="false"  class="form-control layui-input number"/>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">
@@ -692,37 +737,37 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input path="unitFees" placeholder="请输入单位造价" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">土建单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input path="buildingUnitFees" placeholder="请输入土建单位造价" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">安装单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input path="installUnitFees" placeholder="请输入安装单位造价" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
+                        <form:textarea path="projectDesc" placeholder="请输入工程概况" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6 with-textarea">
                     <label class="layui-form-label">特殊要求：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea path="remarks" placeholder="请输入特殊要求" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12 lw6 with-textarea">
                     <label class="layui-form-label"><font color="red">*</font>变更原因：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="alterReason" htmlEscape="false" rows="3"  maxlength="255"  class="form-control required"/>
+                        <form:textarea path="alterReason" placeholder="请输入变更原因" htmlEscape="false" rows="3"  maxlength="255"  class="form-control required"/>
                     </div>
                 </div>
             </div>

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

@@ -4,6 +4,8 @@
 <head>
 	<title>项目管理</title>
 	<meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
 	<script type="text/javascript">
@@ -28,6 +30,9 @@
 		  return false;
 		}
 		$(document).ready(function() {
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+            });
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
 					loading('正在提交，请稍等...');
@@ -332,7 +337,7 @@
 <body >
 <div class="single-form">
     <div class="container">
-		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/project/projectRecords/saveAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/project/projectRecords/saveAudit" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
             <form:hidden path="home"/>
             <form:hidden path="act.taskId"/>
@@ -349,7 +354,7 @@
                     <label class="layui-form-label"><span class="require-item">*</span>选择合同：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:gridselectContract url="${ctx}/project/projectRecords/selectcontract" type="" isTotal="1" id="contractId" name="workContractInfo.id"  value="${projectRecords.workContractInfo.id}"  title="选择合同" labelName="workContractInfo.name"
-                                                labelValue="${projectRecords.workContractInfo.name}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                                              cssStyle="background-color:#fff"  labelValue="${projectRecords.workContractInfo.name}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -383,7 +388,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">
-                        <form:input path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="projectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -425,7 +430,7 @@
                     <label class="layui-form-label">项目所在地：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                       cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -449,14 +454,14 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">建设地点：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectSite" htmlEscape="false"  class="form-control layui-input"/>
+                        <form:input path="projectSite" placeholder="请输入建设地点" htmlEscape="false"  class="form-control layui-input"/>
                     </div>
                 </div>
                 <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:treeselectt id="master" name="projectLeaders" value="${projectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${projectRecords.leaderNameStr}"
-                                         title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                        cssStyle="background-color:#fff" title="用户" url="/sys/office/treeDataAll?type=3" checked="true" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -506,7 +511,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">建筑面积或规模：</label>
                     <div class="layui-input-block"><%--onchange="getFee()"--%>
-                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number" />
+                        <form:input path="buildingScale" placeholder="请输入建筑面积或规模" htmlEscape="false"  class="form-control layui-input number" />
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">
@@ -560,31 +565,31 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="unitFees" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input path="unitFees" placeholder="请输入单位造价" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">土建单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildingUnitFees" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input path="buildingUnitFees" placeholder="请输入土建单位造价" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">安装单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="installUnitFees" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="false"/>
+                        <form:input path="installUnitFees" placeholder="请输入安装单位造价" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="false"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
+                        <form:textarea path="projectDesc" placeholder="请输入工程概况" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label ">特殊要求：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea path="remarks" placeholder="请输入特殊要求" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>

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

@@ -69,25 +69,25 @@
 				   <div class="layui-item layui-col-sm12 lw6">
 					   <label class="layui-form-label">合同编号：</label>
 					   <div class="layui-input-block">
-						   <input htmlEscape="false" id="contractNum" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractNum}"/>
+						   <input htmlEscape="false" style="background-color: #f1f1f1" id="contractNum" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractNum}"/>
 					   </div>
 				   </div>
 				   <div class="layui-item layui-col-sm6 lw6">
 					   <label class="layui-form-label">合同名称：</label>
 					   <div class="layui-input-block">
-						   <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
+						   <input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
 					   </div>
 				   </div>
 				   <div class="layui-item layui-col-sm6 lw6">
 					   <label class="layui-form-label double-line">合同金额(元)：</label>
 					   <div class="layui-input-block">
-						   <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${projectRecords.workContractInfo.contractPrice}" pattern="#,##0.00#"/>"/>
+						   <input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${projectRecords.workContractInfo.contractPrice}" pattern="#,##0.00#"/>"/>
 					   </div>
 				   </div>
 				   <div class="layui-item layui-col-sm6 lw6">
 					   <label class="layui-form-label">委托方：</label>
 					   <div class="layui-input-block">
-						   <input htmlEscape="false"  id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
+						   <input htmlEscape="false" style="background-color: #f1f1f1"  id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
 					   </div>
 				   </div>
 			   </div>
@@ -100,7 +100,7 @@
 					<div class="layui-item layui-col-sm6 lw6">
 						<label class="layui-form-label">合同类型：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>
+							<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>
 						</div>
 					</div>
 				</div>
@@ -111,14 +111,14 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">项目名称：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectName}"/>
+                        <input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.projectName}"/>
                     </div>
                 </div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目编号：</label>
 					<div class="layui-input-block">
                         <div class="input-group">
-                            <form:input path="projectId" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
+                            <form:input path="projectId"  style="background-color: #f1f1f1" htmlEscape="false"  readonly="true" class="form-control layui-input"/>
                             <span class="input-group-btn">
                                 <label class="form-status"><c:choose><c:when test="${not empty projectRecords.projectStatus}">${fns:getDictLabel(projectRecords.projectStatus, 'rural_project_audit_state', '')}</c:when><c:otherwise>新添</c:otherwise></c:choose></label>
                              </span>
@@ -128,85 +128,85 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目所在地：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.area.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所在省份：</label>
 					<div class="layui-input-block">
-						<form:input path="province" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
+						<form:input path="province" style="background-color: #f1f1f1" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所在地级市：</label>
 					<div class="layui-input-block">
-						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
+						<form:input path="city" style="background-color: #f1f1f1" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所在区县：</label>
 					<div class="layui-input-block">
-						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>
+						<form:input path="county" style="background-color: #f1f1f1" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">建设地点：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建人：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.createBy.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目负责人：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">所属部门：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="officeName" class="form-control layui-input" value="${projectRecords.officeName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作开始日期：</label>
 					<div class="layui-input-block">
-						<input class="laydate-icondate form-control layui-input layer-date " readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+						<input style="background-color: #f1f1f1" class="laydate-icondate form-control layui-input layer-date " readonly="true" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">工作结束日期：</label>
 					<div class="layui-input-block">
-						<input class="laydate-icondate form-control layui-input layer-date " readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+						<input style="background-color: #f1f1f1" class="laydate-icondate form-control layui-input layer-date " readonly="true" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">创建日期：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
+						<input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label">项目类别：</label>
 					<div class="layui-input-block">
-						<input htmlEscape="false" readonly="true" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label double-line">施工单位：</label>
 					<div class="layui-input-block">
-						<form:input path="constructionUnit" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
+						<form:input style="background-color: #f1f1f1" path="constructionUnit" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6 with-textarea">
 					<label class="layui-form-label">备注：</label>
 					<div class="layui-input-block">
-						<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.remarks}</textarea>
+						<textarea htmlEscape="false" style="background-color: #f1f1f1" rows="4" readonly="true" maxlength="1000" class="form-control" >${projectRecords.remarks}</textarea>
 					</div>
 				</div>
 			</div>
@@ -216,7 +216,7 @@
 				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label">选查要求：</label>
 					<div class="layui-input-block">
-						<form:textarea path="checkRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control"/>
+						<form:textarea placeholder="请输入选查要求" path="checkRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control"/>
 					</div>
 				</div>
 			</div>

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

@@ -220,9 +220,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 20px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -275,7 +280,10 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable1"></table>
@@ -346,10 +354,10 @@
 					}}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
                         if(d.canAdd != undefined && d.canAdd =="1")
                         {
-							xml+="<a href=\"#\" onclick=\"openDialogre('选查项目', '${ctx}/project/recordChooseCheckAll/form?id=" + d.id +"','95%', '95%','','选查,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 检查</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('选查项目', '${ctx}/project/recordChooseCheckAll/form?id=" + d.id +"','95%', '95%','','选查,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 检查</a>";
                         }
                         /*if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
@@ -365,11 +373,11 @@
                         }*/
                         if(d.candel != undefined && d.candel =="1")
                         {
-                            xml+="<a href=\"${ctx}/project/recordChooseCheckAll/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该选查项目流程吗？', this.href)\" class=\"op-btn op-btn-invalid\"><i class=\"fa fa-trash-o\"></i> 删除</a>";
+                            xml+="<a href=\"${ctx}/project/recordChooseCheckAll/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该选查项目流程吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {
-                            xml+="<a href=\"${ctx}/project/recordChooseCheckAll/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&checkStatus="+d.checkStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
+                            xml+="<a href=\"${ctx}/project/recordChooseCheckAll/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&checkStatus="+d.checkStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回</a>";
                         }
                         return xml;
 

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

@@ -312,9 +312,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -367,7 +372,10 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable1"></table>
@@ -438,14 +446,14 @@
                     }}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml="";
+                        var xml="<div class=\"layui-btn-group\">";
 
 						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
 						{
 							if(d.actType == 1){
-								xml+="<a href=\"javascript:void(0)\" onclick=\"masterCheck('提交线下归档', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=report','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 提交线下归档</a>";
+								xml+="<a href=\"javascript:void(0)\" onclick=\"masterCheck('提交线下归档', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=report','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 提交线下归档</a>";
 							}else{
-								xml+="<a href=\"#\" onclick=\"notifyDialogre('选查项目', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=report','95%', '95%')\" class=\"op-btn op-btn-edit layui-bg-green\" ><i class=\"fa fa-edit\"></i> 线下归档审批</a>";
+								xml+="<a href=\"#\" onclick=\"notifyDialogre('选查项目', '${ctx}/workprojectnotify/workProjectNotify/form?id=" + d.notifyId +"&home=report','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 线下归档审批</a>";
 							}
 						}
                         /*if(d.canAdd != undefined && d.canAdd =="1")
@@ -472,6 +480,7 @@
                         {
                             xml+="<a href=\"${ctx}/project/recordChooseCheck/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&checkStatus="+d.checkStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"op-btn op-btn-cancel\" ><i class=\"glyphicon glyphicon-share-alt\"></i> 撤回</a>";
                         }*/
+						xml+="</div>"
                         return xml;
 
                     }}

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

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

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

@@ -4,6 +4,8 @@
 <head>
 	<title>项目管理</title>
 	<meta name="decorator" content="default"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
 	<style>
@@ -41,6 +43,47 @@
             return false;
         }
         $(document).ready(function() {
+            var id;
+            var name;
+            var cname;
+            var cprice;
+            var ccname;
+            var cptype;
+            if ($("#contractIdId").val()!=null || $("#contractIdId").val()!=''){
+                id=$("#contractIdId").val();
+                name=$("#contractIdName").val();
+                cname=$("#contractName").val();
+                cprice=$("#contractPrice").val();
+                ccname=$("#contractClientName").val();
+                cptype=$("#constructionProjectType").val();
+            }
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+                //有无合同监听器
+                layui.form.on('radio(ext)', function(data){
+                    var span=data.value;
+                    if(span==0){
+                        $("#contractIdId").val(id);
+                        $("#contractIdName").val(name);
+                        $("#contractName").val(cname);
+                        $("#contractPrice").val(cprice);
+                        $("#contractClientName").val(ccname);
+                        $("#constructionProjectType").val(cptype);
+                        $("#divv").show();
+                        $("#divv3").show();
+                    }else{
+                        var h=$("#d1").html();
+                        $("#contractIdId").val("");
+                        $("#contractIdName").val("");
+                        $("#contractName").val("");
+                        $("#contractPrice").val("");
+                        $("#contractClientName").val("");
+                        $("#constructionProjectType").val("");
+                        $("#divv").hide();
+                        $("#divv3").hide();
+                    }
+                });
+            });
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -97,9 +140,11 @@
             });
 
             //自动选择合同状态
-            if ($("#projectName").val() != null) {
+            if ($("#projectName").val() != "") {
                 if ($("#contractName").val() == "") {
                     $("#ext1").iCheck("check");
+                }else{
+                    $("#ext").iCheck("check");
                 }
             }
 
@@ -538,7 +583,7 @@
 <body >
 <div class="single-form">
     <div class="container">
-		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralCostProjectRecords/adminUpdate" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectRecords" enctype="multipart/form-data" action="${ctx}/ruralProject/ruralCostProjectRecords/adminUpdate" method="post" class="form-horizontal layui-form">
 		    <form:hidden path="id"/>
             <form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
             <input type="hidden" id="flagFile" value="">
@@ -550,10 +595,10 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">合同情况：</label>
                         <div class="layui-input-block">
-                            <input type="radio" class="i-checks" name="ext" checked id="ext" value="0">
-                            <label for="ext">有合同</label>
-                            <input type="radio" class="i-checks" name="ext" id="ext1" value="1">
-                            <label for="ext1">无合同</label>
+                            <input type="radio" title="有合同" lay-filter="ext" name="ext" checked id="ext" value="0">
+                                <%--                            <label for="ext">有合同</label>--%>
+                            <input type="radio" title="无合同" lay-filter="ext" name="ext" id="ext1" value="1">
+                                <%--                            <label for="ext1">无合同</label>--%>
                         </div>
                     </div>
                 </div>
@@ -563,13 +608,13 @@
                             <label class="layui-form-label"><span class="require-item">*</span>选择合同：</label>
                             <div class="layui-input-block  with-icon">
                                 <sys:gridselectContract url="${ctx}/project/projectRecords/selectcontract" type="" isTotal="" id="contractId" name="workContractInfo.id"  value="${projectRecords.workContractInfo.id}"  title="选择合同" labelName="workContractInfo.name"
-                                                        labelValue="${projectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
+                                                      cssStyle="background-color:#fff"  labelValue="${projectRecords.workContractInfo.contractNum}" cssClass="form-control required layui-input" fieldLabels="合同名称" fieldKeys="name" searchLabel="合同名称" searchKey="name" ></sys:gridselectContract>
                             </div>
                         </div>
                         <div class="layui-item layui-col-sm6 lw7">
                             <label class="layui-form-label">合同名称：</label>
                             <div class="layui-input-block">
-                                <input  htmlEscape="false"  readonly="true" id="contractName"  class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
+                                <input  htmlEscape="false" readonly="true" id="contractName"  class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
                             </div>
                         </div>
                         <div class="layui-item layui-col-sm6 lw7">
@@ -635,7 +680,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">
-                        <form:input path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="projectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -677,7 +722,7 @@
                     <label class="layui-form-label">项目所在地：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:treeselect id="area" name="area.id" value="${projectRecords.area.id}" labelName="area.name" labelValue="${projectRecords.area.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                        cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -701,7 +746,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">建设地点：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectSite" htmlEscape="false"  class="form-control layui-input"/>
+                        <form:input path="projectSite" placeholder="请输入建设地点" htmlEscape="false"  class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -726,13 +771,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作开始日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请选择工作开始日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="startDate" name="startDate" value="<fmt:formatDate value="${ruralProjectRecords.startDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">工作结束日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请输入工作结束日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="endingDate" name="endingDate" value="<fmt:formatDate value="${ruralProjectRecords.endingDate}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -852,13 +897,13 @@
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label">工程概况：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
+                        <form:textarea placeholder="请输入工程概况" path="projectDesc" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7 with-textarea">
                     <label class="layui-form-label ">备注：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>

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

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

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

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

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

@@ -377,9 +377,14 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 10px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -450,9 +455,14 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>
-					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+					<div class="layui-btn-group" style="margin-left: 15px;">
+						<button class="layui-btn layui-btn" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-warm" id="btn-fold">全部折叠</button>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
+<%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 
                     <div style="clear: both;"></div>
 				</div>
@@ -655,17 +665,18 @@
         function complain(d){//操作中显示的内容
         	var xml = '';
 			if(d.pid=="0") {
-				var xml = '';
+				var xml = '<div class=\"layui-btn-group\">';
 				if(d.flag == 1){
 					<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:accessory">
 					if(0 == d.projectReportRecordStatus){
-						xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs\" > 上传文件</a>";
 					}
 					</shiro:hasPermission>
 					<shiro:hasPermission name="ruralProject:ruralProjectMessageAll:adminAccessory">
-						xml+="<a href=\"#\" onclick=\"openDialogView('归档管理员文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogView('归档管理员文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs\" ><i class=\"fa fa-edit\"></i> 上传文件</a>";
 					</shiro:hasPermission>
 				}
+				xml+="</div>"
 				return[xml].join('');
 			}else{
 				var xml = '';

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

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

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

@@ -6,6 +6,8 @@
     <meta name="decorator" content="default"/>
     <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
     <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
         #projectDesc-error{
@@ -48,6 +50,9 @@
             return false;
         }
         $(document).ready(function() {
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+            });
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -237,7 +242,7 @@
 <div class="single-form">
     <div class="container">
         <sys:message content="${message}"/>
-        <form:form id="inputForm" modelAttribute="subProjectInfo" action="${ctx}/subProject/subProject/save" method="post" class="form-horizontal">
+        <form:form id="inputForm" modelAttribute="subProjectInfo" action="${ctx}/subProject/subProject/save" method="post" class="form-horizontal layui-form">
             <form:hidden path="id"/>
             <form:hidden path="parentProId"/>
 
@@ -246,37 +251,37 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目定义号：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectId" htmlEscape="false"  class="form-control layui-input required" onchange="decideRepeat()"/>
+                        <form:input path="projectId" placeholder="请输入项目定义号" htmlEscape="false"  class="form-control layui-input required" onchange="decideRepeat()"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="projectName" htmlEscape="false"  class="form-control layui-input required"/>
+                        <form:input path="projectName" placeholder="请输入项目名称" htmlEscape="false"  class="form-control layui-input required"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">单体工程WBS编号：</label>
                     <div class="layui-input-block">
-                        <form:input path="wbsNum" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="wbsNum" placeholder="请输入单体工程WBS编号" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程编号：</label>
                     <div class="layui-input-block">
-                        <form:input path="programmeId" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="programmeId" placeholder="请输入工程编号" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="programmeName" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="programmeName" placeholder="请输入工程名称" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">审计项目类型：</label>
                     <div class="layui-input-block">
-                        <form:input path="auditItemsType" htmlEscape="false"  class="form-control layui-input"/>
+                        <form:input path="auditItemsType" placeholder="请输入审计项目类型" htmlEscape="false"  class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -289,31 +294,31 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">电压等级：</label>
                     <div class="layui-input-block">
-                        <form:input path="voltageLevel" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="voltageLevel" placeholder="请输入电压等级" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">现场联系人：</label>
                     <div class="layui-input-block">
-                        <form:input path="onSiteContact" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="onSiteContact" placeholder="请输入现场联系人" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">联系电话：</label>
                     <div class="layui-input-block">
-                        <form:input path="contactNumber" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="contactNumber" placeholder="请输入联系电话" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">实际开工时间：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="actualStartTime" name="actualStartTime" value="<fmt:formatDate value="${subProjectInfo.actualStartTime}" pattern="yyyy-MM-dd"/>">
+                        <input style="background-color: #fff" placeholder="请输入开工时间" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="actualStartTime" name="actualStartTime" value="<fmt:formatDate value="${subProjectInfo.actualStartTime}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">实际竣工时间：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="actualEndTime" name="actualEndTime" value="<fmt:formatDate value="${subProjectInfo.actualEndTime}" pattern="yyyy-MM-dd"/>">
+                        <input style="background-color:#fff" placeholder="请输入竣工时间" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="actualEndTime" name="actualEndTime" value="<fmt:formatDate value="${subProjectInfo.actualEndTime}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
             </div>
@@ -323,37 +328,37 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">施工单位名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="constructionUnit" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="constructionUnit" placeholder="请输入施工单位名称" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">合同编号：</label>
                     <div class="layui-input-block">
-                        <form:input path="contractId" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="contractId" placeholder="请输入合同编号" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">合同金额：</label>
                     <div class="layui-input-block">
-                        <form:input path="contractSum" htmlEscape="false" class="form-control layui-input number"/>
+                        <form:input path="contractSum" placeholder="请输入合同金额" htmlEscape="false" class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">计划开工时间：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="planStartTime" name="planStartTime" value="<fmt:formatDate value="${subProjectInfo.planStartTime}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请选择计划开工时间" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="planStartTime" name="planStartTime" value="<fmt:formatDate value="${subProjectInfo.planStartTime}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">计划竣工时间：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="planEndTime" name="planEndTime" value="<fmt:formatDate value="${subProjectInfo.planEndTime}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请输入计划竣工时间" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="planEndTime" name="planEndTime" value="<fmt:formatDate value="${subProjectInfo.planEndTime}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">结算折扣率：</label>
                     <div class="layui-input-block">
-                        <form:input path="settleDiscountRate" htmlEscape="false" class="form-control layui-input number"/>
+                        <form:input placeholder="请输入结算折扣率" path="settleDiscountRate" htmlEscape="false" class="form-control layui-input number"/>
                     </div>
                 </div>
             </div>
@@ -363,25 +368,25 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">土建结算送审金额（元）下浮后金额：</label>
                     <div class="layui-input-block">
-                        <form:input path="civilSubmitSum" htmlEscape="false" class="form-control number layui-input"/>
+                        <form:input path="civilSubmitSum" placeholder="请输入土建结算送审金额下浮后金额" htmlEscape="false" class="form-control number layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">安装结算送审金额（元）下浮后金额：</label>
                     <div class="layui-input-block">
-                        <form:input path="installSubmitSum" htmlEscape="false" class="form-control number layui-input"/>
+                        <form:input path="installSubmitSum" placeholder="请输入安装结算送审金额下浮后金额" htmlEscape="false" class="form-control number layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">施工费送审金额小计（元）下浮后金额：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildSubmitSum" htmlEscape="false" class="form-control number layui-input"/>
+                        <form:input path="buildSubmitSum" placeholder="请输入施工费送审金额小计下浮后金额" htmlEscape="false" class="form-control number layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">甲供材送审金额（元）结算书中的物资金额：</label>
                     <div class="layui-input-block">
-                        <form:input path="materialSubmitSum" htmlEscape="false" class="form-control number layui-input"/>
+                        <form:input path="materialSubmitSum" placeholder="请输入甲供材送审金额结算书中的物资金额" htmlEscape="false" class="form-control number layui-input"/>
                     </div>
                 </div>
             </div>
@@ -391,49 +396,49 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">土建结算审定金额（元）下浮后金额：</label>
                     <div class="layui-input-block">
-                        <form:input path="civilAuthorizeSum" htmlEscape="false" class="form-control number layui-input"/>
+                        <form:input path="civilAuthorizeSum" placeholder="请输入土建结算审定金额下浮后金额" htmlEscape="false" class="form-control number layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">安装结算审定金额（元）下浮后金额：</label>
                     <div class="layui-input-block">
-                        <form:input path="installAuthorizeSum" htmlEscape="false" class="form-control number layui-input"/>
+                        <form:input path="installAuthorizeSum" placeholder="请输入安装结算审定金额下浮后金额" htmlEscape="false" class="form-control number layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">施工费审定金额小计（元）下浮后金额：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildAuthorizeSum" htmlEscape="false" class="form-control number layui-input"/>
+                        <form:input path="buildAuthorizeSum" placeholder="请输入施工费审定金额小计下浮后金额" htmlEscape="false" class="form-control number layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">甲供材审定金额（元）：</label>
                     <div class="layui-input-block">
-                        <form:input path="materialAuthorizeSum" htmlEscape="false" class="form-control number layui-input"/>
+                        <form:input path="materialAuthorizeSum" placeholder="请输入甲供材审定金额" htmlEscape="false" class="form-control number layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">施工费核减金额（元）：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildDiscountSum" htmlEscape="false" class="form-control number layui-input"/>
+                        <form:input path="buildDiscountSum" placeholder="请输入施工费核减金额" htmlEscape="false" class="form-control number layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">施工费核减率（%）：</label>
                     <div class="layui-input-block">
-                        <form:input path="buildDiscountRate" htmlEscape="false" class="form-control number layui-input"/>
+                        <form:input path="buildDiscountRate" placeholder="请输入施工费核减率" htmlEscape="false" class="form-control number layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">施工单位诚信扣款（元）：</label>
                     <div class="layui-input-block">
-                        <form:input path="creditDeduction" htmlEscape="false" class="form-control number layui-input"/>
+                        <form:input path="creditDeduction" placeholder="请输入施工单位诚信扣款" htmlEscape="false" class="form-control number layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">建议结算款（元）：</label>
                     <div class="layui-input-block">
-                        <form:input path="suggestedSettlement" htmlEscape="false" class="form-control number layui-input"/>
+                        <form:input path="suggestedSettlement" placeholder="请输入建议结算款" htmlEscape="false" class="form-control number layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -453,7 +458,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">审计费(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="auditFee" htmlEscape="false" class="form-control number layui-input"/>
+                        <form:input path="auditFee" placeholder="请输入审计费" htmlEscape="false" class="form-control number layui-input"/>
                     </div>
                 </div>
             </div>
@@ -463,13 +468,13 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">审计部下发意见文号：</label>
                     <div class="layui-input-block">
-                        <form:input path="optionNum" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="optionNum" placeholder="请输入审计部下发意见文号" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">事务所审计报告号（必填）：</label>
                     <div class="layui-input-block">
-                        <form:input path="officeReportNo" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="officeReportNo" placeholder="请输入事务所审计报告号" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
             </div>
@@ -479,31 +484,31 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">事务所名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="officeName" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="officeName" placeholder="请输入事务所名称" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">事务所审计人员：</label>
                     <div class="layui-input-block">
-                        <form:input path="officeAuditor" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="officeAuditor" placeholder="请输入事务所审计人员" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">打包时间：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="packTime" name="packTime" value="<fmt:formatDate value="${subProjectInfo.packTime}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请选择打包时间" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="packTime" name="packTime" value="<fmt:formatDate value="${subProjectInfo.packTime}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">审计应结束时间：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="planAuditTime" name="planAuditTime" value="<fmt:formatDate value="${subProjectInfo.planAuditTime}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请输入审计应结束时间" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="planAuditTime" name="planAuditTime" value="<fmt:formatDate value="${subProjectInfo.planAuditTime}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">审计方式：</label>
                     <div class="layui-input-block">
-                        <form:input path="auditType" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input placeholder="请输入审计方式" path="auditType" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
             </div>
@@ -513,7 +518,7 @@
                 <div class="layui-item layui-col-sm12 lw7 with-textarea">
                     <label class="layui-form-label">备注：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+                        <form:textarea path="remarks" placeholder="请输入备注" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>
@@ -523,43 +528,43 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">审计专职：</label>
                     <div class="layui-input-block">
-                        <form:input path="auditProfessional" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input placeholder="请输入审计专职" path="auditProfessional" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">提交送审日期：</label>
                     <div class="layui-input-block">
-                        <input class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="submitApprovalTime" name="submitApprovalTime" value="<fmt:formatDate value="${subProjectInfo.submitApprovalTime}" pattern="yyyy-MM-dd"/>">
+                        <input placeholder="请输入提交送审日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="submitApprovalTime" name="submitApprovalTime" value="<fmt:formatDate value="${subProjectInfo.submitApprovalTime}" pattern="yyyy-MM-dd"/>">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">送审人：</label>
                     <div class="layui-input-block">
-                        <form:input path="submitApprovalMan" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input placeholder="请输入送审人" path="submitApprovalMan" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">送审部门：</label>
                     <div class="layui-input-block">
-                        <form:input path="submitApprovalDepartment" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input placeholder="请输入送审部门" path="submitApprovalDepartment" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">二级单位：</label>
                     <div class="layui-input-block">
-                        <form:input path="secondaryUnit" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input placeholder="请输入二级单位" path="secondaryUnit" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">一级单位：</label>
                     <div class="layui-input-block">
-                        <form:input path="firstLevelUnit" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input placeholder="请输入一级单位" path="firstLevelUnit" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">送审单ID(勿动)：</label>
                     <div class="layui-input-block">
-                        <form:input path="submissionFormId" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input placeholder="请输入送审单ID" path="submissionFormId" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
             </div>

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

@@ -121,73 +121,73 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">咨询项目名称：</label>
                     <div class="layui-input-block">
-                        <form:input path="ProjectName" htmlEscape="false" readonly="true" class="form-control layui-input" style="background-color: #ffffff;"/>
+                        <form:input path="ProjectName" htmlEscape="false" readonly="true" class="form-control layui-input" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">咨询项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <input type="text" readonly="readonly" class="form-control layui-input" value="${ruralProjectRecordsReported.leaderNameStr}" style="background-color: #ffffff;">
+                        <input type="text" readonly="readonly" class="form-control layui-input" value="${ruralProjectRecordsReported.leaderNameStr}" >
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">投资性质：</label>
                     <div class="layui-input-block">
-                        <form:input path="TouZiXZ" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                        <form:input path="TouZiXZ" htmlEscape="false" readonly="true" class="form-control required layui-input" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">咨询项目类型：</label>
                     <div class="layui-input-block">
-                        <form:input path="ProjectType" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                        <form:input path="ProjectType" htmlEscape="false" readonly="true" class="form-control required layui-input" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">合同类型：</label>
                     <div class="layui-input-block">
-                        <form:input path="HeTongLeiXing" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                        <form:input path="HeTongLeiXing" htmlEscape="false" readonly="true" class="form-control required layui-input" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">合同编号：</label>
                     <div class="layui-input-block">
-                        <input type="text" htmlEscape="false" readonly="true" value="${ruralProjectRecordsReported.ziXunHTBH}" class="form-control layui-input required" style="background-color: #ffffff;">
+                        <input type="text" htmlEscape="false" readonly="true" value="${ruralProjectRecordsReported.ziXunHTBH}" class="form-control layui-input required" >
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">委托单位：</label>
                     <div class="layui-input-block">
-                        <form:input path="WeiTuoDW" htmlEscape="false" readonly="true" class="form-control layui-input required" style="background-color: #ffffff;"/>
+                        <form:input path="WeiTuoDW" htmlEscape="false" readonly="true" class="form-control layui-input required" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">委托单位电话：</label>
                     <div class="layui-input-block">
-                        <form:input path="LianXiDH" htmlEscape="false" readonly="true"  class="form-control layui-input required" style="background-color: #ffffff;"/>
+                        <form:input path="LianXiDH" htmlEscape="false" readonly="true"  class="form-control layui-input required" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">项目报告号：</label>
                     <div class="layui-input-block">
-                        <form:input path="DangABH" htmlEscape="false" readonly="true" class="form-control layui-input required" style="background-color: #ffffff;"/>
+                        <form:input path="DangABH" htmlEscape="false" readonly="true" class="form-control layui-input required" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">出具报告日期：</label>
                     <div class="layui-input-block">
-                        <form:input path="BaoGaoShuQianFaDate" htmlEscape="false" readonly="true" class="laydate-icondate required form-control layui-input layer-date laydate-icon" style="background-color: #ffffff;"/>
+                        <form:input path="BaoGaoShuQianFaDate" htmlEscape="false" readonly="true" class="laydate-icondate required form-control layui-input layer-date laydate-icon" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">咨询营业收入（万元）：</label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunShouRu" htmlEscape="false" readonly="true" onchange="zxChange()" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                        <form:input path="ZiXunShouRu" htmlEscape="false" readonly="true" onchange="zxChange()" class="form-control required layui-input" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">造价师注册证号：</label>
                     <div class="layui-input-block">
-                        <form:input path="zaoJiaShiZhengHao" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                        <form:input path="zaoJiaShiZhengHao" htmlEscape="false" readonly="true" class="form-control required layui-input" />
                     </div>
                 </div>
             </div>
@@ -239,133 +239,133 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">工程所在省份</label>
                     <div class="layui-input-block with-icon">
-                        <input type="text" readonly="readonly" class="form-control layui-input" value="${ruralProjectRecordsReported.province}" style="background-color: #ffffff;">
+                        <input type="text" readonly="readonly" class="form-control layui-input" value="${ruralProjectRecordsReported.province}" >
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">工程所在地级市</label>
                     <div class="layui-input-block">
-                        <input type="text" readonly="readonly" class="form-control layui-input" value="${ruralProjectRecordsReported.city}" style="background-color: #ffffff;">
+                        <input type="text" readonly="readonly" class="form-control layui-input" value="${ruralProjectRecordsReported.city}" >
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">工程所在区县</label>
                     <div class="layui-input-block">
-                        <input type="text" readonly="readonly" class="form-control layui-input" value="${ruralProjectRecordsReported.county}" style="background-color: #ffffff;">
+                        <input type="text" readonly="readonly" class="form-control layui-input" value="${ruralProjectRecordsReported.county}" >
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">工程结构：</label>
                     <div class="layui-input-block">
-                        <form:input path="PorjectStruct" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                        <form:input path="PorjectStruct" htmlEscape="false" readonly="true" class="form-control required layui-input" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">地上层数：</label>
                     <div class="layui-input-block">
-                        <form:input path="FloorUp" htmlEscape="false" readonly="true" class="form-control layui-input number" style="background-color: #ffffff;"/>
+                        <form:input path="FloorUp" htmlEscape="false" readonly="true" class="form-control layui-input number" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">底下层数：</label>
                     <div class="layui-input-block">
-                        <form:input path="FloorDown" htmlEscape="false" readonly="true" class="form-control layui-input number" style="background-color: #ffffff;"/>
+                        <form:input path="FloorDown" htmlEscape="false" readonly="true" class="form-control layui-input number" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">建筑面积或规模：</label>
                     <div class="layui-input-block">
-                        <form:input path="GCGMValue" htmlEscape="false" readonly="true" class="form-control layui-input required number" style="background-color: #ffffff;"/>
+                        <form:input path="GCGMValue" htmlEscape="false" readonly="true" class="form-control layui-input required number" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">计量单位：</label>
                     <div class="layui-input-block">
-                        <form:input path="GCGMUnit" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                        <form:input path="GCGMUnit" htmlEscape="false" readonly="true" class="form-control required layui-input" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">工程用途：</label>
                     <div class="layui-input-block">
-                        <form:input path="PorjectUse" htmlEscape="false" readonly="true" class="form-control required layui-input" style="background-color: #ffffff;"/>
+                        <form:input path="PorjectUse" htmlEscape="false" readonly="true" class="form-control required layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line" title="注：指咨询项目编审后的最终造价，&#13;其中工程结算项目填审定价，标底编制填招标控制价，&#13;工程造价全过程管理填工程投资总额或审定价。"><span class="require-item">咨询标的额(万元)：</span></label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunBDE" htmlEscape="false" readonly="true" class="form-control required layui-input number" style="background-color: #ffffff;"/>
+                        <form:input path="ZiXunBDE" htmlEscape="false" readonly="true" class="form-control required layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">其中土建造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunBDETJ" htmlEscape="false" readonly="true" class="form-control layui-input" style="background-color: #ffffff;"/>
+                        <form:input path="ZiXunBDETJ" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">其中安装造价(万元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="ZiXunBDEAZ" htmlEscape="false" readonly="true" class="form-control layui-input" style="background-color: #ffffff;"/>
+                        <form:input path="ZiXunBDEAZ" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">其中土建百分比(%)：</label>
                     <div class="layui-input-block">
-                        <form:input path="CalTJPercent" htmlEscape="false" class="form-control layui-input" readonly="true" style="background-color: #ffffff;"/>
+                        <form:input path="CalTJPercent" htmlEscape="false" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">其中安装百分比(%)：</label>
                     <div class="layui-input-block">
-                        <form:input path="CalAZPercent" htmlEscape="false" class="form-control layui-input" readonly="true" style="background-color: #ffffff;"/>
+                        <form:input path="CalAZPercent" htmlEscape="false" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="CalZZJUnit" htmlEscape="false" readonly="true" class="form-control layui-input" style="background-color: #ffffff;"/>
+                        <form:input path="CalZZJUnit" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">其中土建单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="CalZZJTJUnit" htmlEscape="false" readonly="true" class="form-control layui-input" style="background-color: #ffffff;"/>
+                        <form:input path="CalZZJTJUnit" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">其中装修单位造价(元)：</label>
                     <div class="layui-input-block">
-                        <form:input path="CalZZJAZUnit" htmlEscape="false" class="form-control layui-input" readonly="true" style="background-color: #ffffff;"/>
+                        <form:input path="CalZZJAZUnit" htmlEscape="false" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">合同价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="HeTongJia" htmlEscape="false" readonly="true" class="form-control layui-input number" style="background-color: #ffffff;"/>
+                        <form:input path="HeTongJia" htmlEscape="false" readonly="true" class="form-control layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">送审价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="SongShenJia" htmlEscape="false" readonly="true" class="form-control required layui-input number" style="background-color: #ffffff;"/>
+                        <form:input path="SongShenJia" htmlEscape="false" readonly="true" class="form-control required layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">审定价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="ShenDingJia" htmlEscape="false" readonly="true" class="form-control required layui-input number" style="background-color: #ffffff;"/>
+                        <form:input path="ShenDingJia" htmlEscape="false" readonly="true" class="form-control required layui-input number"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">审核增减额(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true" style="background-color: #ffffff;"/>
+                        <form:input path="JingHeJianE" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">审核增减率(%)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true" style="background-color: #ffffff;"/>
+                        <form:input path="JingHeJianLv" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
             </div>
@@ -375,49 +375,49 @@
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">钢材用量(t)：</label>
                     <div class="layui-input-block">
-                        <form:input path="GCYL" htmlEscape="false" class="form-control layui-input number" readonly="true" style="background-color: #ffffff;"/>
+                        <form:input path="GCYL" htmlEscape="false" class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label">水泥用量(t)：</label>
                     <div class="layui-input-block">
-                        <form:input path="SNYL" htmlEscape="false" class="form-control layui-input number" readonly="true" style="background-color: #ffffff;"/>
+                        <form:input path="SNYL" htmlEscape="false" class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">预拌砼用量(m³)：</label>
                     <div class="layui-input-block">
-                        <form:input path="YBTYL" htmlEscape="false" class="form-control layui-input number" readonly="true" style="background-color: #ffffff;"/>
+                        <form:input path="YBTYL" htmlEscape="false" class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">人工工日用量(工日)：</label>
                     <div class="layui-input-block">
-                        <form:input path="RGGRYL" htmlEscape="false" class="form-control layui-input number" readonly="true" style="background-color: #ffffff;"/>
+                        <form:input path="RGGRYL" htmlEscape="false" class="form-control layui-input number" readonly="true" />
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">钢材消耗指标(kg)：</label>
                     <div class="layui-input-block">
-                        <form:input path="GCYLPerUnit" htmlEscape="false" class="form-control layui-input number" readonly="true" style="background-color: #ffffff;"/>
+                        <form:input path="GCYLPerUnit" htmlEscape="false" class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">水泥消耗指标(kg)：</label>
                     <div class="layui-input-block">
-                        <form:input path="SNYLPerUnit" htmlEscape="false" class="form-control layui-input number" readonly="true" style="background-color: #ffffff;"/>
+                        <form:input path="SNYLPerUnit" htmlEscape="false" class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">预拌砼消耗指标(m³)：</label>
                     <div class="layui-input-block">
-                        <form:input path="YBTYLPerUnit" htmlEscape="false" class="form-control layui-input number" readonly="true" style="background-color: #ffffff;"/>
+                        <form:input path="YBTYLPerUnit" htmlEscape="false" class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line">人工工日消耗指标(工日)：</label>
                     <div class="layui-input-block">
-                        <form:input path="RGGRYLPerUnit" htmlEscape="false" class="form-control layui-input number" readonly="true" style="background-color: #ffffff;"/>
+                        <form:input path="RGGRYLPerUnit" htmlEscape="false" class="form-control layui-input number" readonly="true"/>
                     </div>
                 </div>
             </div>
@@ -458,7 +458,7 @@
                 <div class="layui-item layui-col-sm12 lw6 with-textarea">
                     <label class="layui-form-label double-line">其他专业工程咨询项目造价包含内容说明：</label>
                     <div class="layui-input-block">
-                        <form:textarea path="QTProjec" htmlEscape="false" readonly="true" rows="4"  maxlength="255"  class="form-control " style="background-color: #ffffff;"/>
+                        <form:textarea path="QTProjec" htmlEscape="false" readonly="true" rows="4"  maxlength="255"  class="form-control "/>
                     </div>
                 </div>
             </div>

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

@@ -51,25 +51,25 @@
 				   <div class="layui-item layui-col-sm12 lw6">
 					   <label class="layui-form-label">合同编号：</label>
 					   <div class="layui-input-block">
-						   <input htmlEscape="false" id="contractNum" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractNum}"/>
+						   <input htmlEscape="false" style="background-color: #f1f1f1" id="contractNum" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.contractNum}"/>
 					   </div>
 				   </div>
 				   <div class="layui-item layui-col-sm6 lw6">
 					   <label class="layui-form-label">合同名称：</label>
 					   <div class="layui-input-block">
-						   <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
+						   <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.name}"/>
 					   </div>
 				   </div>
 				   <div class="layui-item layui-col-sm6 lw6">
 					   <label class="layui-form-label double-line">合同金额(元)：</label>
 					   <div class="layui-input-block">
-						   <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${projectRecords.workContractInfo.contractPrice}" pattern="#,##0.00#"/>"/>
+						   <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${projectRecords.workContractInfo.contractPrice}" pattern="#,##0.00#"/>"/>
 					   </div>
 				   </div>
 				   <div class="layui-item layui-col-sm6 lw6">
 					   <label class="layui-form-label">委托方：</label>
 					   <div class="layui-input-block">
-						   <input htmlEscape="false"  id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
+						   <input htmlEscape="false" style="background-color: #f1f1f1" id="clientName" readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.client.name}"/>
 					   </div>
 				   </div>
 			   </div>
@@ -198,7 +198,7 @@
 				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label">选查要求：</label>
 					<div class="layui-input-block">
-						<textarea htmlEscape="false" rows="4" readonly="true" class="form-control" >${projectRecords.checkRemarks}</textarea>
+						<textarea htmlEscape="false" style="background-color: #f1f1f1" rows="4" readonly="true" class="form-control" >${projectRecords.checkRemarks}</textarea>
 					</div>
 				</div>
 			</div>

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

@@ -5,8 +5,13 @@
     <title>客户合同信息</title>
     <meta name="decorator" content="default"/>
     <script src="${ctxStatic}/layer-v2.3/layui/xmSelect.js" charset="utf-8"></script>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <script>
         $(document).ready(function() {
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+            });
             contentDetailTypeShow();
         });
     </script>
@@ -44,14 +49,14 @@
     </div>
     </div>
     <form class="container" style="margin-top: 40px;">
-        <form:form id="inputForm" modelAttribute="workContractInfo"  method="post" class="form-horizontal layui-form">
+        <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="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">客户名称：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.name}"/>
+                    <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${workClientInfo.name}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
@@ -67,25 +72,25 @@
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label double-line">统一社会信用代码：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.uscCode}"/>
+                    <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${workClientInfo.uscCode}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">客户性质：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"/>
+                    <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">所在行业：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"/>
+                    <input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">客户类型：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" 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>"/>
+                    <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">
@@ -93,7 +98,7 @@
                 <div class="layui-input-block">
                     <div class="input-group">
                         <div >
-                            <div id="jobType" style="pointer-events: none;" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
+                            <div id="jobType" style="pointer-events: none;background-color: #f1f1f1" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
                         </div>
                     </div>
                 </div>
@@ -101,50 +106,50 @@
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">法人代表：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.lawerPresint}"/>
+                    <input htmlEscape="false" readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="${workClientInfo.lawerPresint}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">邮政编码：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.zipCode}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.zipCode}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">传真：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.fax}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.fax}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">公司电话：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.telephone}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.telephone}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">公司网址：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.companyUrl}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.companyUrl}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">所在地区：</label>
                 <div class="layui-input-block with-icon">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.area.name}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.area.name}"/>
                 </div>
             </div>
 
             <div class="layui-item layui-col-sm12 lw7">
                 <label class="layui-form-label">注册地址：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.registerAddress}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.registerAddress}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm12 lw7">
                 <label class="layui-form-label">详细地址：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.address}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.address}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm12 lw7">
@@ -180,7 +185,7 @@
             <div class="layui-item layui-col-sm12 with-textarea lw7">
                 <label class="layui-form-label">单位简介：</label>
                 <div class="layui-input-block">
-                    <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workClientInfo.unitIntroduction}</textarea>
+                    <textarea htmlEscape="false" style="background-color: #f1f1f1" rows="4" readonly="true" maxlength="1000" class="form-control" >${workClientInfo.unitIntroduction}</textarea>
                 </div>
             </div>
         </div>
@@ -290,44 +295,44 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label ">客户名称：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
                     </div>
                 </div>
 
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label ">合同名称：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.name}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.name}"/>
                     </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 htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy年MM月dd日"/>"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.contractDate}" 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 htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label ">合同终止日期：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label ">合同类型：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label double-line">合同金额(元)预计金额：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false" id="contractPrice" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" id="contractPrice" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
                     </div>
                     <shiro:hasPermission name="workcontractinfo:workContractInfo:contractPrice">
                         <c:if test="${fns:getUser().office.id eq workContractInfo.officeId && workContractInfo.contractState < 10}">
@@ -338,7 +343,7 @@
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label ">对方合同编号：</label>
                     <div class="layui-input-block">
-                        <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
+                        <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm12">
@@ -350,21 +355,21 @@
                 <div class="layui-item layui-col-sm12">
                     <label class="layui-form-label "></label>
                     <div class="layui-input-block">
-                        <form:input path="otherDetails" readonly="true" htmlEscape="false" class="form-control layui-input"/>
+                        <form:input path="otherDetails" style="background-color: #f1f1f1" readonly="true" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
 
                 <div class="layui-item layui-col-sm12 with-textarea">
                     <label class="layui-form-label">合同特别条款：</label>
                     <div class="layui-input-block">
-                        <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.contractSpecial}</textarea>
+                        <textarea htmlEscape="false"  style="background-color: #f1f1f1" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.contractSpecial}</textarea>
                     </div>
                 </div>
 
                 <div class="layui-item layui-col-sm12 with-textarea">
                     <label class="layui-form-label">备注：</label>
                     <div class="layui-input-block">
-                        <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.remarks}</textarea>
+                        <textarea htmlEscape="false"  style="background-color: #f1f1f1" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.remarks}</textarea>
                     </div>
                 </div>
             </div>

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

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

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

@@ -5,6 +5,8 @@
     <title>客户信息</title>
     <meta name="decorator" content="default"/>
     <script src="${ctxStatic}/layer-v2.3/layui/xmSelect.js" charset="utf-8"></script>
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
     <script>
         $(document).ready(function() {
             contentDetailTypeShow();
@@ -20,7 +22,7 @@
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">客户名称：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.name}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.name}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
@@ -36,25 +38,25 @@
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label double-line">统一社会信用代码：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.uscCode}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.uscCode}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">客户性质：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workClientInfo.companyType, 'company_type', '')}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">所在行业：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workClientInfo.companyIndustry, 'company_industry', '')}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">客户类型：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" 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>"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" 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">
@@ -62,7 +64,7 @@
                 <div class="layui-input-block">
                     <div class="input-group">
                         <div >
-                            <div id="jobType" style="pointer-events: none;" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
+                            <div id="jobType"  style="pointer-events: none; background-color: #fff" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
                         </div>
                     </div>
                 </div>
@@ -70,50 +72,50 @@
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">法人代表：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.lawerPresint}"/>
+                    <input htmlEscape="false"style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.lawerPresint}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">邮政编码：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.zipCode}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.zipCode}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">传真：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.fax}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.fax}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">公司电话：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.telephone}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.telephone}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">公司网址：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.companyUrl}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.companyUrl}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm6 lw7">
                 <label class="layui-form-label">所在地区：</label>
                 <div class="layui-input-block with-icon">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.area.name}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.area.name}"/>
                 </div>
             </div>
 
             <div class="layui-item layui-col-sm12 lw7">
                 <label class="layui-form-label">注册地址：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.registerAddress}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.registerAddress}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm12 lw7">
                 <label class="layui-form-label">详细地址：</label>
                 <div class="layui-input-block">
-                    <input htmlEscape="false" readonly="true" class="form-control layui-input" value="${workClientInfo.address}"/>
+                    <input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workClientInfo.address}"/>
                 </div>
             </div>
             <div class="layui-item layui-col-sm12 lw7">
@@ -149,7 +151,7 @@
             <div class="layui-item layui-col-sm12 with-textarea lw7">
                 <label class="layui-form-label">单位简介：</label>
                 <div class="layui-input-block">
-                    <textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workClientInfo.unitIntroduction}</textarea>
+                    <textarea htmlEscape="false" style="background-color: #f1f1f1" rows="4" readonly="true" maxlength="1000" class="form-control" >${workClientInfo.unitIntroduction}</textarea>
                 </div>
             </div>
         </div>

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

@@ -133,9 +133,14 @@
 
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group" style="float: right;margin-right: 20px;">
+									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								</div>
+<%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--								<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 							</div>
 						</div>
 						<div style="    clear:both;"></div>
@@ -210,21 +215,38 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
+
 					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
-					<shiro:hasPermission name="workclientinfo:workClientInfo:add">
+					<div class="layui-btn-group" style="margin-left: 20px;">
+						<shiro:hasPermission name="workclientinfo:workClientInfo:add">
 							<table:addRow url="${ctx}/workclientinfo/workClientInfo/form" title="客户管理"></table:addRow><!-- 增加按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="workclientinfo:workClientInfo:import">
-						<table:importExcel url="${ctx}/workclientinfo/workClientInfo/import"></table:importExcel><!-- 导入按钮 -->
-					</shiro:hasPermission>
+						</shiro:hasPermission>
+						<shiro:hasPermission name="workclientinfo:workClientInfo:import">
+							<table:importExcel url="${ctx}/workclientinfo/workClientInfo/import"></table:importExcel><!-- 导入按钮 -->
+						</shiro:hasPermission>
+
+						<shiro:hasPermission name="workclientinfo:workClientInfo:export">
+							<table:exportExcel url="${ctx}/workclientinfo/workClientInfo/export"></table:exportExcel><!-- 导出按钮 -->
+						</shiro:hasPermission>
+						<shiro:hasPermission name="workclientinfo:workClientInfo:import">
+							<table:importInfoErr url="${ctx}/workclientinfo/workClientInfo/importInfoErr" title="导入日志"></table:importInfoErr><!-- 导出按钮 -->
+						</shiro:hasPermission>
+						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+<%--					<shiro:hasPermission name="workclientinfo:workClientInfo:add">--%>
+<%--							<table:addRow url="${ctx}/workclientinfo/workClientInfo/form" title="客户管理"></table:addRow><!-- 增加按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="workclientinfo:workClientInfo:import">--%>
+<%--						<table:importExcel url="${ctx}/workclientinfo/workClientInfo/import"></table:importExcel><!-- 导入按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
 
-					<shiro:hasPermission name="workclientinfo:workClientInfo:export">
-						<table:exportExcel url="${ctx}/workclientinfo/workClientInfo/export"></table:exportExcel><!-- 导出按钮 -->
-					</shiro:hasPermission>
-					<shiro:hasPermission name="workclientinfo:workClientInfo:import">
-						<table:importInfoErr url="${ctx}/workclientinfo/workClientInfo/importInfoErr" title="导入日志"></table:importInfoErr><!-- 导出按钮 -->
-					</shiro:hasPermission>
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
+<%--					<shiro:hasPermission name="workclientinfo:workClientInfo:export">--%>
+<%--						<table:exportExcel url="${ctx}/workclientinfo/workClientInfo/export"></table:exportExcel><!-- 导出按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<shiro:hasPermission name="workclientinfo:workClientInfo:import">--%>
+<%--						<table:importInfoErr url="${ctx}/workclientinfo/workClientInfo/importInfoErr" title="导入日志"></table:importInfoErr><!-- 导出按钮 -->--%>
+<%--					</shiro:hasPermission>--%>
+<%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
 				</div>
 				<table class="oa-table layui-table" id="contentTable"></table>
@@ -265,13 +287,14 @@
                 ,{field:'createDate',align:'center', title: '创建时间', width:80}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml = "";
+                        var xml = "<div class=\"layui-btn-group\">";
 
                         if(d.canedit != undefined && d.canedit == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改客户信息', '${ctx}/workclientinfo/workClientInfo/form?id=" + d.id + "&param=1','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i>修改</a>"
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改客户信息', '${ctx}/workclientinfo/workClientInfo/form?id=" + d.id + "&param=1','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 修改</a>"
 
                         if(d.candelete != undefined && d.candelete == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"deleteFun('${ctx}/workclientinfo/workClientInfo/delete?id=" + d.id + "')\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"deleteFun('${ctx}/workclientinfo/workClientInfo/delete?id=" + d.id + "')\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
+                       	xml+="</div>"
                         return xml;
                     }}
             ]]

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

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

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

@@ -125,38 +125,38 @@
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label ">客户名称：</label>
 							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.client.name}"/>
 							</div>
 						</div>
 
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label ">合同名称：</label>
 							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.name}"/>
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.name}"/>
 							</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 htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.contractDate}" pattern="yyyy年MM月dd日"/>"/>
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.contractDate}" 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 htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.effectiveDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label ">合同终止日期：</label>
 							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${workContractInfo.closingDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label ">合同类型：</label>
 							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -173,19 +173,19 @@
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label ">对方合同编号：</label>
 							<div class="layui-input-block">
-								<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
+								<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm12">
 							<label class="layui-form-label">收费标准</label>
 							<div class="layui-input-block">
-								<form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
+								<form:checkboxes  path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm12">
 							<label class="layui-form-label "></label>
 							<div class="layui-input-block">
-								<form:input path="otherDetails" readonly="true" htmlEscape="false" class="form-control layui-input"/>
+								<form:input style="background-color: #f1f1f1" path="otherDetails" readonly="true" htmlEscape="false" class="form-control layui-input"/>
 							</div>
 						</div>
 
@@ -201,14 +201,14 @@
 						<div class="layui-item layui-col-sm12 with-textarea">
 							<label class="layui-form-label">合同特别条款：</label>
 							<div class="layui-input-block">
-								<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.contractSpecial}</textarea>
+								<textarea style="background-color: #f1f1f1" htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.contractSpecial}</textarea>
 							</div>
 						</div>
 
 						<div class="layui-item layui-col-sm12 with-textarea">
 							<label class="layui-form-label">备注：</label>
 							<div class="layui-input-block">
-								<textarea htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.remarks}</textarea>
+								<textarea style="background-color: #f1f1f1" htmlEscape="false" rows="4" readonly="true" maxlength="1000" class="form-control" >${workContractInfo.remarks}</textarea>
 							</div>
 						</div>
 						<%--<c:if test="${not empty workContractInfo.alterInfo.reason}">

src/main/webapp/webpage/modules/workcontractrecord/workContractView.jsp

@@ -84,13 +84,13 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">客户名称：</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
+						<input  htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block with-icon">
-						<input htmlEscape="false"   readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.name}"/>
+						<input htmlEscape="false"   style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.name}"/>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6">
@@ -107,7 +107,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同编号：</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.contractNum}"/>
+						<input  htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.contractNum}"/>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6">
@@ -119,31 +119,31 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档人：</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.createBy.name}"/>
+						<input  htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control  layui-input" value="${workContractRecord.createBy.name}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">归档日期：</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${workContractRecord.createDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
+						<input  htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control  layui-input" value="<fmt:formatDate value="${workContractRecord.createDate}" pattern="yyyy年MM月dd日" type="date" dateStyle="full"/>"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">案卷号：</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.fileNum}"/>
+						<input  htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control  layui-input" value="${workContractRecord.fileNum}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">确认案卷号：</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.fileNumTow}"/>
+						<input  htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control  layui-input" value="${workContractRecord.fileNumTow}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
-						<textarea  htmlEscape="false" rows="4" readonly="true"    class="form-control ">${workContractRecord.instruction}</textarea>
+						<textarea  htmlEscape="false"  style="background-color: #f1f1f1" rows="4" readonly="true"    class="form-control ">${workContractRecord.instruction}</textarea>
 					</div>
 				</div>
 			</div>

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

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

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

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

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

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

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAllList.jsp

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

src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

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

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

@@ -112,9 +112,14 @@
                     </div>
                     <div class="layui-item athird fr">
                         <div class="input-group">
-                            <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-                            <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-                            <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+                            <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
+                            <div class="layui-btn-group" style="float: right;margin-right: 20px;">
+                                <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
+                                <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                            </div>
+<%--                            <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
+<%--                            <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--                            <button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
                         </div>
                     </div>
                     <div style="    clear:both;"></div>
@@ -178,6 +183,7 @@
                     <shiro:hasPermission name="workstaff:workStaffBasicInfo:add">
                         <table:addRow url="${ctx}/workstaff/workStaffBasicInfo/form" title="员工信息"></table:addRow><!-- 增加按钮 -->
                     </shiro:hasPermission>
+                    <table:importExcelBasic url="${ctx}/workstaff/workStaffBasicInfo/import"></table:importExcelBasic><!-- 导入按钮 -->
                     <button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
                     <div style="clear: both;"></div>
                 </div>
@@ -245,13 +251,14 @@
                 ,{field:'entryDate', align:'center',sort:true,title: '入职日期',width:100}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
                         ////对操作进行初始化
-                        var xml = "";
+                        var xml = "<div class=\"layui-btn-group\">";
 
                         if(d.canedit != undefined && d.canedit == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改', '${ctx}/workstaff/workStaffBasicInfo/form?id="+ d.id + "','95%','95%')\" class=\"op-btn op-btn-edit\" ><i class=\"fa fa-edit\"></i> 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改', '${ctx}/workstaff/workStaffBasicInfo/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 修改</a>";
 
                         if(d.candelete != undefined && d.candelete == "1")
-                            xml +="<a href=\"${ctx}/workstaff/workStaffBasicInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除信息吗？', this.href)\"   class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+                            xml +="<a href=\"${ctx}/workstaff/workStaffBasicInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除信息吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
+                        xml+="</div>"
                         return xml;
                     }}
             ]]

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

@@ -43,6 +43,7 @@
             $("#age").val(age);
         }
     </script>
+
 </head>
 <body>
     <div class="single-form">
@@ -56,20 +57,20 @@
                         <div class="layui-item layui-col-sm12">
                             <label class="layui-form-label"><span class="require-item">*</span>工    号：</label>
                             <div class="layui-input-block">
-                                <form:input path="no" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+                                <form:input  style="background-color: #f1f1f1" path="no" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
                             </div>
                         </div>
                         <div class="layui-item layui-col-sm12">
                             <label class="layui-form-label"><span class="require-item">*</span>性    别：</label>
                             <div class="layui-input-block">
-                                <input value="${fns:getDictLabel(workStaffBasicInfo.gender,'sex','')}" type="text" readonly="true" class="form-control  layui-input" />
+                                <input  style="background-color: #f1f1f1" value="${fns:getDictLabel(workStaffBasicInfo.gender,'sex','')}" type="text" readonly="true" class="form-control  layui-input" />
                                 <input name="gender" value="${workStaffBasicInfo.gender}" type="hidden" readonly="true" class="form-control  layui-input" />
                             </div>
                         </div>
                         <div class="layui-item layui-col-sm12">
                             <label class="layui-form-label">身份证号码：</label>
                             <div class="layui-input-block">
-                                <form:input path="idCard" htmlEscape="false" onchange="caculateAge(this.value);" readonly="true" class="form-control idCard layui-input"/>
+                                <form:input  style="background-color: #f1f1f1" path="idCard" htmlEscape="false" onchange="caculateAge(this.value);" readonly="true" class="form-control idCard layui-input"/>
                             </div>
                         </div>
                     </div>
@@ -78,20 +79,20 @@
                             <div class="layui-item layui-col-sm12">
                                 <label class="layui-form-label"><span class="require-item">*</span>姓    名：</label>
                                 <div class="layui-input-block">
-                                    <form:input path="name" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
+                                    <form:input  style="background-color: #f1f1f1" path="name" htmlEscape="false" readonly="true" class="form-control layui-input required"/>
                                 </div>
                             </div>
                             <div class="layui-item layui-col-sm12">
                                 <label class="layui-form-label"><span class="require-item">*</span>民    族：</label>
                                 <div class="layui-input-block">
-                                    <input value="${fns:getDictLabel(workStaffBasicInfo.nation,'nation_type','')}" type="text" readonly="true" class="form-control  layui-input" />
+                                    <input  style="background-color: #f1f1f1" value="${fns:getDictLabel(workStaffBasicInfo.nation,'nation_type','')}" type="text" readonly="true" class="form-control  layui-input" />
                                     <input name="nation" value="${workStaffBasicInfo.nation}" type="hidden" readonly="true" class="form-control  layui-input" />
                                 </div>
                             </div>
                             <div class="layui-item layui-col-sm12">
                                 <label class="layui-form-label">年    龄：</label>
                                 <div class="layui-input-block">
-                                    <form:input path="age" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+                                    <form:input  style="background-color: #f1f1f1" path="age" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
                                 </div>
                             </div>
                         </div>
@@ -117,7 +118,7 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">出生日期：</label>
                         <div class="layui-input-block">
-                            <input name="birthday" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
+                            <input name="birthday"  style="background-color: #f1f1f1" value="<fmt:formatDate value="${workStaffBasicInfo.birthday}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <%--<div class="layui-item layui-col-sm6 lw7">
@@ -130,141 +131,141 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">电子邮箱：</label>
                         <div class="layui-input-block">
-                            <form:input path="email" htmlEscape="false" readonly="true" class="form-control layui-input email"/>
+                            <form:input  style="background-color: #f1f1f1" path="email" htmlEscape="false" readonly="true" class="form-control layui-input email"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">移动电话：</label>
                         <div class="layui-input-block">
-                            <form:input path="mobile" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+                            <form:input  style="background-color: #f1f1f1" path="mobile" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">座机：</label>
                         <div class="layui-input-block">
-                            <form:input path="phone" readonly="true" htmlEscape="false"  class="form-control  layui-input"/>
+                            <form:input  style="background-color: #f1f1f1" path="phone" readonly="true" htmlEscape="false"  class="form-control  layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
                         <div class="layui-input-block">
-                            <input name="status" value="${workStaffBasicInfo.status}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input  style="background-color: #f1f1f1" name="status" value="${workStaffBasicInfo.status}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">银行卡号：</label>
                         <div class="layui-input-block">
-                            <form:input path="bankCard" htmlEscape="false" readonly="true" class="form-control layui-input digits"/>
+                            <form:input  style="background-color: #f1f1f1" path="bankCard" htmlEscape="false" readonly="true" class="form-control layui-input digits"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>婚姻状况：</label>
                         <div class="layui-input-block">
-                            <input name="marriage" value="${workStaffBasicInfo.marriage}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input style="background-color: #f1f1f1" name="marriage" value="${workStaffBasicInfo.marriage}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>政治面貌：</label>
                         <div class="layui-input-block">
-                            <input name="politics" value="${workStaffBasicInfo.politics}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input style="background-color: #f1f1f1" name="politics" value="${workStaffBasicInfo.politics}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">籍    贯：</label>
                         <div class="layui-input-block">
-                            <input name="nativePlace.name" value="${workStaffBasicInfo.nativePlace.name}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input style="background-color: #f1f1f1" name="nativePlace.name" value="${workStaffBasicInfo.nativePlace.name}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">户口所在地：</label>
                         <div class="layui-input-block">
-                            <form:input path="household" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+                            <form:input style="background-color: #f1f1f1" path="household" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">常住地址：</label>
                         <div class="layui-input-block">
-                            <form:input path="address" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+                            <form:input  style="background-color: #f1f1f1" path="address" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">社保账号：</label>
                         <div class="layui-input-block">
-                            <form:input path="socialSecurityId" htmlEscape="false" readonly="true" class="form-control layui-input number" maxlength="12"/>
+                            <form:input style="background-color: #f1f1f1" path="socialSecurityId" htmlEscape="false" readonly="true" class="form-control layui-input number" maxlength="12"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">医保账号：</label>
                         <div class="layui-input-block">
-                            <form:input path="medicalInsuranceId" htmlEscape="false" readonly="true" class="form-control layui-input number" maxlength="12"/>
+                            <form:input style="background-color: #f1f1f1" path="medicalInsuranceId" htmlEscape="false" readonly="true" class="form-control layui-input number" maxlength="12"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">公积金账号：</label>
                         <div class="layui-input-block">
-                            <form:input path="accumulationFundId" htmlEscape="false" readonly="true" class="form-control layui-input number" maxlength="12"/>
+                            <form:input style="background-color: #f1f1f1" path="accumulationFundId" htmlEscape="false" readonly="true" class="form-control layui-input number" maxlength="12"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">微信号：</label>
                         <div class="layui-input-block">
-                            <form:input path="wechatId" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+                            <form:input style="background-color: #f1f1f1" path="wechatId" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">QQ号：</label>
                         <div class="layui-input-block">
-                            <form:input path="qqId" htmlEscape="false" readonly="true" class="form-control layui-input number" minlength="5" maxlength="10"/>
+                            <form:input style="background-color: #f1f1f1" path="qqId" htmlEscape="false" readonly="true" class="form-control layui-input number" minlength="5" maxlength="10"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">入职日期：</label>
                         <div class="layui-input-block">
-                            <input name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
+                            <input style="background-color: #f1f1f1" name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">试用岗位：</label>
                         <div class="layui-input-block">
-                            <form:input path="tryOutJob" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+                            <form:input style="background-color: #f1f1f1" path="tryOutJob" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line">试用期(月)：</label>
                         <div class="layui-input-block">
-                            <form:input path="trialPeriod" htmlEscape="false" readonly="true" class="form-control layui-input number" maxlength="2"/>
+                            <form:input style="background-color: #f1f1f1" path="trialPeriod" htmlEscape="false" readonly="true" class="form-control layui-input number" maxlength="2"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label double-line">试用期结束日期：</label>
                         <div class="layui-input-block">
                             <input id="tryEndTime"  type="text" maxlength="20" readonly class="form-control layui-input"
-                                   value="<fmt:formatDate value="${workStaffBasicInfo.tryEndTime}" pattern="yyyy-MM-dd"/>"/>
+                                   style="background-color: #f1f1f1" value="<fmt:formatDate value="${workStaffBasicInfo.tryEndTime}" pattern="yyyy-MM-dd"/>"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
                         <div class="layui-input-block">
-                            <input name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input style="background-color: #f1f1f1" name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
                             <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label"><span class="require-item">*</span>岗   位：</label>
                         <div class="layui-input-block ">
-                            <input id="roleName" value="${workStaffBasicInfo.roleName}" type="text" readonly class="form-control layui-input" />
+                            <input style="background-color: #f1f1f1" id="roleName" value="${workStaffBasicInfo.roleName}" type="text" readonly class="form-control layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm12 with-textarea">
                         <label class="layui-form-label">备注：</label>
                         <div class="layui-input-block">
-                            <form:textarea path="remarks" htmlEscape="false" readonly="true" rows="4" maxlength="500" class="form-control "/>
+                            <form:textarea style="background-color: #f1f1f1" path="remarks" htmlEscape="false" readonly="true" rows="4" maxlength="500" class="form-control "/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm12 with-textarea">
                         <label class="layui-form-label">个人简介：</label>
                         <div class="layui-input-block">
-                            <form:textarea path="individualResume" htmlEscape="false" readonly="true" rows="4" maxlength="500" class="form-control "/>
+                            <form:textarea style="background-color: #f1f1f1" path="individualResume" htmlEscape="false" readonly="true" rows="4" maxlength="500" class="form-control "/>
                         </div>
                     </div>