共性问题：按钮颜色修改/树形控件查询

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

@@ -508,6 +508,7 @@ public class RuralCostProjectRecordsController extends BaseController {
 		if(workContractInfo==null){
 		    return workContractInfo;
         }
+		workContractInfo.setContractType(DictUtils.getMainDictLabel(String.valueOf(workContractInfo.getContractTypeDoc()),"contract_info_type",""));
 		workContractInfo.setConstructionProjectTypeStr(DictUtils.getDictLabel(String.valueOf(workContractInfo.getConstructionProjectType()),"construction_project_type",""));
 		if(workContractInfo.getWorkClientInfoList()!=null&&!workContractInfo.getWorkClientInfoList().isEmpty()){
             StringBuilder workClinetInfoIds = new StringBuilder();

src/main/java/com/jeeplus/modules/sys/dao/AreaDao.java

@@ -26,4 +26,5 @@ public interface AreaDao extends TreeDao<Area> {
 
 	List<Area> getChildren(String parentId);
 
+    Area findAraeByid(String id);
 }

src/main/java/com/jeeplus/modules/sys/entity/Area.java

@@ -29,6 +29,11 @@ public class Area extends TreeEntity<Area> {
 		super();
 		this.sort = 30;
 	}
+	public Area(String typeStr,String pid){
+		super();
+		this.typeStr = typeStr;
+		this.pid = pid;
+	}
 
 	public Area(String id){
 		super(id);

src/main/java/com/jeeplus/modules/sys/service/AreaService.java

@@ -31,6 +31,14 @@ public class AreaService extends TreeService<AreaDao, Area> {
 	public List<Area> findAll(){
 		return UserUtils.getAreaList();
 	}
+	//根据地区名查找
+	public List<Area> findByArae(String areaName){
+		return UserUtils.getAreaListByname(areaName);
+	}
+	//根据id查地区
+	public Area findArae(String pid){
+		return UserUtils.findAraeByid(pid);
+	}
 
 	@Transactional(readOnly = false)
 	public void save(Area area) {

src/main/java/com/jeeplus/modules/sys/service/SystemService.java

@@ -285,7 +285,7 @@ public class SystemService extends BaseService implements InitializingBean {
     /**
      * 通过部门ID获取用户列表，仅返回用户id和name（树查询用户时用）
      *
-     * @return
+     * @retur
      */
     public List<User> findUserByOfficeIdAndName(String officeId,String selectName) {
 
@@ -300,7 +300,23 @@ public class SystemService extends BaseService implements InitializingBean {
                 UserUtils.USER_CACHE_LIST_BY_OFFICE_ID_ + officeId, list);
         return list;
     }
+    /**
+     * 通过用户name获取用户列表，仅返回用户id和name（树查询用户时用）
+     *
+     * @return
+     */
+    public List<User> findUserByName(String selectName) {
 
+        User user = new User();
+        user.setName(selectName);
+        if(!UserUtils.getSelectCompany().getId().equals("1")) {
+            user.setCompany(UserUtils.getSelectCompany());
+        }
+        List<User> list = userDao.findUserByOfficeIdAndName(user);
+        CacheUtils.put(UserUtils.USER_CACHE,
+                UserUtils.USER_CACHE_LIST_BY_OFFICE_ID_ +  list);
+        return list;
+    }
     /**
      * 通过部门ID获取用户列表，仅返回用户id和name（树查询用户时用  上报使用）
      *

src/main/java/com/jeeplus/modules/sys/utils/UserUtils.java

@@ -109,6 +109,16 @@ public class UserUtils {
 		return user;
 	}
 
+	/**
+	 * 根据ID获取区域
+	 * @param id
+	 * @return
+	 */
+	public static Area findAraeByid(String id){
+		Area area=areaDao.findAraeByid(id);
+		return area;
+	}
+
 	public static User getNoSession(String id){
 		User user = userDao.get(id);
 		if (user == null){
@@ -796,6 +806,22 @@ public class UserUtils {
 		}
 		return areaList;
 	}
+	/**
+	 * 获取当前用户授权的区域
+	 * @return
+	 */
+	public static List<Area> getAreaListByname(String areaName){
+		@SuppressWarnings("unchecked")
+		//List<Area> areaList = (List<Area>)getCache(CACHE_AREA_LIST);
+				List<Area> areaList = null;
+		if (areaList == null){
+			Area area=new Area();
+			area.setTypeStr(areaName);
+			areaList = areaDao.findAllList(area);
+			putCache(CACHE_AREA_LIST, areaList);
+		}
+		return areaList;
+	}
 
 	/**
 	 * 获取当前用户有权限访问的部门

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

@@ -3,14 +3,14 @@
  */
 package com.jeeplus.modules.sys.web;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.jeeplus.modules.sys.entity.Menu;
+import com.jeeplus.modules.sys.entity.User;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -146,19 +146,39 @@ public class AreaController extends BaseController {
 	@RequiresPermissions("user")
 	@ResponseBody
 	@RequestMapping(value = "treeData")
-	public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId, HttpServletResponse response) {
-		List<Map<String, Object>> mapList = Lists.newArrayList();
-		List<Area> list = areaService.findAll();
+	public List<Map<String, Object>> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String selectName, HttpServletResponse response) {
+//		List<Map<String, Object>> mapList = Lists.newArrayList();
+		List<Area> list = areaService.findByArae(selectName);
+		HashSet<Map<String,Object>> prantsSet = new HashSet();
 		for (int i=0; i<list.size(); i++){
 			Area e = list.get(i);
 			if (StringUtils.isBlank(extId) || (extId!=null && !extId.equals(e.getId()) && e.getParentIds().indexOf(","+extId+",")==-1)){
 				Map<String, Object> map = Maps.newHashMap();
+				if (null != selectName){
+					//根据查询结果查询他的父级区域
+					String[] pids=e.getParentIds().split(",");
+					for (int j=0;j<pids.length;j++){
+						Map<String, Object> prantsmap = Maps.newHashMap();
+						Area areas = areaService.findArae(pids[j]);
+						if (null!= areas){
+							prantsmap.put("id", areas.getId());
+							prantsmap.put("pId", areas.getParentId());
+							prantsmap.put("pIds", areas.getParentIds());
+							prantsmap.put("name", areas.getName());
+							prantsmap.put("selectName", selectName);
+							prantsSet.add(prantsmap);
+						}
+					}
+				}
 				map.put("id", e.getId());
 				map.put("pId", e.getParentId());
+				map.put("pIds", e.getParentIds());
 				map.put("name", e.getName());
-				mapList.add(map);
+				map.put("selectName", selectName);
+				prantsSet.add(map);
 			}
 		}
+		List<Map<String,Object>> mapList = Lists.newArrayList(prantsSet);
 		return mapList;
 	}
 
@@ -186,4 +206,21 @@ public class AreaController extends BaseController {
 		map.put("county",area.getName());
 		return map;
 	}
+	@ResponseBody
+	@RequestMapping(value = "treeDataReimbur")
+	public List<Map<String, Object>> treeDataReimbur(@RequestParam(required=false) String projectId,@RequestParam(required=false) String selectName, HttpServletResponse response) {
+		List<Map<String, Object>> mapList = Lists.newArrayList();
+		if(StringUtils.isBlank(projectId)){
+			List<Area> list = areaService.findAll();
+			for (int i=0; i<list.size(); i++){
+				Area e = list.get(i);
+				Map<String, Object> map = Maps.newHashMap();
+				map.put("id", e.getId());
+				map.put("pId", e.getParentId());
+				map.put("name", e.getName());
+				mapList.add(map);
+			}
+		}
+		return mapList;
+	}
 }

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

@@ -5,10 +5,7 @@ package com.jeeplus.modules.sys.web;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -443,13 +440,21 @@ public class OfficeController extends BaseController {
     @RequiresPermissions("user")
     @ResponseBody
     @RequestMapping(value = "treeData")
-    public List<Map<String, Object>> treeData(@RequestParam(required = false) String extId, @RequestParam(required = false) String type,
+    public List<Map<String, Object>> treeData(@RequestParam(required = false) String extId, @RequestParam(required = false) String type, @RequestParam(required = false) String selectName,
                                               @RequestParam(required = false) Long grade, @RequestParam(required = false) Boolean isAll,@RequestParam(required = false) Integer flagOffice, HttpServletResponse response) {
         List<Map<String, Object>> mapList = Lists.newArrayList();
         List<Office> list = Lists.newArrayList();
         //判断参数（新增公告时使用，1为办公室新增，能够查询所有部门信息）
         if(null == flagOffice || 1 != flagOffice){
-            list = officeService.findList(isAll);
+
+            Office office = new Office();
+            office.setParentIds(UserUtils.getSelectCompany().getId());
+            if (null != selectName && "" !=selectName){
+                //存放部门搜索添加
+                office.setOldName(selectName);
+            }
+            list = officeService.findByParentIdsLike(office);
+//            list = officeService.findList(isAll);
         }else{
             list = officeService.findListByOaNotify();
         }
@@ -491,6 +496,10 @@ public class OfficeController extends BaseController {
         List<Map<String, Object>> mapList = Lists.newArrayList();
         Office office = new Office();
         office.setParentIds(UserUtils.getSelectCompany().getId());
+        if ("2".equals(type)){
+            //存放部门搜索添加
+            office.setOldName(selectName);
+        }
         List<Office> list = officeService.findByParentIdsLike(office);
         for (int i = 0; i < list.size(); i++) {
             Office e = list.get(i);
@@ -510,6 +519,38 @@ public class OfficeController extends BaseController {
                 mapList.add(map);
             }
         }
+        if(!"2".equals(type)){
+            List<User> userList= new ArrayList<>();
+            HashSet<Map<String, Object>> mapSet = new HashSet<>();
+            if (null != selectName && "" != selectName){
+                userList = systemService.findUserByName(selectName);
+                if (0 != userList.size()){
+                    Iterator it = mapList.iterator();
+                    while (it.hasNext()){
+                        Map<String, Object> str = (Map)it.next();
+                        for (User user:userList){
+                            String id=str.get("id").toString();
+                            String idd=user.getOffice().getId();
+                            if(id.equals(idd)){
+                                Map<String, Object> map = Maps.newHashMap();
+                                map.put("id", str.get("id"));
+                                map.put("pId",  str.get("pId"));
+                                map.put("pIds", str.get("pIds"));
+                                map.put("name",  str.get("name"));
+                                map.put("selectName", selectName);
+                                if (type != null && "3".equals(type)) {
+                                    map.put("isParent", true);
+                                }
+                                mapSet.add(map);
+                            }
+                        }
+                    }
+                    List<Map<String,Object>> mapList1=new ArrayList<>(mapSet);
+                    return mapList1;
+                }
+        }
+
+        }
         return mapList;
     }
 

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

@@ -36,6 +36,22 @@ public class TagController extends BaseController {
 		model.addAttribute("flagOffice", request.getParameter("flagOffice"));	// 过滤栏目模型（仅针对CMS的Category树）
 		return "modules/sys/tagTreeselect";
 	}
+	/**
+	 * 树结构选择标签（treeselect.tag）
+	 */
+	@RequiresPermissions("user")
+	@RequestMapping(value = "treeselectArae")
+	public String treeselectArae(HttpServletRequest request, Model model) {
+		model.addAttribute("url", request.getParameter("url")); 	// 树结构数据URL
+		model.addAttribute("extId", request.getParameter("extId")); // 排除的编号ID
+		model.addAttribute("checked", request.getParameter("checked")); // 是否可复选
+		model.addAttribute("selectIds", request.getParameter("selectIds")); // 指定默认选中的ID
+		model.addAttribute("isAll", request.getParameter("isAll")); 	// 是否读取全部数据，不进行权限过滤
+		model.addAttribute("module", request.getParameter("module"));	// 过滤栏目模型（仅针对CMS的Category树）
+		model.addAttribute("branchOffice", request.getParameter("branchOffice"));	// 过滤栏目模型（仅针对CMS的Category树）
+		model.addAttribute("flagOffice", request.getParameter("flagOffice"));	// 过滤栏目模型（仅针对CMS的Category树）
+		return "modules/sys/tagTreeselectArae";
+	}
 
 	/**
 	 * 树结构选择标签（treeselect.tag）

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementTypeController.java

@@ -151,9 +151,13 @@ public class WorkReimbursementTypeController extends BaseController {
     @RequiresPermissions("user")
     @ResponseBody
     @RequestMapping(value = "treeData")
-    public List<Map<String, Object>> treeData(@RequestParam(required = false) String extId) {
+    public List<Map<String, Object>> treeData(@RequestParam(required = false) String extId,@RequestParam(required = false) String selectName) {
         List<Map<String, Object>> mapList = Lists.newArrayList();
-        List<WorkReimbursementTypeInfo> list = workReimbursementTypeService.findTreeList(new WorkReimbursementTypeInfo());
+        WorkReimbursementTypeInfo workReimbursementTypeInfo =new WorkReimbursementTypeInfo();
+        if (null != selectName && "" != selectName){
+            workReimbursementTypeInfo.setStandardDetail(selectName);
+        }
+        List<WorkReimbursementTypeInfo> list = workReimbursementTypeService.findTreeList(workReimbursementTypeInfo);
         for (int i = 0; i < list.size(); i++) {
             WorkReimbursementTypeInfo e = list.get(i);
             if ((StringUtils.isBlank(extId) || (extId != null && !extId.equals(e.getId()) && e.getParentIds().indexOf("," + extId + ",") == -1)) ) {

src/main/resources/mappings/modules/sys/AreaDao.xml

@@ -87,6 +87,9 @@
 		FROM sys_area a
 		<include refid="areaJoins"/>
 		WHERE a.del_flag = #{DEL_FLAG_NORMAL}
+		<if test="typeStr != null and typeStr != ''">
+			and a.name like concat('%',#{typeStr},'%')
+		</if>
 		ORDER BY a.sort=29 desc, a.code
 	</select>
 
@@ -193,4 +196,13 @@
 	<select id="findByName" parameterType="java.lang.String" resultType="Area">
 		select * from sys_area where name = #{name} and type='3' order by sort LIMIT 1
 	</select>
+	<select id="findAraeByid" resultType="com.jeeplus.modules.sys.entity.Area">
+		SELECT
+		<include refid="areaColumns"/>
+		FROM sys_area a
+		<include refid="areaJoins"/>
+		<where>
+			a.id= #{id}
+		</where>
+	</select>
 </mapper>

src/main/resources/mappings/modules/sys/OfficeDao.xml

@@ -357,6 +357,9 @@
 		WHERE a.del_flag = #{DEL_FLAG_NORMAL} AND a.useable = '1' AND (a.parent_ids LIKE
 		<if test="dbName == 'mysql'">concat('%,',#{parentIds},',%')</if>
 		 OR a.id = #{id})
+		<if test="oldName != null and oldName != ''">
+			and a.name like concat('%',#{oldName},'%')
+		</if>
 		ORDER BY a.code
 	</select>
 	<select id="findByParentIdsByProjectId" resultType="Office">

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -445,7 +445,7 @@
 	<select id="findUserByOfficeIdAndName" resultType="User" useCache="true">
 		SELECT
 		a.id, a.name, a.login_name,a.photo
-		,so.name as "office.name"
+		,so.name as "office.name",a.office_id as "office.id"
 		FROM sys_user a
 		left join sys_office so on so.id = a.office_id
 		LEFT JOIN work_staff_achives uo ON uo.user_id = a.id

src/main/resources/mappings/modules/workreimbursement/WorkReimbursementTypeDao.xml

@@ -36,6 +36,9 @@
             <if test="parentIds!=null and parentIds != ''">
                 and a.parent_ids like concat('%',#{parentIds},'%')
             </if>
+			<if test="standardDetail!=null and standardDetail != ''">
+				and a.standard_detail like concat('%',#{standardDetail},'%')
+			</if>
             <choose>
 				<when test="companyId!=null and companyId != ''">
 					and a.company_id = #{companyId}

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

@@ -24,7 +24,7 @@
 <%@ attribute name="dataMsgRequired" type="java.lang.String" required="false" description=""%>
 	<input id="${id}Id" name="${name}" class="${cssClass}" type="hidden" value="${value}"/>
 	<div class="input-group">
-		<input id="${id}Name" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
+		<input id="${id}Name" placeholder="请选择${title}" name="${labelName}" ${allowInput?'':'readonly="readonly"'}  type="text" value="${labelValue}" data-msg-required="${dataMsgRequired}"
 		class="${cssClass}" style="${cssStyle}"/>
 		<span class="input-group-btn">
 	       		 <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>

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

@@ -6,7 +6,7 @@
 <%@ attribute name="height" type="java.lang.String" required="false"%>
 <%@ attribute name="target" type="java.lang.String" required="false"%>
 <%@ attribute name="label" type="java.lang.String" required="false"%>
-<button class="layui-btn layui-btn layui-bg-blue" data-toggle="tooltip" data-placement="left" onclick="add()" title="添加">
+<button class="layui-btn layui-btn-sm layui-bg-blue" data-toggle="tooltip" data-placement="left" onclick="add()" title="添加">
 <%--    <i class="fa fa-plus"></i>--%>
     ${label==null?'添加':label}
 </button>

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

@@ -2,7 +2,7 @@
 <%@ include file="/webpage/include/taglib.jsp"%>
 <%@ attribute name="url" type="java.lang.String" required="true"%>
 <%-- 使用方法： 1.将本tag写在查询的form之前；2.传入url --%>
-<button id="btnExport" class="layui-btn layui-btn layui-bg-cyan" data-toggle="tooltip" data-placement="left" title="导出">
+<button id="btnExport" class="layui-btn layui-btn-sm layui-bg-blue" style="background-color: #5FB878" data-toggle="tooltip" data-placement="left" title="导出">
 <%--    <i class="fa fa-file-excel-o"></i>--%>
     导出</button>
 <script type="text/javascript">

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

@@ -2,7 +2,7 @@
 <%@ 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="layui-btn layui-btn layui-bg-orange" data-toggle="tooltip" data-placement="left" title="导入">
+<button id="btnImport" class="layui-btn layui-btn-sm layui-bg-blue" data-toggle="tooltip" data-placement="left" title="导入">
 <%--	<i class="fa fa-folder-open-o"></i>--%>
 	导入
 </button>

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

@@ -2,7 +2,7 @@
 <%@ 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="layui-btn layui-bg-orange" data-toggle="tooltip" data-placement="left" title="导入">
+<button id="btnImport" class="layui-btn layui-btn-sm layui-bg-blue" data-toggle="tooltip" data-placement="left" title="导入">
 <%--	<i class="fa fa-folder-open-o"></i> --%>
 	导入</button>
 <div id="importBox" class="hide">

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

@@ -6,7 +6,7 @@
 <%@ attribute name="height" type="java.lang.String" required="false"%>
 <%@ attribute name="target" type="java.lang.String" required="false"%>
 <%@ attribute name="label" type="java.lang.String" required="false"%>
-<button class="layui-btn layui-btn layui-bg-gray" data-toggle="tooltip" data-placement="left" onclick="importInfoRrr()" title="导入日志">
+<button class="layui-btn layui-btn-sm layui-bg-blue" 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 --%>

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

@@ -6,7 +6,7 @@
 <%@ attribute name="height" type="java.lang.String" required="false"%>
 <%@ attribute name="target" type="java.lang.String" required="false"%>
 <%@ attribute name="label" type="java.lang.String" required="false"%>
-<button class="layui-btn layui-btn layui-bg-blue" data-toggle="tooltip" data-placement="left" onclick="officeAdd()" title="添加">
+<button class="layui-btn layui-btn-sm layui-bg-blue" data-toggle="tooltip" data-placement="left" onclick="officeAdd()" title="添加">
 <%--    <i class="fa fa-plus"></i>--%>
     ${label==null?'添加':label}
 </button>

src/main/webapp/static/common/css/style.css

@@ -8277,11 +8277,18 @@ box-sizing:content-box;
 }
 
 #moresee{
-    background-color: #f0ad4e;
+    /*background-color: #f0ad4e;*/
+    /*display: block;*/
+    /*width: 30px;*/
+    /*text-align: center;*/
+    /*float: right;*/
+
+    background-color: #ccc;
     display: block;
     width: 30px;
     text-align: center;
     float: right;
+    border-radius: 30px;
 }
 
 #moresee i{
@@ -10363,3 +10370,14 @@ table.details tbody tr td.input-td input:focus{
 .table.list-table tbody tr:hover{
     background-color: #d9ecfb;
 }
+
+.search-spacing{
+    float: right;
+    margin-right: 10px;
+}
+.ash-placement{
+    background-color: #f1f1f1;
+}
+.bg-white{
+    background-color: #fff;
+}

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

@@ -390,17 +390,18 @@
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>审批意见</h2></div>
                 <div class="layui-item layui-col-sm8 lw6 with-textarea">
-                    <div class="layui-input-block" style="margin-left:10px;">
+                    <div class="layui-input-block" style="margin-left:10px;position: relative">
                         <form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+                        <a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
                         <input type="file" name="upload_files" style="display: none;">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm4 lw6 with-textarea">
                     <div class="layui-input-block" style="margin-left:10px;">
-                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
-                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
-                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
-                        <div style="padding: 10px 0px;">
+                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+                        <div style="padding: 5px 0px;">
                             <form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
                                 <form:option value=""/>
                                 <form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
@@ -433,10 +434,12 @@
 </div>
 <script>
     $(document).ready(function() {
-        $(".apen").click(function(){
-            var span=$(this).html();
-            var opinion=$("#opinion").val()+span+";"
-            $("#opinion").val(opinion);
+        $("#clearOpinon").click(function(){
+            var s=$("input[name='sh']").length;
+            for(var i=0;i<s;i++){
+                $("input[name='sh']").attr("checked",false)
+            }
+            $("#opinion").val("");
         })
         layui.use(['form', 'layer'], function () {
             var form = layui.form;
@@ -448,6 +451,14 @@
                     $("#opinion").val(opinion);
                 }
             });
+            layui.form.on('checkbox(raopinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    $(this).attr("checked",false)
+                    var opinion=$("#opinion").val()+span+";"
+                    $("#opinion").val(opinion);
+                }
+            });
         });
     })
 </script>

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

@@ -170,7 +170,7 @@
             <form:hidden path="flagOffice"/>
             <sys:message content="${message}"/>
             <div class="form-group layui-row first">
-                <div class="form-group layui-row">
+                <div class="layui-row">
                     <div class="form-group-label"><h2>公告状态</h2></div>
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">公告状态：</label>
@@ -181,7 +181,7 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group layui-row first">
+            <div class="form-group layui-row">
                 <div class="form-group-label"><h2>通告信息</h2></div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>公告标题：</label>
@@ -207,14 +207,14 @@
                     <div class="layui-item layui-col-sm6 ">
                         <label class="layui-form-label"><span class="require-item">*</span>开始日期：</label>
                         <div class="layui-input-block">
-                            <input id="startDate" name="startDate" style="background-color: #ffffff;" readonly="true" htmlEscape="false"  class="laydate-icondate form-control layer-date layui-input laydate-icon required"
+                            <input id="startDate" placeholder="请输入开始日期" name="startDate" style="background-color: #ffffff;" readonly="true" htmlEscape="false"  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>
                     </div>
                     <div class="layui-item layui-col-sm6">
                         <label class="layui-form-label"><span class="require-item">*</span>结束日期：</label>
                         <div class="layui-input-block">
-                            <input id="endDate" name="endDate" style="background-color: #ffffff;" readonly="true" htmlEscape="false"  class="laydate-icondate form-control layer-date layui-input laydate-icon required"
+                            <input id="endDate" name="endDate" placeholder="请输入结束日期" style="background-color: #ffffff;" readonly="true" htmlEscape="false"  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>
                     </div>

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

@@ -413,10 +413,10 @@
 					</div>
 					<div class="layui-item athird">
 						<div class="input-group">
-							<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
-							<div class="layui-btn-group" style="float: right;margin-right: 15px;">
-								<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
-								<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+							<div class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm  layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm  " onclick="resetSearch()">重置</button>
 							</div>
 <%--							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
 <%--							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
@@ -464,7 +464,7 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 20px;">
+					<div class="layui-btn-group">
 						<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>
@@ -477,7 +477,7 @@
 						<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>
+						<button class="layui-btn layui-btn-sm" 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><!-- 增加按钮 -->--%>
@@ -551,19 +551,19 @@
 							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=\"layui-btn layui-btn-xs\"> 修改</a>";
+                            xml += "<a href=\"javascript:void(0)\" onclick=\"openDialog('修改公告', '${ctx}/oa/oaNotify/form?id="+ d.id +"','95%', '95%')\"   class=\"layui-btn layui-btn-xs  layui-bg-green\"> 修改</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=\"layui-btn layui-btn-xs\"> 修改</a>";
+                            xml += "<a href=\"javascript:void(0)\" onclick=\"openDialogAdmin('修改公告', '${ctx}/oa/oaNotify/adminForm?id="+ d.id +"','95%', '95%')\"   class=\"layui-btn layui-btn-xs layui-bg-green\"> 修改</a>";
                         if(d.candel != undefined && d.candel == "1")
                             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=\"layui-btn layui-btn-xs\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogreModify('修改公告', '${ctx}/oa/oaNotify/modify?id=" + d.id + "','" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</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=\"layui-btn layui-btn-xs layui-bg-bule\" > 撤回</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-red\" > 撤回</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1"){
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改公告', '${ctx}/oa/oaNotify/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改公告', '${ctx}/oa/oaNotify/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.candelete != undefined && d.candelete == "1"){
                             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>";

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

@@ -362,19 +362,20 @@
 					</table>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>审核意见</h2></div>
+				<div class="form-group-label"><h2>审批意见</h2></div>
 				<div class="layui-item layui-col-sm8 lw6 with-textarea">
-					<div class="layui-input-block" style="margin-left:10px;">
-						<form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+					<div class="layui-input-block" style="margin-left:10px;position: relative">
+						<form:textarea placeholder="请输入意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm4 lw6 with-textarea">
 					<div class="layui-input-block" style="margin-left:10px;">
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
-						<div style="padding: 10px 0px;">
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;">
 							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
 								<form:option value=""/>
 								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
@@ -398,10 +399,12 @@
 </div>
 <script type="text/javascript">
 	$(document).ready(function() {
-		$(".apen").click(function(){
-			var span=$(this).html();
-			var opinion=$("#opinion").val()+span+";"
-			$("#opinion").val(opinion);
+		$("#clearOpinon").click(function(){
+			var s=$("input[name='sh']").length;
+			for(var i=0;i<s;i++){
+				$("input[name='sh']").attr("checked",false)
+			}
+			$("#opinion").val("");
 		})
 		layui.use(['form', 'layer'], function () {
 			var form = layui.form;
@@ -413,6 +416,14 @@
 					$("#opinion").val(opinion);
 				}
 			});
+			layui.form.on('checkbox(raopinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					$(this).attr("checked",false)
+					var opinion=$("#opinion").val()+span+";"
+					$("#opinion").val(opinion);
+				}
+			});
 		});
 	})
 	layui.use(['form', 'layer'], function () {

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -501,17 +501,18 @@
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批意见</h2></div>
 				<div class="layui-item layui-col-sm8 lw6 with-textarea">
-					<div class="layui-input-block" style="margin-left:10px;">
-						<form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+					<div class="layui-input-block" style="margin-left:10px;position: relative">
+						<form:textarea placeholder="请输入意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm4 lw6 with-textarea">
 					<div class="layui-input-block" style="margin-left:10px;">
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
-						<div style="padding: 10px 0px;">
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;">
 							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
 								<form:option value=""/>
 								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
@@ -546,10 +547,12 @@
 <script src="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.js" charset="utf-8"></script>
 <script>
 	$(document).ready(function() {
-		$(".apen").click(function(){
-			var span=$(this).html();
-			var opinion=$("#opinion").val()+span+";"
-			$("#opinion").val(opinion);
+		$("#clearOpinon").click(function(){
+			var s=$("input[name='sh']").length;
+			for(var i=0;i<s;i++){
+				$("input[name='sh']").attr("checked",false)
+			}
+			$("#opinion").val("");
 		})
 		layui.use(['form', 'layer'], function () {
 			var form = layui.form;
@@ -561,6 +564,14 @@
 					$("#opinion").val(opinion);
 				}
 			});
+			layui.form.on('checkbox(raopinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					$(this).attr("checked",false)
+					var opinion=$("#opinion").val()+span+";"
+					$("#opinion").val(opinion);
+				}
+			});
 		});
 	})
 	function openBill3(title,url,width,height,target,formId,tableId){

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

@@ -159,10 +159,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<div class="layui-btn-group" style="float: right;margin-right: 20px;">
-									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
-									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm" onclick="resetSearch()">重置</button>
 								</div>
 <%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
 <%--								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
@@ -211,8 +211,8 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					<div class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 <%--					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>--%>
 					<div style="clear: both;"></div>
@@ -265,11 +265,11 @@
 						var xml="<div class=\"layui-btn-group\">";
 						if(d.canedit3 != undefined && d.canedit3 =="1")
 						{
-							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/ruralProject/ruralProjectView/planView?id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 详情</a>";
+							xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogView('查看项目计划信息', '${ctx}/ruralProject/ruralProjectView/planView?id='+encodeURIComponent('" + d.id + "'),'95%','95%')\" style=\"color: white;background: darkseagreen\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 详情</a>";
 						}
 						if(d.canedit4 != undefined && d.canedit4 =="1")
 						{
-							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanCost/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs\" > 编辑</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanCost/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 编辑</a>";
 						}
 						xml+="</div>"
 						return xml;

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

@@ -31,10 +31,12 @@
 		  return false;
 		}
 		$(document).ready(function() {
-			$(".apen").click(function(){
-				var span=$(this).html();
-				var opinion=$("#opinion").val()+span+";"
-				$("#opinion").val(opinion);
+			$("#clearOpinon").click(function(){
+				var s=$("input[name='sh']").length;
+				for(var i=0;i<s;i++){
+					$("input[name='sh']").attr("checked",false)
+				}
+				$("#opinion").val("");
 			})
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
@@ -46,6 +48,14 @@
 						$("#opinion").val(opinion);
 					}
 				});
+				layui.form.on('checkbox(raopinion)', function(data){
+					var span=data.value;
+					if(span!=""){
+						$(this).attr("checked",false)
+						var opinion=$("#opinion").val()+span+";"
+						$("#opinion").val(opinion);
+					}
+				});
 			});
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
@@ -621,17 +631,18 @@
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批意见</h2></div>
 				<div class="layui-item layui-col-sm8 lw6 with-textarea">
-					<div class="layui-input-block" style="margin-left:10px;">
-						<form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+					<div class="layui-input-block" style="margin-left:10px;position: relative">
+						<form:textarea placeholder="请输入意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm4 lw6 with-textarea">
 					<div class="layui-input-block" style="margin-left:10px;">
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
-						<div style="padding: 10px 0px;">
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;">
 							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
 								<form:option value=""/>
 								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>

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

@@ -237,7 +237,7 @@
 				</div>
 				<c:choose>
 					<c:when test="${not empty projectRecords.bzshbUserId}">
-						<div class="layui-item layui-col-sm6 lw7">
+						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>项目审核人员：</label>
 							<div class="layui-input-block">
 								<select class="form-control editable-select layui-input" id="bzshbUserId" disabled="disabled" name="bzshbUserId" style="background-color: #f1f1f1">
@@ -250,7 +250,7 @@
 						</div>
 					</c:when>
 					<c:otherwise>
-						<div class="layui-item layui-col-sm6 lw7">
+						<div class="layui-item layui-col-sm6 lw6">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>项目审核人员：</label>
 							<div class="layui-input-block">
 								<select class="form-control editable-select layui-input" id="bzshbUserId"  name="bzshbUserId">
@@ -288,7 +288,7 @@
 						<input htmlEscape="false"  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">
+				<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.attachmentProjectSort}"/>
@@ -449,17 +449,18 @@
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>提交说明</h2></div>
 				<div class="layui-item layui-col-sm8 lw6 with-textarea">
-					<div class="layui-input-block" style="margin-left:10px;">
+					<div class="layui-input-block" style="margin-left:10px;position: relative">
 						<form:textarea placeholder="请输入说明" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm4 lw6 with-textarea">
 					<div class="layui-input-block" style="margin-left:10px;">
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
-						<div style="padding: 10px 0px;">
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;">
 							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
 								<form:option value=""/>
 								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
@@ -481,10 +482,12 @@
 
 			<script>
 				$(document).ready(function() {
-					$(".apen").click(function(){
-						var span=$(this).html();
-						var opinion=$("#opinion").val()+span+";"
-						$("#opinion").val(opinion);
+					$("#clearOpinon").click(function(){
+						var s=$("input[name='sh']").length;
+						for(var i=0;i<s;i++){
+							$("input[name='sh']").attr("checked",false)
+						}
+						$("#opinion").val("");
 					})
 					layui.use(['form', 'layer'], function () {
 						var form = layui.form;
@@ -496,6 +499,14 @@
 								$("#opinion").val(opinion);
 							}
 						});
+						layui.form.on('checkbox(raopinion)', function(data){
+							var span=data.value;
+							if(span!=""){
+								$(this).attr("checked",false)
+								var opinion=$("#opinion").val()+span+";"
+								$("#opinion").val(opinion);
+							}
+						});
 					});
 				})
                 var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");

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

@@ -479,17 +479,18 @@
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>提交说明</h2></div>
 				<div class="layui-item layui-col-sm8 lw6 with-textarea">
-					<div class="layui-input-block" style="margin-left:10px;">
+					<div class="layui-input-block" style="margin-left:10px;position: relative">
 						<form:textarea placeholder="请输入提交说明" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm4 lw6 with-textarea">
 					<div class="layui-input-block" style="margin-left:10px;">
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
-						<div style="padding: 10px 0px;">
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;">
 							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
 								<form:option value=""/>
 								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
@@ -511,10 +512,12 @@
 
 			<script>
 				$(document).ready(function() {
-					$(".apen").click(function(){
-						var span=$(this).html();
-						var opinion=$("#opinion").val()+span+";"
-						$("#opinion").val(opinion);
+					$("#clearOpinon").click(function(){
+						var s=$("input[name='sh']").length;
+						for(var i=0;i<s;i++){
+							$("input[name='sh']").attr("checked",false)
+						}
+						$("#opinion").val("");
 					})
 					layui.use(['form', 'layer'], function () {
 						var form = layui.form;
@@ -526,6 +529,14 @@
 								$("#opinion").val(opinion);
 							}
 						});
+						layui.form.on('checkbox(raopinion)', function(data){
+							var span=data.value;
+							if(span!=""){
+								$(this).attr("checked",false)
+								var opinion=$("#opinion").val()+span+";"
+								$("#opinion").val(opinion);
+							}
+						});
 					});
 				})
                 var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");

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

@@ -780,7 +780,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row first lw12">
-				<div class="form-group-label"><h2>合同信息</h2></div>
+				<div class="form-group-label"><h2>报告信息</h2></div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>送审价(元)：</label>
 						<div class="layui-input-block with-icon">

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

@@ -434,10 +434,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<div class="layui-btn-group" style="float: right;margin-right: 20px;">
-									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
-									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm" onclick="resetSearch()">重置</button>
 								</div>
 <%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
 <%--								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
@@ -513,10 +513,10 @@
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
 					<%--此处按钮样式包括 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 class="layui-btn-group">
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
+						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 <%--					<button class="nav-btn layui-btn" id="btn-expand">全部展开</button>--%>
 <%--					<button class="nav-btn layui-btn-warm" id="btn-fold">全部折叠</button>--%>
@@ -663,7 +663,7 @@
 								return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
 							}
 						}},
-					{align:'center', title: '报告',  width:70,templet:function(d){
+					{align:'center', title: '报告',  width:90,templet:function(d){
 							var st = getAuditState(""+d.projectReportStatus);
 							if(d.pid ==0){
 								if(st.action)
@@ -675,7 +675,7 @@
 								return '';
 							}
 						}},
-					{align:'center', title: '电子',  width:70,templet:function(d){
+					{align:'center', title: '电子',  width:90,templet:function(d){
 							var st = getRuralProjectArchiveState(""+d.projectReportRecordStatus);
 							if(d.pid ==0){
 								if(st.action)
@@ -687,7 +687,7 @@
 								return '';
 							}
 						}},
-					{align:'center', title: '批量',  width:70,templet:function(d){
+					{align:'center', title: '批量',  width:90,templet:function(d){
 						var st = getRuralProjectArchiveState(""+d.filingProjectStatus);
 						if(d.pid ==0){
 							if(st.action)
@@ -752,23 +752,23 @@
 				}
 				if(d.flag == 1){
 					if(d.projectReportStatus == 0){
-						xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralCostProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 新增报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('新增报告', '${ctx}/ruralProject/ruralCostProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 新增报告</a>";
 					}
 					if(d.projectReportStatus == 1){
-						xml+="<a href=\"#\" onclick=\"openDialogre('修改报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/form?projectId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs\" ><i class=\"fa fa-edit\"></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>";
 						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=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回报告</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-red\" > 撤回报告</a>";
 					}
 					if(d.projectReportStatus == 3){
 						//撤回操作
-						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改报告</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('调整报告信息', '${ctx}/ruralProject/ruralCostProjectMessage/modify?projectId=" + d.id + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改报告</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=\"layui-btn layui-btn-xs\" > 修改报告</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  layui-bg-green\" > 修改报告</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>";
 					}
 
@@ -776,19 +776,19 @@
 					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=\"layui-btn layui-btn-xs layui-bg-green\" > 线上归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上归档</a>";
 						}
 						if(d.projectReportRecordStatus == 1){
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg- layui-bg-green\" > 线上重新归档</a>";
 						}
 						if(d.projectReportRecordStatus == 2){
-							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>";
+							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-red\" > 撤回线上归档</a>";
 						}
 						if(d.projectReportRecordStatus == 3){
-							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上重新归档</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('撤回调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + " ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 线上重新归档</a>";
 						}
 						if(d.projectReportRecordStatus == 4){
-							xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecordModify?id=" + d.prrId + "&view=modify','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 线上重新归档</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-green\" > 线上重新归档</a>";
 						}
 					}
 
@@ -816,32 +816,32 @@
 						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=\"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>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 上报</a>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReportedByPerson?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #5FB878' class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 个人上报</a>";
 								}
 							}else{
 								if(d.reportedState == 2){
-									xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectMessage/cancelInvalidateByReported?id=" + d.id + "&processInstanceId=" + d.reportedProcessInstanceId + "\" onclick=\"return confirmx('确认要撤回该上报审批吗？', this.href)\" class=\"layui-btn layui-btn-xs\" > 撤回上报</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  layui-bg-red\" > 撤回上报</a>";
 								}
 								/*撤回修改*/
 								if(d.reportedState == 3){
-									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>";
+									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/updateReported?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改上报</a>";
 								}
 								/*驳回修改*/
 								if(d.reportedState == 4){
-									xml+="<a href=\"#\" onclick=\"openDialogre('上报管理', '${ctx}/ruralProject/ruralCostProjectMessage/reportedModify?id=" +  d.id + " ','95%', '95%','','上报,关闭')\" style='background-color: #1E9FFF' class=\"layui-btn layui-btn-xs\" > 修改上报</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 layui-bg-green\" > 修改上报</a>";
 								}
 							}
 						}
 					}
 					if('1' == d.flagAdmin && d.projectReportStatus == 5)
 					{
-						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=\"openDialogre('修改项目报告', '${ctx}/ruralProject/ruralCostProjectMessage/adminModifyForm?projectId=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改报告</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=\"layui-btn layui-btn-xs\" > 修改归档</a>";
+						xml+="<a href=\"#\" onclick=\"openDialogre('修改归档案卷号', '${ctx}/ruralProject/ruralCostProjectMessage/adminRecordModifyForm?id=" + d.prrId + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改归档</a>";
 					}
 				}
 				xml+="</div>";
@@ -849,7 +849,7 @@
 			}else{
 				var xml = '';
 				if(d.flag ==1){
-					xml+="<a href=\"#\" onclick=\"openDialogreSub('修改项目', '${ctx}/subProject/subProject/form?id=" + d.id + "','95%', '95%','','inputForm','layui-border-box')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+					xml+="<a href=\"#\" onclick=\"openDialogreSub('修改项目', '${ctx}/subProject/subProject/form?id=" + d.id + "','95%', '95%','','inputForm','layui-border-box')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改</a>";
 					xml+="<a href=\"${ctx}/subProject/subProject/delete?id=" + d.id + "\" onclick=\"return subConfirmx('确认要删除该子项目信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
 				}
 				xml+="</div>";

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

@@ -230,7 +230,7 @@
                     formatNum($("#contractPrice"));
                     $("#contractClientName").val(data.client.name);
                     $("#contractClientId").val(data.client.id);
-                    $("#constructionProjectType").val(data.constructionProjectTypeStr);
+                    $("#constructionProjectType").val(data.contractType);
                     $("#linkmanId").val(data.workClinetInfoIds);
                 }
             })
@@ -632,12 +632,20 @@
                     </div>
                     <div id="divv3">
                         <div class="layui-item layui-col-sm6 lw7">
-                            <label class="layui-form-label">工程分类：</label>
+                            <label class="layui-form-label">合同类型：</label>
                             <div class="layui-input-block">
-                                <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>
+                                <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.constructionProjectTypeStr}"/>
                             </div>
                         </div>
                     </div>
+<%--                    <div id="divv3">--%>
+<%--                        <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="constructionProjectType"  class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
                 </div>
             </div>
             <%--<div class="form-group layui-row first">

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

@@ -264,7 +264,7 @@
                     formatNum($("#contractPrice"));
                     $("#contractClientName").val(data.client.name);
                     $("#contractClientId").val(data.client.id);
-                    $("#constructionProjectType").val(data.constructionProjectTypeStr);
+                    $("#constructionProjectType").val(data.contractType);
                     $("#linkmanId").val(data.workClinetInfoIds);
                     //清理之前的联系人
                     var newClientId  = data.client.id;
@@ -759,12 +759,20 @@
                        </div>--%>
                    <div id="divv3">
                        <div class="layui-item layui-col-sm6 lw7">
-                           <label class="layui-form-label">工程分类：</label>
+                           <label class="layui-form-label">合同类型：</label>
                            <div class="layui-input-block">
-                               <input htmlEscape="false" readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.constructionProjectTypeStr}"/>
+                               <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.constructionProjectTypeStr}"/>
                            </div>
                        </div>
                    </div>
+<%--                   <div id="divv3">--%>
+<%--                       <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="constructionProjectType"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.constructionProjectTypeStr}"/>--%>
+<%--                           </div>--%>
+<%--                       </div>--%>
+<%--                   </div>--%>
                </div>
             </div>
 

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

@@ -340,10 +340,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<div class="layui-btn-group" style="float: right;margin-right: 20px;">
-									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
-									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm" onclick="resetSearch()">重置</button>
 								</div>
 <%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
 <%--								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
@@ -400,7 +400,7 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 20px;">
+					<div class="layui-btn-group">
 						<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:add">
 							<table:addRow url="${ctx}/ruralProject/ruralCostProjectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->
 						</shiro:hasPermission>
@@ -411,9 +411,9 @@
 							<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>
+							<button type="button" data-toggle="tooltip" data-placement="top" class="layui-btn layui-btn-sm layui-bg-blue" id="delUser"> 批量下载</button>
 						</shiro:hasPermission>
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 <%--					<shiro:hasPermission name="ruralProject:ruralCostProjectRecords:add">--%>
 <%--						<table:addRow url="${ctx}/ruralProject/ruralCostProjectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->--%>
@@ -503,23 +503,23 @@
 						}
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralCostProjectRecords/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralCostProjectRecords/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralCostProjectRecords/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.candel != undefined && d.candel =="1")
                         {
-                            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>";
+                            xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/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}/ruralProject/ruralCostProjectRecords/revoke?id=" + d.id + "&processInstanceId=" + d.procId + "&projectStatus="+d.projectStatus+"\" onclick=\"return confirmx('确认要撤回该项目审批吗？', this.href)\" class=\"layui-btn layui-btn-xs\" > 撤回</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 layui-bg-red\" > 撤回</a>";
                         }
 						//项目在没有归档完成之前可对文档进行操作
 						if(d.recordStatus != undefined && d.recordStatus =="1")
@@ -532,7 +532,7 @@
                         }
 						if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
 						{
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralCostProjectRecords/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</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>"

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

@@ -663,21 +663,21 @@
 					</table>
 				</div>
 			</div>
-
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批意见</h2></div>
 				<div class="layui-item layui-col-sm8 lw6 with-textarea">
-					<div class="layui-input-block" style="margin-left:10px;">
-						<form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+					<div class="layui-input-block" style="margin-left:10px;position: relative">
+						<form:textarea placeholder="请输入意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm4 lw6 with-textarea">
 					<div class="layui-input-block" style="margin-left:10px;">
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
-						<div style="padding: 10px 0px;">
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;">
 							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
 								<form:option value=""/>
 								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
@@ -687,6 +687,7 @@
 				</div>
 			</div>
 
+
 			<script>
                 var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
@@ -701,22 +702,32 @@
                         addRow('#workConstructionLinkmanList', workConstructionLinkmanRowIdx, workConstructionLinkmanTpl, dataBank[i]);
                         workConstructionLinkmanRowIdx = workConstructionLinkmanRowIdx + 1;
                     }
-                    $(".apen").click(function(){
-                    	var span=$(this).html();
-						var opinion=$("#opinion").val()+span+";"
-						$("#opinion").val(opinion);
-					})
-					layui.use(['form', 'layer'], function () {
-						var form = layui.form;
-						//下拉框监听器
-						layui.form.on('select(opinion)', function(data){
-							var span=data.value;
-							if(span!=""){
-								var opinion=$("#opinion").val()+span+";"
-								$("#opinion").val(opinion);
+						$("#clearOpinon").click(function(){
+							var s=$("input[name='sh']").length;
+							for(var i=0;i<s;i++){
+								$("input[name='sh']").attr("checked",false)
 							}
+							$("#opinion").val("");
+						})
+						layui.use(['form', 'layer'], function () {
+							var form = layui.form;
+							//下拉框监听器
+							layui.form.on('select(opinion)', function(data){
+								var span=data.value;
+								if(span!=""){
+									var opinion=$("#opinion").val()+span+";"
+									$("#opinion").val(opinion);
+								}
+							});
+							layui.form.on('checkbox(raopinion)', function(data){
+								var span=data.value;
+								if(span!=""){
+									$(this).attr("checked",false)
+									var opinion=$("#opinion").val()+span+";"
+									$("#opinion").val(opinion);
+								}
+							});
 						});
-					});
                 });
 			</script>
 

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

@@ -834,8 +834,8 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目所在地：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:treeselect id="area" name="area.id" value="${ruralProjectRecords.area.id}" labelName="area.name" labelValue="${ruralProjectRecords.area.name}"
-                                       cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
+                        <sys:treeselectArae id="area" name="area.id" value="${ruralProjectRecords.area.id}" labelName="area.name" labelValue="${ruralProjectRecords.area.name}"
+                                       cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false" isAll="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -312,10 +312,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<div class="layui-btn-group" style="float: right;margin-right: 20px;">
-									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
-									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm" onclick="resetSearch()">重置</button>
 								</div>
 <%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
 <%--								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
@@ -373,7 +373,7 @@
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
 					<%--此处按钮样式包括 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;">
+					<div class="layui-btn-group">
 						<shiro:hasPermission name="ruralProject:ruralProjectRecords:add">
 							<table:addRow url="${ctx}/ruralProject/ruralProjectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->
 						</shiro:hasPermission>
@@ -381,9 +381,9 @@
 							<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>
+							<button type="button" data-toggle="tooltip" data-placement="top" class="layui-btn layui-btn-sm layui-bg-blue" id="delUser"> 批量下载</button>
 						</shiro:hasPermission>
-						<button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 <%--					<shiro:hasPermission name="ruralProject:ruralProjectRecords:add">--%>
 <%--						<table:addRow url="${ctx}/ruralProject/ruralProjectRecords/form" title="项目"></table:addRow><!-- 增加按钮 -->--%>
@@ -473,23 +473,23 @@
                         }
                         if(d.canedit1 != undefined && d.canedit1 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/form?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectRecords/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectRecords/modify?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canrecall != undefined && d.canrecall =="1")
                         {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectRecords/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"openDialogre('调整项目', '${ctx}/ruralProject/ruralProjectRecords/form?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.candel != undefined && d.candel =="1")
                         {
-                            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>";
+                            xml+="<a href=\"${ctx}/ruralProject/ruralProjectRecords/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}/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>";
+                            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-red\" > 撤回</a>";
                         }
                         //项目在没有归档完成之前可对文档进行操作
                         if(d.recordStatus != undefined && d.recordStatus =="1")
@@ -502,7 +502,7 @@
                         }
                         if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
                         {
-							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs\" > 修改</a>";
+							xml+="<a href=\"#\" onclick=\"openDialogre('修改项目', '${ctx}/ruralProject/ruralProjectRecords/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改</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>"

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

@@ -148,13 +148,13 @@
 			</div>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>项目信息</h2></div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<div class="layui-item layui-col-sm6 lw8">
 					<label class="layui-form-label">项目名称：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectName}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<div class="layui-item layui-col-sm6 lw8">
 					<label class="layui-form-label">项目编号：</label>
 					<div class="layui-input-block">
 						<div class="input-group">
@@ -184,40 +184,40 @@
 					<%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>--%>
 					<%--</div>--%>
 					<%--</div>--%>
-				<div class="layui-item layui-col-sm6 lw6">
+				<div class="layui-item layui-col-sm6 lw8">
 					<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}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw8">
 					<label class="layui-form-label">所在省份：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>
 							<%--						<form:input path="${projectRecords.province}" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw8">
 					<label class="layui-form-label">所在地级市：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>
 							<%--						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw8">
 					<label class="layui-form-label">所在区县：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.county}"/>
 							<%--						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<div class="layui-item layui-col-sm6 lw8">
 					<label class="layui-form-label">建设地点：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<div class="layui-item layui-col-sm6 lw8">
 					<label class="layui-form-label">项目负责人：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
@@ -229,7 +229,7 @@
                             <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectTypeId}"/>
                         </div>
                     </div>--%>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw8">
 					<label class="layui-form-label">项目类型：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(projectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
@@ -240,13 +240,13 @@
 							<%--						</form:select>--%>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<div class="layui-item layui-col-sm6 lw8">
 					<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}"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6">
+				<div class="layui-item layui-col-sm6 lw8">
 					<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"/>"/>
@@ -270,7 +270,7 @@
                             <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                         </div>
                     </div>--%>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw8">
 					<label class="layui-form-label double-line">建筑面积或规模：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.buildingScale}"/>
@@ -283,7 +283,7 @@
                             <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
                         </div>
                     </div>--%>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw8">
 					<label class="layui-form-label">工程用途：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
@@ -319,31 +319,31 @@
                             <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                         </div>
                     </div>--%>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw8">
 					<label class="layui-form-label">单位造价(元)：</label>
 					<div class="layui-input-block">
 						<input value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw8">
 					<label class="layui-form-label double-line">土建单位造价(元)：</label>
 					<div class="layui-input-block">
 						<input  value="<fmt:formatNumber value="${projectRecords.buildingUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw8">
 					<label class="layui-form-label double-line">安装单位造价(元)：</label>
 					<div class="layui-input-block">
 						<input  value="<fmt:formatNumber value="${projectRecords.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6 with-textarea">
+				<div class="layui-item layui-col-sm6 lw8 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.projectDesc}</textarea>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw6 with-textarea">
+				<div class="layui-item layui-col-sm6 lw8 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>
@@ -681,21 +681,44 @@
 					</table>
 				</div>
 			</div>
-
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批意见</h2></div>
 				<div class="layui-item layui-col-sm8 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;position: relative">
+						<form:textarea placeholder="请输入意见" path="projectReportData.act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
+						<input type="file" name="upload_files" style="display: none;">
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm4 lw6 with-textarea">
 					<div class="layui-input-block" style="margin-left:10px;">
-						<form:textarea path="projectReportData.act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;">
+							<form:select path="projectReportData.act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+								<form:option value=""/>
+								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+							</form:select>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="form-group layui-row">
+				<div class="form-group-label"><h2>审批意见</h2></div>
+				<div class="layui-item layui-col-sm8 lw6 with-textarea">
+					<div class="layui-input-block" style="margin-left:10px;position: relative">
+						<form:textarea path="projectReportData.act.comment" placeholder="请输入意见" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm4 lw6 with-textarea">
 					<div class="layui-input-block" style="margin-left:10px;">
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
-						<div style="padding: 10px 0px;">
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;">
 							<form:select path="projectReportData.act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
 								<form:option value=""/>
 								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
@@ -728,10 +751,12 @@
 </div>
 <script>
 	$(document).ready(function() {
-		$(".apen").click(function(){
-			var span=$(this).html();
-			var opinion=$("#opinion").val()+span+";"
-			$("#opinion").val(opinion);
+		$("#clearOpinon").click(function(){
+			var s=$("input[name='sh']").length;
+			for(var i=0;i<s;i++){
+				$("input[name='sh']").attr("checked",false)
+			}
+			$("#opinion").val("");
 		})
 		layui.use(['form', 'layer'], function () {
 			var form = layui.form;
@@ -743,6 +768,13 @@
 					$("#opinion").val(opinion);
 				}
 			});
+			layui.form.on('checkbox(raopinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					var opinion=$("#opinion").val()+span+";"
+					$("#opinion").val(opinion);
+				}
+			});
 		});
 	})
 		function openBill2(title,url,width,height,target,formId,tableId){

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

@@ -326,13 +326,13 @@
             </div>
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>项目信息</h2></div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label">项目名称：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectName}"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label">项目编号：</label>
                     <div class="layui-input-block">
                         <div class="input-group">
@@ -362,40 +362,40 @@
                     <%--<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.scaleQuantity}"/>--%>
                     <%--</div>--%>
                     <%--</div>--%>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw8">
                     <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}"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label">所在省份：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.province}"/>
                             <%--						<form:input path="${projectRecords.province}" htmlEscape="false" id="province" class="form-control layui-input" readonly="true"/>--%>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label">所在地级市：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.city}"/>
                             <%--						<form:input path="city" htmlEscape="false" id="city" class="form-control layui-input" readonly="true"/>--%>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label">所在区县：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.county}"/>
                             <%--						<form:input path="county" htmlEscape="false" id="areaName1" class="form-control layui-input" readonly="true"/>--%>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label">建设地点：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectSite}"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label">项目负责人：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.leaderNameStr}"/>
@@ -407,7 +407,7 @@
                             <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectTypeId}"/>
                         </div>
                     </div>--%>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label">项目类型：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(projectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
@@ -418,13 +418,13 @@
                             <%--						</form:select>--%>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw8">
                     <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}"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw8">
                     <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"/>"/>
@@ -448,7 +448,7 @@
                             <form:input path="underGroundNum" htmlEscape="false"  class="form-control layui-input number" readonly="true"/>
                         </div>
                     </div>--%>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label double-line">建筑面积或规模：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.buildingScale}"/>
@@ -461,7 +461,7 @@
                             <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.measuringUnit}"/>
                         </div>
                     </div>--%>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label">工程用途：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.projectUse}"/>
@@ -497,31 +497,31 @@
                             <form:input path="installPercent" htmlEscape="false" id="installPercent" class="form-control layui-input" readonly="true"/>
                         </div>
                     </div>--%>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label">单位造价(元)：</label>
                     <div class="layui-input-block">
                         <input value="<fmt:formatNumber value="${projectRecords.unitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="unitFees" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label double-line">土建单位造价(元)：</label>
                     <div class="layui-input-block">
                         <input  value="<fmt:formatNumber value="${projectRecords.buildingUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="buildingUnitFees" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
+                <div class="layui-item layui-col-sm6 lw8">
                     <label class="layui-form-label double-line">安装单位造价(元)：</label>
                     <div class="layui-input-block">
                         <input  value="<fmt:formatNumber value="${projectRecords.installUnitFees}" pattern="#,##0.00#"/>" htmlEscape="false" id="installUnitFees" class="form-control layui-input" readonly="readonly"/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6 with-textarea">
+                <div class="layui-item layui-col-sm6 lw8 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.projectDesc}</textarea>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw6 with-textarea">
+                <div class="layui-item layui-col-sm6 lw8 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>
@@ -801,18 +801,29 @@
                 </div>
             </div>
 
-
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>审批意见</h2></div>
-                <div class="layui-item layui-col-sm12 lw6 with-textarea">
-                    <label class="layui-form-label">审批意见：</label>
-                    <div class="layui-input-block">
-                        <form:textarea path="projectReportData.act.comment" class="form-control" rows="4" maxlength="127" />
+                <div class="layui-item layui-col-sm8 lw6 with-textarea">
+                    <div class="layui-input-block" style="margin-left:10px;position: relative">
+                        <form:textarea path="projectReportData.act.comment"  placeholder="请输入意见"  id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+                        <a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
                         <input type="file" name="upload_files" style="display: none;">
                     </div>
                 </div>
+                <div class="layui-item layui-col-sm4 lw6 with-textarea">
+                    <div class="layui-input-block" style="margin-left:10px;">
+                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+                        <div style="padding: 5px 0px;">
+                            <form:select path="projectReportData.act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+                                <form:option value=""/>
+                                <form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                            </form:select>
+                        </div>
+                    </div>
+                </div>
             </div>
-
         </form:form>
 
         <div class="form-group layui-row">
@@ -825,6 +836,34 @@
     </div>
 </div>
 <script>
+    $(document).ready(function() {
+        $("#clearOpinon").click(function(){
+            var s=$("input[name='sh']").length;
+            for(var i=0;i<s;i++){
+                $("input[name='sh']").attr("checked",false)
+            }
+            $("#opinion").val("");
+        })
+        layui.use(['form', 'layer'], function () {
+            var form = layui.form;
+            //下拉框监听器
+            layui.form.on('select(opinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    var opinion=$("#opinion").val()+span+";"
+                    $("#opinion").val(opinion);
+                }
+            });
+            layui.form.on('checkbox(raopinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    $(this).attr("checked",false)
+                    var opinion=$("#opinion").val()+span+";"
+                    $("#opinion").val(opinion);
+                }
+            });
+        });
+    })
     function openBill2(title,url,width,height,target,formId,tableId){
         var rows = $(this).parent().prevAll().length + 1;
         var frameIndex = parent.layer.getFrameIndex(window.name);

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

@@ -987,17 +987,18 @@
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>审批意见</h2></div>
                 <div class="layui-item layui-col-sm8 lw6 with-textarea">
-                    <div class="layui-input-block" style="margin-left:10px;">
-                        <form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+                    <div class="layui-input-block" style="margin-left:10px;position: relative">
+                        <form:textarea placeholder="请输入意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+                        <a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
                         <input type="file" name="upload_files" style="display: none;">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm4 lw6 with-textarea">
                     <div class="layui-input-block" style="margin-left:10px;">
-                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
-                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
-                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
-                        <div style="padding: 10px 0px;">
+                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+                        <div style="padding: 5px 0px;">
                             <form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
                                 <form:option value=""/>
                                 <form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
@@ -1032,10 +1033,12 @@
 <script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
 <script>
     $(document).ready(function() {
-        $(".apen").click(function(){
-            var span=$(this).html();
-            var opinion=$("#opinion").val()+span+";"
-            $("#opinion").val(opinion);
+        $("#clearOpinon").click(function(){
+            var s=$("input[name='sh']").length;
+            for(var i=0;i<s;i++){
+                $("input[name='sh']").attr("checked",false)
+            }
+            $("#opinion").val("");
         })
         layui.use(['form', 'layer'], function () {
             var form = layui.form;
@@ -1047,6 +1050,14 @@
                     $("#opinion").val(opinion);
                 }
             });
+            layui.form.on('checkbox(raopinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    $(this).attr("checked",false)
+                    var opinion=$("#opinion").val()+span+";"
+                    $("#opinion").val(opinion);
+                }
+            });
         });
     })
     layui.use(['table','form'], function(){

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

@@ -8,7 +8,7 @@
 	<script type="text/javascript">
 		var key, lastValue = "", nodeList = [], type = getQueryString("type", "${url}");
 		var tree, setting = {view:{selectedMulti:false,dblClickExpand:false},check:{enable:"${checked}",nocheckInherit:true},
-				async:{enable:(type==3),url:"${ctx}/sys/user/treeData",autoParam:["id=officeId","projectId=projectId"]},
+				async:{enable:(type==3),url:"${ctx}/sys/user/treeData",autoParam:["id=officeId","projectId=projectId","selectName=selectName"]},
 				data:{simpleData:{enable:true}},callback:{<%--
 					beforeClick: function(treeId, treeNode){
 						if("${checked}" == "true"){
@@ -171,10 +171,39 @@
 				tree.expandNode(nodeList[i].getParentNode(), true, false, false);
 			}
 		}
-		
-		
+		function copyText() {
+			var selectName = $("#selectName").val();
+			$.get("${ctx}${url}${fn:indexOf(url,'?')==-1?'?':'&'}&extId=${extId}&isAll=${isAll}&module=${module}&t="
+					+ new Date().getTime()+"&flagOffice=${flagOffice}"+"&branchOffice=${branchOffice}"+"&selectName="+selectName, function(zNodes){
+				// 初始化树结构
+				tree = $.fn.zTree.init($("#tree"), setting, zNodes);
+
+				// 默认展开一级节点
+				var nodes = tree.getNodesByParam("level", 0);
+				for(var i=0; i<nodes.length; i++) {
+					tree.expandNode(nodes[i], true, false, false);
+				}
+				//异步加载子节点（加载用户）
+				var nodesOne = tree.getNodesByParam("isParent", true);
+				for(var j=0; j<nodesOne.length; j++) {
+					tree.reAsyncChildNodes(nodesOne[j],"!refresh",true);
+				}
+				selectCheckNode();
+			});
+			key = $("#key");
+			key.bind("focus", focusKey).bind("blur", blurKey).bind("change cut input propertychange", searchNode);
+			key.bind('keydown', function (e){if(e.which == 13){searchNode();}});
+			setTimeout("search();", "300");
+		}
 	</script>
 </head>
 <body>
+<div class="input-group">
+	<input htmlEscape="false"  class="form-control layui-input" id="selectName" name="selectName" value="" placeholder="搜索">
+	<span class="input-group-btn">
+				 <button type="button"  id="Button" onclick="copyText()" style="height: 40px;" class="layui-btn layui-btn-sm"><i class="fa fa-search"> 查询</i>
+				 </button>
+			</span>
+</div>
 	<div id="tree" class="ztree" style="padding:15px 20px;"></div>
 </body>

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowAudit.jsp

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

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

@@ -27,7 +27,6 @@
 			<div class="full-width fl">
 				<div class="contentShadow layui-row" id="queryDiv">
 				<form:form id="searchForm" modelAttribute="workReimbursementTypeInfo" action="${ctx}/reimbursementType/reimbursementType/" method="post" class="form-inline">
-
 					<div class="commonQuery">
 						<div class="layui-item query athird">
 							<label class="layui-form-label double-line">报销内容名：</label>
@@ -42,12 +41,12 @@
 							</div>
 						</div>
 						<div class="layui-item athird">
-							<div class="layui-btn-group" style="float: right;margin-right: 20px;">
-								<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
-								<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+							<div class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
 							</div>
 						</div>
-						<div style="    clear:both;"></div>
+						<div style="clear:both;"></div>
 					</div>
 
 					</form:form>
@@ -59,7 +58,7 @@
 						<%--<shiro:hasPermission name="reimbursementType:reimbursementType:add">
 							<table:addRow url="${ctx}/reimbursementType/reimbursementType/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>
+						<button class="layui-btn layui-btn-sm layui-bg-green" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新">&nbsp;刷新</button>
 						<div style="clear: both;"></div>
 					</div>
 
@@ -87,7 +86,7 @@
 										<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="layui-btn layui-btn-sm"> 添加下级结构</a>
+												<a href="javascript:void(0);" onclick="openDialog('添加报销内容', '${ctx}/reimbursementType/reimbursementType/form?parent.id=${workReimbursementTypeInfo.id}','80%','60%')" class="layui-btn layui-btn-xs layui-bg-blue"> 添加下级结构</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>
@@ -98,21 +97,21 @@
 										</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="layui-btn layui-btn-sm"> 添加下级结构</a>
+												<a href="javascript:void(0);" onclick="openDialog('添加报销内容', '${ctx}/reimbursementType/reimbursementType/form?parent.id=${workReimbursementTypeInfo.id}','80%','60%')" class="layui-btn layui-btn-xs  layui-bg-blue"> 添加下级结构</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="layui-btn layui-btn-sm layui-bg-blue" > 修改</a>
+												<a href="javascript:void(0);" onclick="openDialog('修改报销内容', '${ctx}/reimbursementType/reimbursementType/form?id=${workReimbursementTypeInfo.id}','80%','60%')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>
 											</shiro:hasPermission>
 											<shiro:hasPermission name="reimbursementType:reimbursementType:del">
-												<a href="${ctx}/reimbursementType/reimbursementType/delete?id=${workReimbursementTypeInfo.id}" onclick="return confirmx('确认要删除该报销内容吗？', this.href)"   class="layui-btn layui-btn-sm layui-bg-red"> 删除</a>
+												<a href="${ctx}/reimbursementType/reimbursementType/delete?id=${workReimbursementTypeInfo.id}" onclick="return confirmx('确认要删除该报销内容吗？', this.href)"   class="layui-btn layui-btn-xs 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="layui-btn layui-btn-sm layui-bg-blue" > 修改</a>
+												<a href="javascript:void(0);" onclick="openDialog('修改报销内容', '${ctx}/reimbursementType/reimbursementType/form?id=${workReimbursementTypeInfo.id}','80%','60%')" class="layui-btn layui-btn-xs layui-bg-green" > 修改</a>
 											</shiro:hasPermission>
 											<shiro:hasPermission name="reimbursementType:reimbursementType:del">
-												<a href="${ctx}/reimbursementType/reimbursementType/delete?id=${workReimbursementTypeInfo.id}" onclick="return confirmx('确认要删除该报销内容吗？', this.href)"   class="layui-btn layui-btn-sm layui-bg-red"> 删除</a>
+												<a href="${ctx}/reimbursementType/reimbursementType/delete?id=${workReimbursementTypeInfo.id}" onclick="return confirmx('确认要删除该报销内容吗？', this.href)"   class="layui-btn layui-btn-xs layui-bg-red"> 删除</a>
 											</shiro:hasPermission>
 										</c:if>
 										</div>

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

@@ -133,10 +133,10 @@
 
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<div class="layui-btn-group" style="float: right;margin-right: 20px;">
-									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
-									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
 								</div>
 <%--								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
 <%--								<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
@@ -231,7 +231,7 @@
 						<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>
+						<button class="layui-btn layui-btn-sm" 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><!-- 增加按钮 -->--%>
@@ -290,7 +290,7 @@
                         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=\"layui-btn layui-btn-xs layui-bg-blue\" > 修改</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-green\" > 修改</a>"
 
                         if(d.candelete != undefined && d.candelete == "1")
                             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>";

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

@@ -212,17 +212,18 @@
                 <div class="form-group layui-row">
                     <div class="form-group-label"><h2>审批意见</h2></div>
                     <div class="layui-item layui-col-sm8 lw6 with-textarea">
-                        <div class="layui-input-block" style="margin-left:10px;">
-                            <form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+                        <div class="layui-input-block" style="margin-left:10px;position: relative">
+                            <form:textarea placeholder="请输入意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+                            <a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
                             <input type="file" name="upload_files" style="display: none;">
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm4 lw6 with-textarea">
                         <div class="layui-input-block" style="margin-left:10px;">
-                            <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
-                            <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
-                            <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
-                            <div style="padding: 10px 0px;">
+                            <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+                            <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+                            <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+                            <div style="padding: 5px 0px;">
                                 <form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
                                     <form:option value=""/>
                                     <form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
@@ -253,10 +254,12 @@
     </div>
     <script>
         $(document).ready(function() {
-            $(".apen").click(function(){
-                var span=$(this).html();
-                var opinion=$("#opinion").val()+span+";"
-                $("#opinion").val(opinion);
+            $("#clearOpinon").click(function(){
+                var s=$("input[name='sh']").length;
+                for(var i=0;i<s;i++){
+                    $("input[name='sh']").attr("checked",false)
+                }
+                $("#opinion").val("");
             })
             layui.use(['form', 'layer'], function () {
                 var form = layui.form;
@@ -268,6 +271,14 @@
                         $("#opinion").val(opinion);
                     }
                 });
+                layui.form.on('checkbox(raopinion)', function(data){
+                    var span=data.value;
+                    if(span!=""){
+                        $(this).attr("checked",false)
+                        var opinion=$("#opinion").val()+span+";"
+                        $("#opinion").val(opinion);
+                    }
+                });
             });
         })
         layui.use('form', function () {

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

@@ -562,8 +562,8 @@
 					</div>
 					<div class="layui-item athird">
 						<div class="input-group">
-							<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
-							<div class="layui-btn-group" style="float: right;margin-right: 20px;">
+							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+							<div class="layui-btn-group search-spacing">
 								<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
 								<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
 							</div>
@@ -619,9 +619,9 @@
 			<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--%>
-					<div class="layui-btn-group" style="margin-left: 20px;">
+					<div class="layui-btn-group">
 						<shiro:hasPermission name="workcontractinfo:workContractInfo:add">
-							<button class="layui-btn layui-bg-blue" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')">&nbsp;添加</button>
+							<button class="layui-btn layui-btn-sm 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><!-- 导入按钮 -->
@@ -632,7 +632,7 @@
 							<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>
+						<button class="layui-btn layui-btn-sm" 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>--%>
@@ -742,7 +742,7 @@
 							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=\"layui-btn layui-btn-xs\" > 修改合同</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"contractAdminUpdate('修改合同管理', '${ctx}/workcontractinfo/workContractInfo/adminForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改合同</a>";
 						}
                         if(d.status != 5){
 							/*if(d.signature != undefined && d.signature =="1")
@@ -760,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=\"layui-btn layui-btn-xs layui-bg-blue\" > 修改合同</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-green\" > 修改合同</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=\"layui-btn layui-btn-xs  layui-bg-blue\" > 修改合同</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-green\" > 修改合同</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=\"layui-btn layui-btn-xs \" style=\"background-color:#c2c2c2\"> 合同作废</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 layui-bg-red\" > 合同作废</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=\"layui-btn layui-btn-xs\" > 撤回合同</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 layui-bg-red\" > 撤回合同</a>";
 							}
 
 							/*if(d.canalterCom != undefined && d.canalterCom =="1")
@@ -783,7 +783,7 @@
 							}*/
 							if(d.canalterComRevoke != undefined && d.canalterComRevoke =="1")
 							{
-								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/revokeCompletion?id="+ d.id +"\" onclick=\"return confirmx('确认要撤回该合同管理吗？', this.href)\" class=\"layui-btn layui-btn-xs\" > 撤回合同</a>";
+								xml += "<a href=\"${ctx}/workcontractinfo/workContractInfo/revokeCompletion?id="+ d.id +"\" onclick=\"return confirmx('确认要撤回该合同管理吗？', this.href)\" class=\"layui-btn layui-btn-xs  layui-bg-red\" > 撤回合同</a>";
 							}
 							if(d.canalterComDel != undefined && d.canalterComDel =="1")
 							{
@@ -793,17 +793,17 @@
 						} 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=\"layui-btn layui-btn-xs \" > 归档</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  layui-bg-orange\" > 归档</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=\"layui-btn layui-btn-xs\"> 撤回归档</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 layui-bg-red\"> 撤回归档</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=\"layui-btn layui-btn-xs layui-bg-blue\" > 修改归档</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-green\" > 修改归档</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=\"layui-btn layui-btn-xs layui-bg-blue\" > 修改归档</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-green\" > 修改归档</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=\"layui-btn layui-btn-xs layui-bg-blue\" > 修改归档</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-green\" > 修改归档</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>";*/
 						}
@@ -811,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=\"layui-btn layui-btn-xs layui-bg-blue\" > 借用</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-orange\" > 借用</a>";
 							}
 
 							if(d.cancancelBorrow != undefined && d.cancancelBorrow == "1")
-								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>";
+								xml += "<a href=\"${ctx}/workContractBorrow/workContractBorrow/cancelInvalidate?id=" + d.borrowId + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 撤回借用</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")
@@ -825,7 +825,7 @@
 							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=\"layui-btn layui-btn-xs layui-bg-blue\"> 归还合同</a>";
+								xml +="<a href=\"${ctx}/workContractBorrow/workContractBorrow/updateGiveDate?id=" + d.borrowId + "\" onclick=\"return confirmx('确认归还该合同信息吗？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-orange\"> 归还合同</a>";
 						}
                         xml+="</div>"
                         return xml;

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

@@ -234,17 +234,18 @@
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批意见</h2></div>
 				<div class="layui-item layui-col-sm8 lw6 with-textarea">
-					<div class="layui-input-block" style="margin-left:10px;">
-						<form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+					<div class="layui-input-block" style="margin-left:10px;position: relative">
+						<form:textarea placeholder="请输入意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm4 lw6 with-textarea">
 					<div class="layui-input-block" style="margin-left:10px;">
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
-						<div style="padding: 10px 0px;">
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;">
 							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
 								<form:option value=""/>
 								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
@@ -266,10 +267,12 @@
 </div>
 <script>
 	$(document).ready(function() {
-		$(".apen").click(function(){
-			var span=$(this).html();
-			var opinion=$("#opinion").val()+span+";"
-			$("#opinion").val(opinion);
+		$("#clearOpinon").click(function(){
+			var s=$("input[name='sh']").length;
+			for(var i=0;i<s;i++){
+				$("input[name='sh']").attr("checked",false)
+			}
+			$("#opinion").val("");
 		})
 		layui.use(['form', 'layer'], function () {
 			var form = layui.form;
@@ -281,6 +284,14 @@
 					$("#opinion").val(opinion);
 				}
 			});
+			layui.form.on('checkbox(raopinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					$(this).attr("checked",false)
+					var opinion=$("#opinion").val()+span+";"
+					$("#opinion").val(opinion);
+				}
+			});
 		});
 	})
 </script>

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

@@ -376,10 +376,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<div class="layui-btn-group" style="float: right;margin-right: 20px;">
-									<button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
-									<button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-xm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-xm " onclick="resetSearch()">重置</button>
 								</div>
 							</div>
 						</div>
@@ -484,11 +484,11 @@
 			<div class=" contentShadow shadowLBR 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--%>
-					<div class="layui-btn-group" style="margin-left: 20px;">
+					<div class="layui-btn-group">
 						<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>
+							<button class="layui-btn layui-btn-xm 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>
+						<button class="layui-btn layui-btn-xm layui-bg-green" 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><!-- 删除按钮 -->
@@ -575,15 +575,15 @@
                         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=\"layui-btn layui-btn-xs\" >修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改发票', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" >修改</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml +="<a href=\"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>";
+                            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  layui-bg-green\" >修改</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=\"layui-btn layui-btn-xs\" > 修改</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  layui-bg-green\" > 修改</a>";
                         }
                         if(d.candelete != undefined && d.candelete =="1")
                         {
@@ -591,7 +591,7 @@
                         }
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {
-                            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>";
+                            xml += "<a href=\"${ctx}/workinvoiceAll/workInvoiceAll/cancelInvalidate?id="+ d.id +"\" onclick=\"return confirmx('确认要强制撤回？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回</a>";
                         }
                         /*if(d.canalter != undefined && d.canalter =="1")
                         {
@@ -600,19 +600,19 @@
 
 						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=\"layui-btn layui-btn-xs\" > 收款</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"receiptInvoice('发票收款', '${ctx}/workinvoiceAll/workInvoiceAll/receiptForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-orange\" > 收款</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=\"layui-btn layui-btn-xs\" style=\"background-color:#c2c2c2\" > 作废</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 layui-bg-red\" > 作废</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=\"layui-btn layui-btn-xs\" > 修改</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 layui-bg-green\" > 修改</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=\"layui-btn layui-btn-xs\" > 修改</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  layui-bg-green\" > 修改</a>";
 						}
 						if(d.conditionCandelete != undefined && d.conditionCandelete =="1")
 						{
@@ -620,7 +620,7 @@
 						}
 						if(d.conditionCancancel != undefined && d.conditionCancancel =="1")
 						{
-							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>";
+							xml += "<a href=\"${ctx}/workinvoiceAll/workInvoiceAll/conditionCancelInvalidate?id="+ d.id +"\" onclick=\"return confirmx('确认要强制撤回？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"\" > 作废撤回</a>";
 						}
 
 						if(d.adminFlag != undefined && d.adminFlag =="1")

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

@@ -566,17 +566,18 @@
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批意见</h2></div>
 				<div class="layui-item layui-col-sm8 lw6 with-textarea">
-					<div class="layui-input-block" style="margin-left:10px;">
-						<form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+					<div class="layui-input-block" style="margin-left:10px;position: relative">
+						<form:textarea placeholder="请输入意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 						<input type="file" name="upload_files" style="display: none;">
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm4 lw6 with-textarea">
 					<div class="layui-input-block" style="margin-left:10px;">
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
-						<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
-						<div style="padding: 10px 0px;">
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+						<div style="padding: 5px 0px;">
 							<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
 								<form:option value=""/>
 								<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
@@ -673,10 +674,12 @@
 				</script>
 				<script type="text/javascript">
 					$(document).ready(function() {
-						$(".apen").click(function(){
-							var span=$(this).html();
-							var opinion=$("#opinion").val()+span+";"
-							$("#opinion").val(opinion);
+						$("#clearOpinon").click(function(){
+							var s=$("input[name='sh']").length;
+							for(var i=0;i<s;i++){
+								$("input[name='sh']").attr("checked",false)
+							}
+							$("#opinion").val("");
 						})
 						layui.use(['form', 'layer'], function () {
 							var form = layui.form;
@@ -688,6 +691,14 @@
 									$("#opinion").val(opinion);
 								}
 							});
+							layui.form.on('checkbox(raopinion)', function(data){
+								var span=data.value;
+								if(span!=""){
+									$(this).attr("checked",false)
+									var opinion=$("#opinion").val()+span+";"
+									$("#opinion").val(opinion);
+								}
+							});
 						});
 					})
 					var workAccountListRowIdx = 0, workAccountListTpl = $("#workAccountListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");

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

@@ -432,10 +432,10 @@
 						</div>
 						<div class="layui-item athird">
 							<div class="input-group">
-								<a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
-								<div class="layui-btn-group" style="float: right;margin-right: 20px;">
-									<button id="searchQuery" class="layui-btn layui-btn layui-bg-blue" onclick="search()">查询</button>
-									<button id="searchReset" class="layui-btn layui-btn " onclick="resetSearch()">重置</button>
+								<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+								<div class="layui-btn-group search-spacing">
+									<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+									<button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
 								</div>
 							</div>
 						</div>
@@ -539,11 +539,11 @@
 		<div class="full-width fl">
 			<div class=" contentShadow shadowLBR layui-form contentDetails">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 20px;">
+					<div class="layui-btn-group">
 						<shiro:hasPermission name="workinvoice:workInvoice:add">
-							<button class="layui-btn  layui-bg-blue" title="发票管理" onclick="openDialogre('发票管理','${ctx}//workinvoice/workInvoice/form','95%','95%')">&nbsp;添加</button>
+							<button class="layui-btn layui-btn-sm 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>
+						<button class="layui-btn layui-btn-sm layui-bg-green" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 					</div>
 
 
@@ -636,15 +636,15 @@
 						}
                         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=\"layui-btn layui-btn-xs\" > 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改发票', '${ctx}/workinvoice/workInvoice/form?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
                         }
                         if(d.canedit2 != undefined && d.canedit2 =="1")
                         {
-                            xml +="<a href=\"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>";
+                            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 layui-bg-green\" > 修改</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=\"layui-btn layui-btn-xs\" > 修改</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  layui-bg-green\" > 修改</a>";
                         }
                         if(d.candelete != undefined && d.candelete =="1")
                         {
@@ -652,7 +652,7 @@
                         }
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {
-                            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>";
+                            xml += "<a href=\"${ctx}/workinvoice/workInvoice/cancelInvalidate?id="+ d.id +"\" onclick=\"return confirmx('确认要强制撤回？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 撤回</a>";
                         }
                         /*if(d.canalter != undefined && d.canalter =="1")
                         {
@@ -661,19 +661,19 @@
 
 						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=\"layui-btn layui-btn-xs \" > 收款</a>";
+							xml +="<a href=\"javascript:void(0)\" onclick=\"receiptInvoice('发票收款', '${ctx}/workinvoice/workInvoice/receiptForm?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 收款</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=\"layui-btn layui-btn-xs layui-bg-gray\" > 作废</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-red\" > 作废</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=\"layui-btn layui-btn-xs\" > 修改</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-green\" > 修改</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=\"layui-btn layui-btn-xs\" > 修改</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  layui-bg-green\" > 修改</a>";
 						}
 						if(d.conditionCandelete != undefined && d.conditionCandelete =="1")
 						{
@@ -681,7 +681,7 @@
 						}
 						if(d.conditionCancancel != undefined && d.conditionCancancel =="1")
 						{
-							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>";
+							xml += "<a href=\"${ctx}/workinvoice/workInvoice/conditionCancelInvalidate?id="+ d.id +"\" onclick=\"return confirmx('确认要强制撤回？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\" > 作废撤回</a>";
 						}
 
 						if(d.adminFlag != undefined && d.adminFlag =="1")

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

@@ -76,10 +76,10 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
-                                <div class="layui-btn-group" style="float: right;margin-right: 20px;">
-                                    <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
-                                    <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group search-spacing">
+                                    <button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn layui-btn-sm layui-bg-green " onclick="resetSearch()">重置</button>
                                 </div>
                             </div>
                         </div>
@@ -126,11 +126,11 @@
             <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--%>
-                    <div class="layui-btn-group" style="margin-left: 20px;">
+                    <div class="layui-btn-group">
                         <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>
+                            <a href="javascript:void(0)" onclick="openDialogre('新增报销单', '${ctx}/workreimbursement/workReimbursementAll/form?tabId=0','95%','95%')" class="layui-btn layui-btn-sm layui-bg-blue" >&nbsp;添加</a>
                         </shiro:hasPermission>
-                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                        <button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
                     </div>
                     <div style="clear: both;"></div>
                 </div>
@@ -200,13 +200,13 @@
                         ////对操作进行初始化
                         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=\"layui-btn layui-btn-xs\">撤回</a>";
+                            xml += "<a href=\"${ctx}/workreimbursement/workReimbursementAll/cancelInvalidate?id=" + d.id + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\">撤回</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=\"layui-btn layui-btn-xs  layui-bg-blue\">修改</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-green\">修改</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=\"layui-btn layui-btn-xs layui-bg-blue\">修改</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-green\">修改</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=\"layui-btn layui-btn-xs layui-bg-blue\" >修改</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-green\" >修改</a>";
                         if(d.candelete != undefined && d.candelete == "1")
                             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>";
 

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

@@ -431,17 +431,18 @@
 		<div class="form-group layui-row">
 			<div class="form-group-label"><h2>审批意见</h2></div>
 			<div class="layui-item layui-col-sm8 lw6 with-textarea">
-				<div class="layui-input-block" style="margin-left:10px;">
-					<form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+				<div class="layui-input-block" style="margin-left:10px;position: relative">
+					<form:textarea placeholder="请输入意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+					<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 					<input type="file" name="upload_files" style="display: none;">
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm4 lw6 with-textarea">
 				<div class="layui-input-block" style="margin-left:10px;">
-					<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
-					<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
-					<div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
-					<div style="padding: 10px 0px;">
+					<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+					<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+					<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+					<div style="padding: 5px 0px;">
 						<form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
 							<form:option value=""/>
 							<form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
@@ -474,10 +475,12 @@
 </div>
 <script>
 	$(document).ready(function() {
-		$(".apen").click(function(){
-			var span=$(this).html();
-			var opinion=$("#opinion").val()+span+";"
-			$("#opinion").val(opinion);
+		$("#clearOpinon").click(function(){
+			var s=$("input[name='sh']").length;
+			for(var i=0;i<s;i++){
+				$("input[name='sh']").attr("checked",false)
+			}
+			$("#opinion").val("");
 		})
 		layui.use(['form', 'layer'], function () {
 			var form = layui.form;
@@ -489,6 +492,14 @@
 					$("#opinion").val(opinion);
 				}
 			});
+			layui.form.on('checkbox(raopinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					$(this).attr("checked",false)
+					var opinion=$("#opinion").val()+span+";"
+					$("#opinion").val(opinion);
+				}
+			});
 		});
 	})
 </script>

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

@@ -750,17 +750,18 @@
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>审批意见</h2></div>
                 <div class="layui-item layui-col-sm8 lw6 with-textarea">
-                    <div class="layui-input-block" style="margin-left:10px;">
-                        <form:textarea placeholder="请输入审批意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+                    <div class="layui-input-block" style="margin-left:10px;position: relative">
+                        <form:textarea placeholder="请输入意见" path="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+                        <a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
                         <input type="file" name="upload_files" style="display: none;">
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm4 lw6 with-textarea">
                     <div class="layui-input-block" style="margin-left:10px;">
-                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">同意</span></div>
-                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">不同意</span></div>
-                        <div style="padding: 10px 0px;"><span style="cursor:pointer" class="apen">请领导审核</span></div>
-                        <div style="padding: 10px 0px;">
+                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+                        <div style="padding: 5px 0px;">
                             <form:select path="act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
                                 <form:option value=""/>
                                 <form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
@@ -792,10 +793,12 @@
 </div>
 <script>
     $(document).ready(function() {
-        $(".apen").click(function(){
-            var span=$(this).html();
-            var opinion=$("#opinion").val()+span+";"
-            $("#opinion").val(opinion);
+        $("#clearOpinon").click(function(){
+            var s=$("input[name='sh']").length;
+            for(var i=0;i<s;i++){
+                $("input[name='sh']").attr("checked",false)
+            }
+            $("#opinion").val("");
         })
         layui.use(['form', 'layer'], function () {
             var form = layui.form;
@@ -807,6 +810,14 @@
                     $("#opinion").val(opinion);
                 }
             });
+            layui.form.on('checkbox(raopinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    $(this).attr("checked",false)
+                    var opinion=$("#opinion").val()+span+";"
+                    $("#opinion").val(opinion);
+                }
+            });
         });
     })
 </script>

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

@@ -96,8 +96,8 @@
                         <div class="layui-item query athird">
                             <label class="layui-form-label">报销项目：</label>
                             <div class="layui-input-block with-icon">
-                                <sys:gridselectcallprojectt url="${ctx}/workreimbursement/workReimbursement/selectprojectOnList" id="project" name="project.id"  value="${workReimbursement.project.id}"  title="选择报销项目" labelName="project.projectName"
-                                                            labelValue="${workReimbursement.project.projectName}" cssClass="form-control required layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojectt>
+                                <sys:gridselectcallprojectt url="${ctx}/workreimbursement/workReimbursement/selectprojectOnList" id="project" name="project.id"  value="${workReimbursement.project.id}"  title="选择报销项目" labelName="project.projectName" cssStyle="background-color:#fff"
+                                                           labelValue="${workReimbursement.project.projectName}" cssClass="form-control required layui-input" fieldLabels="项目" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectcallprojectt>
                             </div>
                         </div>
                         <%--<div class="layui-item query athird">
@@ -120,11 +120,11 @@
                         <div class="layui-item query athird">
                             <label class="layui-form-label">报销时间：</label>
                             <div class="layui-input-block">
-                                <input id="startDate" placeholder="开始时间" name="startDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+                                <input id="startDate" placeholder="开始时间" name="startDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group bg-white"
                                        value="<fmt:formatDate value="${workReimbursement.startDate}" pattern="yyyy-MM-dd"/>"/>
                                 </input>
                                 <span class="group-sep">-</span>
-                                <input id="endDate" placeholder="结束时间" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group"
+                                <input id="endDate" placeholder="结束时间" name="endDate" type="text" readonly="readonly" maxlength="20" class="laydate-icondate form-control layer-date layui-input laydate-icon query-group  bg-white"
                                        value="<fmt:formatDate value="${workReimbursement.endDate}" pattern="yyyy-MM-dd"/>"/>
                                 </input>
                             </div>
@@ -132,10 +132,10 @@
 
                         <div class="layui-item athird">
                             <div class="input-group">
-                                <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
-                                <div class="layui-btn-group" style="float: right;margin-right: 20px;">
-                                    <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
-                                    <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                                <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+                                <div class="layui-btn-group search-spacing">
+                                    <button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+                                    <button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
                                 </div>
                             </div>
                         </div>
@@ -146,14 +146,14 @@
                             <label class="layui-form-label">经办人：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:inquireselectUser id="handleId" name="handleId" value="${workReimbursement.handleId}" labelName="handleName" labelValue="${workReimbursement.handleName}"
-                                                title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                                title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true" cssStyle="background-color:#fff"/>
                             </div>
                         </div>
                         <div class="layui-item query athird">
                             <label class="layui-form-label">报销人：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:inquireselectUser id="submitterId" name="submitterId" value="${workReimbursement.submitterId}" labelName="submitterName" labelValue="${workReimbursement.submitterName}"
-                                                title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                                title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"  cssStyle="background-color:#fff"/>
                             </div>
                         </div>
                         <div class="layui-item query athird">
@@ -169,7 +169,7 @@
                             <label class="layui-form-label">报销部门：</label>
                             <div class="layui-input-block with-icon">
                                 <sys:treeselect id="officeId" name="officeId" value="${workReimbursement.officeId}" labelName="officeName" labelValue="${workReimbursement.officeName}"
-                                                title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                                                title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"  cssStyle="background-color:#fff"/>
                             </div>
                         </div>
                         <div style="clear:both;"></div>
@@ -182,11 +182,11 @@
             <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--%>
-                    <div class="layui-btn-group" style="margin-left: 20px;">
+                    <div class="layui-btn-group">
                         <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>
+                            <button onclick="openDialogre('新增报销单', '${ctx}/workreimbursement/workReimbursement/form?tabId=0','95%','95%')" class="layui-btn layui-btn-sm layui-bg-blue" >&nbsp;添加</button>
                         </shiro:hasPermission>
-                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                        <button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
                     </div>
                     <div style="clear: both;"></div>
                 </div>
@@ -260,13 +260,13 @@
                             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=\"layui-btn layui-btn-xs layui-bg-blue\"> 撤回</a>";
+                            xml += "<a href=\"${ctx}/workreimbursement/workReimbursement/cancelInvalidate?id=" + d.id + "\" onclick=\"return confirmx('确认要强制撤回？', this.href)\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 撤回</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=\"layui-btn layui-btn-xs\" > 修改</a>";
+                            xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogre('修改报销单', '${ctx}/workreimbursement/workReimbursement/form?id="+ d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 修改</a>";
                         if(d.canedit2 != undefined && d.canedit2 == "1")
-                            xml +="<a href=\"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>";
+                            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 layui-bg-green\" >修改</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=\"layui-btn layui-btn-xs\" > 修改</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 layui-bg-green\" > 修改</a>";
                         if(d.candelete != undefined && d.candelete == "1")
                             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>";
 

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

@@ -416,7 +416,7 @@
                     <div class="layui-item layui-col-sm6 lw7">
                         <label class="layui-form-label">籍    贯：</label>
                         <div class="layui-input-block with-icon">
-                            <sys:treeselect id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
+                            <sys:treeselectArae id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
                                            cssStyle="background-color:#fff" title="区域" url="/sys/area/treeData" cssClass="form-control layui-input basicInfo" allowClear="true" notAllowSelectParent="true"/>
                         </div>
                     </div>

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

@@ -433,7 +433,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">籍    贯：</label>
                     <div class="layui-input-block with-icon">
-                        <sys:treeselect id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
+                        <sys:treeselectArae id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
                                         title="区域" url="/sys/area/treeData" cssClass="form-control layui-input basicInfo" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>

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

@@ -581,13 +581,13 @@
                         </select>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm12 with-textarea">
+                <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" placeholder="请输入备注" htmlEscape="false" rows="4" maxlength="500" class="form-control "/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm12 with-textarea">
+                <div class="layui-item layui-col-sm12 lw7 with-textarea">
                     <label class="layui-form-label">个人简介：</label>
                     <div class="layui-input-block">
                         <form:textarea path="individualResume" placeholder="请输入个人简介 " htmlEscape="false" rows="4" maxlength="500" class="form-control "/>

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

@@ -112,10 +112,10 @@
                     </div>
                     <div class="layui-item athird fr">
                         <div class="input-group">
-                            <a href="#" id="moresee" style="margin-top: 5px;"><i class="glyphicon glyphicon-menu-down"></i></a>
-                            <div class="layui-btn-group" style="float: right;margin-right: 20px;">
-                                <button id="searchQuery" class="layui-btn layui-bg-blue" onclick="search()">查询</button>
-                                <button id="searchReset" class="layui-btn " onclick="resetSearch()">重置</button>
+                            <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
+                            <div class="layui-btn-group search-spacing">
+                                <button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+                                <button id="searchReset" class="layui-btn layui-btn-sm " onclick="resetSearch()">重置</button>
                             </div>
 <%--                            <a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>--%>
 <%--                            <button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
@@ -180,14 +180,14 @@
         <div class="full-width fl">
             <div class="contentShadow layui-form contentDetails">
                 <div class="nav-btns">
-                    <div class="layui-btn-group" style="margin-left: 15px;">
+                    <div class="layui-btn-group">
                         <shiro:hasPermission name="workstaff:workStaffBasicInfo:add">
                             <table:addRow url="${ctx}/workstaff/workStaffBasicInfo/form" title="员工信息"></table:addRow><!-- 增加按钮 -->
                         </shiro:hasPermission>
                         <shiro:hasPermission name="workstaff:workStaffBasicInfo:import">
                             <table:importExcelBasic url="${ctx}/workstaff/workStaffBasicInfo/import"></table:importExcelBasic><!-- 导入按钮 -->
                         </shiro:hasPermission>
-                        <button class="layui-btn" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+                        <button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
                     </div>
 <%--                    <shiro:hasPermission name="workstaff:workStaffBasicInfo:add">--%>
 <%--                        <table:addRow url="${ctx}/workstaff/workStaffBasicInfo/form" title="员工信息"></table:addRow><!-- 增加按钮 -->--%>
@@ -265,7 +265,7 @@
                         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=\"layui-btn layui-btn-xs layui-bg-blue\" > 修改</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-green\" > 修改</a>";
 
                         if(d.candelete != undefined && d.candelete == "1")
                             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>";