工程类型树形下拉菜单

src/main/java/com/jeeplus/modules/projectEngineering/dao/ProjectEngineeringInfoDao.java

@@ -23,8 +23,12 @@ public interface ProjectEngineeringInfoDao extends CrudDao<ProjectEngineeringInf
      */
     public List<ProjectEngineeringInfo> getParentAll();
 
+    /**
+     * 查询最大的序号
+     * @param parentId
+     * @return
+     */
     String selectOrderNum(String parentId);
 
     List<ProjectEngineeringInfo> fingIds(@Param("parentIdSet") Set<String> parentIdSet, @Param("companyId") String companyId);
-
 }

src/main/java/com/jeeplus/modules/projectEngineering/service/ProjectEngineeringService.java

@@ -133,7 +133,14 @@ public class ProjectEngineeringService extends TreeService<ProjectEngineeringInf
     public List<ProjectEngineeringInfo> getParentInfo(){
         return engineeringInfoDao.getParentAll();
     }
+
+    /**
+     * 自动生成序号
+     * @param parentId
+     * @return
+     */
     public String selectOrderNum(String parentId) {
         return engineeringInfoDao.selectOrderNum(parentId);
     }
+
 }

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

@@ -187,6 +187,9 @@ public class RuralCostProjectRecordsController extends BaseController {
 		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
 			projectRecords = projectRecordsService.get(projectRecords.getId());
             projectRecordsService.queryProjectDetail(projectRecords);
+			//获取工程类型
+			ProjectEngineeringInfo engineeringInfos=engineeringService.get(projectRecords.getEngineeringType());
+			model.addAttribute("engineeringInfo", engineeringInfos);
             /*//处理所在地信息
             StringBuffer areaName = new StringBuffer();
 			if(StringUtils.isNotBlank(projectRecords.getProvince())){
@@ -205,9 +208,7 @@ public class RuralCostProjectRecordsController extends BaseController {
 			projectRecords.setLeaderIds(UserUtils.getUser().getId());
 			projectRecords.setLeaderNameStr(UserUtils.getUser().getName());
         }
-		//获取所有工程类型
-		List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
-		model.addAttribute("engineeringInfo", engineeringInfos);
+
 		model.addAttribute("ruralProjectRecords", projectRecords);
 		return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm";
 	}
@@ -405,8 +406,8 @@ public class RuralCostProjectRecordsController extends BaseController {
             projectRecords.setAct(act);
         }
 		//获取所有工程类型
-		List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
-		model.addAttribute("engineeringInfo", engineeringInfos);
+		ProjectEngineeringInfo engineeringInfos=engineeringService.get(projectRecords.getEngineeringType());
+		model.addAttribute("engInfo", engineeringInfos);
         projectRecordsService.queryProjectDetail(projectRecords);
         model.addAttribute("projectRecords", projectRecords);
         return "modules/ruralprojectrecords/cost/ruralCostProjectRecordsModify";

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

@@ -3,8 +3,6 @@
  */
 package com.jeeplus.modules.ruralprojectrecords.web;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.oss.OSSClientUtil;
@@ -18,6 +16,7 @@ import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
 import com.jeeplus.modules.projectAccessory.entity.ProjectTemplateInfo;
+import com.jeeplus.modules.projectEngineering.entity.EngineeringTree;
 import com.jeeplus.modules.projectEngineering.entity.ProjectEngineeringInfo;
 import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
 import com.jeeplus.modules.projectFilingBatch.entity.ProjectFilingBatch;
@@ -52,6 +51,7 @@ import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.checkerframework.checker.units.qual.A;
+import org.json.JSONArray;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -194,15 +194,16 @@ public class RuralProjectRecordsController extends BaseController {
 		if (projectRecords!=null&&StringUtils.isNotBlank(projectRecords.getId())) {
 			projectRecords = projectRecordsService.get(projectRecords.getId());
             projectRecordsService.queryProjectDetail(projectRecords);
+			//查询工程分类
+			ProjectEngineeringInfo engineeringInfo=engineeringService.get(projectRecords.getEngineeringType());
+			model.addAttribute("engineeringInfo", engineeringInfo);
 		}else {
 		    projectRecords.setCreateBy(UserUtils.getUser());
 		    projectRecords.setCreateDate(new Date());
 			projectRecords.setLeaderIds(UserUtils.getUser().getId());
 			projectRecords.setLeaderNameStr(UserUtils.getUser().getName());
         }
-		//查询所有的工程分类
-		List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
-		model.addAttribute("engineeringInfo", engineeringInfos);
+
 		model.addAttribute("ruralProjectRecords", projectRecords);
 		return "modules/ruralprojectrecords/ruralProjectRecordsForm";
 	}
@@ -367,9 +368,9 @@ public class RuralProjectRecordsController extends BaseController {
             act.setTask(taskInfok);
             projectRecords.setAct(act);
         }
-		//查询所有的工程分类
-		List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
-		model.addAttribute("engineeringInfo", engineeringInfos);
+		//查询工程分类
+		ProjectEngineeringInfo engineeringInfo=engineeringService.get(projectRecords.getEngineeringType());
+		model.addAttribute("engInfo", engineeringInfo);
         projectRecordsService.queryProjectDetail(projectRecords);
         model.addAttribute("projectRecords", projectRecords);
         return "modules/ruralprojectrecords/ruralProjectRecordsModify";
@@ -1066,18 +1067,44 @@ public class RuralProjectRecordsController extends BaseController {
 		return map;
 	}
 
-//	/**
-//	 * 查询其他文件树形信息
-//	 */
-//	@RequestMapping(value = "engineeringTreeMenu")
-//	@ResponseBody
-//	public JSONObject engineeringTreeMenu(){
-////		List<>
-//		//查询所有工程分类的父类
-//		List<ProjectEngineeringInfo> parents=engineeringService.getParentInfo();
-//		for(ProjectEngineeringInfo engineeringInfo:parents){
-//			ProjectEngineeringInfo child=engineeringService.get(engineeringInfo.getId());
-//		}
-//		return null;
-//	}
+	/**
+	 * 查询其他文件树形信息
+	 */
+	@RequestMapping(value = "engineeringTreeMenu")
+	@ResponseBody
+	public String engineeringTreeMenu(){
+		LinkedHashSet<EngineeringTree> trees=new LinkedHashSet<>();
+		//查询所有工程分类
+		List<ProjectEngineeringInfo> engineeringInfos=engineeringService.findList(new ProjectEngineeringInfo());
+		childs(engineeringInfos,trees,"0");
+		JSONArray jsonArray=new JSONArray(trees);
+		return jsonArray.toString();
+	}
+
+	public static void childs(List<ProjectEngineeringInfo> sourcelist,LinkedHashSet<EngineeringTree> list,String parentId){
+		for (int i=0; i<sourcelist.size(); i++){
+			ProjectEngineeringInfo e = sourcelist.get(i);
+			if (e.getParent()!=null && StringUtils.isNotBlank(e.getParent().getId()) && e.getParent().getId().equals(parentId)){
+				EngineeringTree tree=new EngineeringTree();
+				tree.setTitle(e.getEngineeringName());
+				tree.setId(e.getId());
+				// 判断是否还有子节点, 有则继续获取子节点
+				for (int j=0; j<sourcelist.size(); j++){
+					ProjectEngineeringInfo child = sourcelist.get(j);
+					if (child.getParent()!=null && StringUtils.isNotBlank(child.getParent().getId()) && child.getParent().getId().equals(e.getId())){
+						tree.setType("group");
+						LinkedHashSet<EngineeringTree> childs=new LinkedHashSet<>();
+						childs(sourcelist,childs, e.getId());
+						List<EngineeringTree> childss=new ArrayList<>(childs);
+						tree.setChild(childss);
+						list.add(tree);
+						break;
+					}else{
+						list.add(tree);
+					}
+				}
+			}
+		}
+	}
+
 }

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -1368,6 +1368,14 @@ public class WorkProjectNotifyController extends BaseController {
 									break;
 								}
 							}
+							//处理送审金额
+							List<MainDictDetail> mainDict = DictUtils.getMainDictList("attachment_project_approval_money");
+							for (MainDictDetail info: mainDict) {
+								if(ruralProjectRecords.getSubmitMoney().equals(info.getValue())){
+									ruralProjectRecords.setSubmitMoney(info.getLabel());
+									break;
+								}
+							}
 							return "modules/ruralprojectrecords/ruralProjectRecordsView";
 						}else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 							//处理项目类别
@@ -1378,8 +1386,19 @@ public class WorkProjectNotifyController extends BaseController {
 									break;
 								}
 							}
+							//处理送审金额
+							List<MainDictDetail> mainDict = DictUtils.getMainDictList("attachment_project_approval_money");
+							for (MainDictDetail info: mainDict) {
+								if(ruralProjectRecords.getSubmitMoney().equals(info.getValue())){
+									ruralProjectRecords.setSubmitMoney(info.getLabel());
+									break;
+								}
+							}
 							return "modules/ruralprojectrecords/ruralProjectRecordsAudit";
 						} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
+							//查询工程类型信息
+							ProjectEngineeringInfo engineeringInfo=engineeringService.get(ruralProjectRecords.getEngineeringType());
+							model.addAttribute("engInfo", engineeringInfo);
 							return "modules/ruralprojectrecords/ruralProjectRecordsModify";
 						} else {
 							return "modules/ruralprojectrecords/ruralProjectRecordsView";

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

@@ -29,7 +29,7 @@
 		class="${cssClass} required" style="${cssStyle}"/>
        		 <span class="input-group-btn">
 	       		 <button type="button"  id="${id}Button" class="btn <c:if test="${fn:contains(cssClass, 'input-sm')}"> btn-sm </c:if><c:if test="${fn:contains(cssClass, 'input-lg')}"> btn-lg </c:if>  btn-primary ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>
-	             </button> 
+	             </button>
        		 </span>
 
     </div>

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

@@ -391,7 +391,7 @@
                 <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="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+                        <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>
@@ -438,6 +438,7 @@
             var s=$("input[name='sh']").length;
             for(var i=0;i<s;i++){
                 $("input[name='sh']").attr("checked",false)
+                layui.form.render();
             }
             $("#opinion").val("");
         })

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

@@ -368,7 +368,7 @@
 				<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="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<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>
@@ -406,6 +406,7 @@
 			var s=$("input[name='sh']").length;
 			for(var i=0;i<s;i++){
 				$("input[name='sh']").attr("checked",false)
+				layui.form.render();
 			}
 			$("#opinion").val("");
 		})

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

@@ -509,7 +509,7 @@
 				<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="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<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>
@@ -558,6 +558,7 @@
 			var s=$("input[name='sh']").length;
 			for(var i=0;i<s;i++){
 				$("input[name='sh']").attr("checked",false)
+				layui.form.render();
 			}
 			$("#opinion").val("");
 		})

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

@@ -315,7 +315,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入说明" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
+						<form:textarea placeholder="请输入说明:" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
 					</div>
 				</div>
 			</div>

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

@@ -35,6 +35,7 @@
 				var s=$("input[name='sh']").length;
 				for(var i=0;i<s;i++){
 					$("input[name='sh']").attr("checked",false)
+					layui.form.render();
 				}
 				$("#opinion").val("");
 			})
@@ -632,7 +633,7 @@
 				<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="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<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>

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

@@ -216,7 +216,7 @@
 				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label">选查要求：</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入选查要求" path="checkRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control"/>
+						<form:textarea placeholder="请输入选查要求:" path="checkRemarks" htmlEscape="false" rows="4" maxlength="255" class="form-control"/>
 					</div>
 				</div>
 			</div>

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

@@ -450,7 +450,7 @@
 				<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="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<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>
@@ -486,6 +486,7 @@
 						var s=$("input[name='sh']").length;
 						for(var i=0;i<s;i++){
 							$("input[name='sh']").attr("checked",false)
+							layui.form.render();
 						}
 						$("#opinion").val("");
 					})

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

@@ -480,7 +480,7 @@
 				<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="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<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>
@@ -516,6 +516,7 @@
 						var s=$("input[name='sh']").length;
 						for(var i=0;i<s;i++){
 							$("input[name='sh']").attr("checked",false)
+							layui.form.render();
 						}
 						$("#opinion").val("");
 					})

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectReportRecord/projectReportRecordForm.jsp

@@ -307,7 +307,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入说明" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
+						<form:textarea placeholder="请输入说明:" path="remarks" htmlEscape="false" rows="4" maxlength="255" class="form-control "/>
 					</div>
 				</div>
 			</div>

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

@@ -908,7 +908,7 @@
 					<div class="layui-input-block">
 						<div class="layui-item layui-col-sm6 lw7 with-textarea">
 							<div class="layui-input-block" style="margin-left:0px;position: relative">
-								<form:textarea placeholder="请输入审批意见" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+								<form:textarea placeholder="请输入审批意见:" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
 								<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 								<input type="file" name="upload_files" style="display: none;">
 							</div>
@@ -943,7 +943,7 @@
 					<div class="layui-input-block">
 						<div class="layui-item layui-col-sm6 lw7 with-textarea">
 							<div class="layui-input-block" style="margin-left:0px;position: relative">
-								<form:textarea placeholder="请输入审批意见" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+								<form:textarea placeholder="请输入审批意见：" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
 								<a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 								<input type="file" name="upload_files" style="display: none;">
 							</div>
@@ -1344,6 +1344,7 @@
 			var s=$("input[name='sh']").length;
 			for(var i=0;i<s;i++){
 				$("input[name='sh']").attr("checked",false)
+				layui.form.render();
 			}
 			$("#zixunOpinion").val("");
 		})
@@ -1351,6 +1352,7 @@
 			var s=$("input[name='shs']").length;
 			for(var i=0;i<s;i++){
 				$("input[name='shs']").attr("checked",false)
+				layui.form.render();
 			}
 			$("#fuzerenOpinion").val("");
 		})

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

@@ -820,7 +820,7 @@
 					<div class="layui-input-block">
 						<div class="layui-item layui-col-sm6 lw7 with-textarea">
 							<div class="layui-input-block" style="margin-left:0px;position: relative">
-								<form:textarea placeholder="请输入审批意见" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+								<form:textarea placeholder="请输入审批意见：" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
 								<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 								<input type="file" name="upload_files" style="display: none;">
 							</div>
@@ -853,7 +853,7 @@
 					<div class="layui-input-block">
 						<div class="layui-item layui-col-sm6 lw7 with-textarea">
 							<div class="layui-input-block" style="margin-left:0px;position: relative">
-								<form:textarea placeholder="请输入审批意见" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+								<form:textarea placeholder="请输入审批意见：" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
 								<a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 								<input type="file" name="upload_files" style="display: none;">
 							</div>
@@ -1263,6 +1263,7 @@
 			var s=$("input[name='sh']").length;
 			for(var i=0;i<s;i++){
 				$("input[name='sh']").attr("checked",false)
+				layui.form.render();
 			}
 			$("#zixunOpinion").val("");
 		})
@@ -1270,6 +1271,7 @@
 			var s=$("input[name='shs']").length;
 			for(var i=0;i<s;i++){
 				$("input[name='shs']").attr("checked",false)
+				layui.form.render();
 			}
 			$("#fuzerenOpinion").val("");
 		})

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

@@ -6,8 +6,8 @@
     <meta name="decorator" content="default"/>
     <script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
     <script type="text/javascript" src="${ctxStatic}/iCheck/icheck.min.js"></script>
-    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
-    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
         #projectDesc-error{
@@ -93,6 +93,20 @@
             }
             layui.use(['form', 'layer'], function () {
                 var form = layui.form;
+                //自动选择合同状态
+                if ($("#projectName").val() != "") {
+                    if ($("#contractName").val() == "") {
+                        $("#ext1").attr("checked",true);
+                        $("#divv").hide();
+                        $("#divv3").hide();
+                        form.render();
+                    }else{
+                        $("#ext").attr("checked",true);
+                        $("#divv").show();
+                        $("#divv3").show();
+                        form.render();
+                    }
+                }
                 //有无合同监听器
                 layui.form.on('radio(ext)', function(data){
                     var span=data.value;
@@ -117,6 +131,25 @@
                         $("#divv3").hide();
                     }
                 });
+                $.ajax({
+                    type : "POST",
+                    url : "${ctx}/ruralProject/ruralProjectRecords/engineeringTreeMenu",
+                    //请求成功
+                    success : function(result) {
+                        var s='{"title": "menu item 4","id": "4"}'
+                        var str=jQuery.parseJSON(result);
+                        //工程类型树形菜单
+                        layui.dropdown.render({
+                            elem: '#demo100'
+                            ,style: 'width: 450px;'
+                            ,data:str
+                            ,click: function(item){
+                                $("#demo100").find("span").html(item.title)
+                                $("#demo100").find("#engineeringType").val(item.id)
+                            }
+                        });
+                    }
+                });
             });
             var radioVal ;
             validateForm = $("#inputForm").validate({
@@ -235,18 +268,7 @@
                 type : 'date'
 , trigger: 'click'
             });
-            //自动选择合同状态
-            if ($("#projectName").val() != "") {
-                if ($("#contractName").val() == "") {
-                    $("#ext1").attr("checked",true);
-                    $("#divv").hide();
-                    $("#divv3").hide();
-                }else{
-                    $("#ext").attr("checked",true);
-                    $("#divv").show();
-                    $("#divv3").show();
-                }
-            }
+
         });
 
 
@@ -761,7 +783,7 @@
                        <div class="layui-item layui-col-sm6 lw7">
                            <label class="layui-form-label">合同类型：</label>
                            <div class="layui-input-block">
-                               <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.constructionProjectTypeStr}"/>
+                               <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${fns:getMainDictLabel(ruralProjectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
                            </div>
                        </div>
                    </div>
@@ -880,12 +902,17 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程类型：</label>
                     <div class="layui-input-block">
-                        <select name="engineeringType">
-                            <option value=""></option>
-                            <c:forEach items="${engineeringInfo}" varStatus="index" var="info">
-                                <option value="${info.id}" <c:if test="${info.id == ruralProjectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>
-                            </c:forEach>
-                        </select>
+<%--                        <select name="engineeringType">--%>
+<%--                            <option value=""></option>--%>
+<%--                            <c:forEach items="${engineeringInfo}" varStatus="index" var="info">--%>
+<%--                                <option value="${info.id}" <c:if test="${info.id == ruralProjectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>--%>
+<%--                            </c:forEach>--%>
+<%--                        </select>--%>
+                        <button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">
+                            <span>${engineeringInfo.engineeringName}</span>
+                            <input type="hidden" name="engineeringType" id="engineeringType" value="${engineeringInfo.engineeringName}"/>
+                            <i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>
+                        </button>
                     </div>
                 </div>
 

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

@@ -4,8 +4,8 @@
 <head>
 	<title>项目管理</title>
 	<meta name="decorator" content="default"/>
-    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
-    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
 	<script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
@@ -83,6 +83,20 @@
             }
             layui.use(['form', 'layer'], function () {
                 var form = layui.form;
+                //自动选择合同状态
+                if ($("#projectName").val() != "") {
+                    if ($("#contractName").val() == "") {
+                        $("#ext1").attr("checked",true);
+                        $("#divv").hide();
+                        $("#divv3").hide();
+                        form.render();
+                    }else{
+                        $("#ext").attr("checked",true);
+                        $("#divv").show();
+                        $("#divv3").show();
+                        form.render();
+                    }
+                }
                 //有无合同监听器
                 layui.form.on('radio(ext)', function(data){
                     var span=data.value;
@@ -107,6 +121,25 @@
                         $("#divv3").hide();
                     }
                 });
+                $.ajax({
+                    type : "POST",
+                    url : "${ctx}/ruralProject/ruralProjectRecords/engineeringTreeMenu",
+                    //请求成功
+                    success : function(result) {
+                        var s='{"title": "menu item 4","id": "4"}'
+                        var str=jQuery.parseJSON(result);
+                        //工程类型树形菜单
+                        layui.dropdown.render({
+                            elem: '#demo100'
+                            ,style: 'width: 450px;'
+                            ,data:str
+                            ,click: function(item){
+                                $("#demo100").find("span").html(item.title)
+                                $("#demo100").find("#engineeringType").val(item.id)
+                            }
+                        });
+                    }
+                });
             });
             var radioVal ;
             validateForm = $("#inputForm").validate({
@@ -163,18 +196,7 @@
                 }
             });
 
-            //自动选择合同状态
-            if ($("#projectName").val() != "") {
-                if ($("#contractName").val() == "") {
-                    $("#ext1").attr("checked",true);
-                    $("#divv").hide();
-                    $("#divv3").hide();
-                }else{
-                    $("#ext").attr("checked",true);
-                    $("#divv").show();
-                    $("#divv3").show();
-                }
-            }
+
 
             <%--$('#scaleType').editableSelect({--%>
                 <%--effects: 'slide'--%>
@@ -747,9 +769,11 @@
                     </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="${fns:getMainDictLabel(projectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+
+<%--                                <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>--%>
                             </div>
                         </div>
                     </div>
@@ -894,12 +918,17 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程类型：</label>
                     <div class="layui-input-block">
-                        <select name="engineeringType">
-                            <option value=""></option>
-                            <c:forEach items="${engineeringInfo}" varStatus="index" var="info">
-                                <option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>
-                            </c:forEach>
-                        </select>
+<%--                        <select name="engineeringType">--%>
+<%--                            <option value=""></option>--%>
+<%--                            <c:forEach items="${engineeringInfo}" varStatus="index" var="info">--%>
+<%--                                <option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>--%>
+<%--                            </c:forEach>--%>
+<%--                        </select>--%>
+                        <button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">
+                            <span>${engInfo.engineeringName}</span>
+                            <input type="hidden" name="engineeringType" id="engineeringType" value="${engInfo.id}"/>
+                            <i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>
+                        </button>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -168,7 +168,7 @@
 					<div class="layui-item layui-col-sm6 lw6">
 						<label class="layui-form-label">合同类别：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="${fns:getMainDictLabel(ruralProjectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+							<input htmlEscape="false"  readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="${fns:getMainDictLabel(projectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
 <%--							<input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>--%>
 						</div>
 					</div>
@@ -269,24 +269,23 @@
 											   title="项目负责人" url="/sys/office/treeDataAll?type=4" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</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">
-						<select name="engineeringType" disabled="true">
-							<option value=""></option>
-							<c:forEach items="${engineeringInfo}" varStatus="index" var="info">
-								<option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>
-							</c:forEach>
-						</select>
+						<c:forEach items="${engineeringInfo}" varStatus="index" var="info">
+							<c:if test="${info.id == projectRecords.engineeringType}"><input htmlEscape="false" readonly="true" id="engineeringType" class="form-control layui-input"  value="${info.engineeringName}"/></c:if>
+						</c:forEach>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label"><span class="require-item">*</span>送审金额：</label>
 					<div class="layui-input-block">
-						<form:select path="submitMoney" class="form-control required simple-select">
-							<form:option value=""/>
-							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-						</form:select>
+<%--						<form:select path="submitMoney" disabled="true" class="form-control required simple-select">--%>
+<%--							<form:option value=""/>--%>
+<%--							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+<%--						</form:select>--%>
+						<input class=" form-control layui-input " readonly="true" id="startDate" name="startDate" value="${projectRecords.submitMoney}"/>
+
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -307,7 +306,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}"/>
@@ -694,7 +693,7 @@
 				<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="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<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>
@@ -733,6 +732,7 @@
 							var s=$("input[name='sh']").length;
 							for(var i=0;i<s;i++){
 								$("input[name='sh']").attr("checked",false)
+								layui.form.render();
 							}
 							$("#opinion").val("");
 						})

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

@@ -106,6 +106,20 @@
                     ,util = layui.util
                     ,layer = layui.layer
                     ,$ = layui.jquery;
+                //自动选择合同状态
+                if ($("#projectName").val() != "") {
+                    if ($("#contractName").val() == "") {
+                        $("#ext1").attr("checked",true);
+                        $("#divv").hide();
+                        $("#divv3").hide();
+                        form.render();
+                    }else{
+                        $("#ext").attr("checked",true);
+                        $("#divv").show();
+                        $("#divv3").show();
+                        form.render();
+                    }
+                }
                 //有无合同监听器
                 layui.form.on('radio(ext)', function(data){
                     var span=data.value;
@@ -129,43 +143,23 @@
                         $("#divv3").hide();
                     }
                 });
-                //工程类型树形菜单
-                layui.dropdown.render({
-                    elem: '#demo100'
-                    ,data: ''
-                    // ,data: [
-                    //     {
-                    //         title: 'menu item 4'
-                    //         ,id: 4
-                    //     },{
-                    //         title: 'menu item 5'
-                    //         ,id: 5
-                    //         ,type:'group'
-                    //         ,child: [{
-                    //             title: 'menu item 5-1'
-                    //             ,type:'group'
-                    //             ,id: 55
-                    //             ,child: [{
-                    //                 title: 'menu item 5-1-1'
-                    //                 ,id: 5555
-                    //             },{
-                    //                 title: 'menu item 5-1-2'
-                    //                 ,id: 55555
-                    //             },{
-                    //                 title: 'menu item 5-1-3'
-                    //                 ,id: 555555
-                    //             }]
-                    //         },{
-                    //             title: 'menu item 5-2'
-                    //             ,id: 52
-                    //         },{
-                    //             title: 'menu item 5-3'
-                    //             ,id: 53
-                    //         }]
-                    //
-                    //     }]
-                    ,click: function(item){
-                        layer.msg(util.escape(JSON.stringify(item)));
+                $.ajax({
+                    type : "POST",
+                    url : "${ctx}/ruralProject/ruralProjectRecords/engineeringTreeMenu",
+                    //请求成功
+                    success : function(result) {
+                        var s='{"title": "menu item 4","id": "4"}'
+                        var str=jQuery.parseJSON(result);
+                        //工程类型树形菜单
+                        layui.dropdown.render({
+                            elem: '#demo100'
+                            ,style: 'width: 450px;'
+                            ,data:str
+                            ,click: function(item){
+                                $("#demo100").find("span").html(item.title)
+                                $("#demo100").find("#engineeringType").val(item.id)
+                            }
+                        });
                     }
                 });
             });
@@ -233,19 +227,7 @@
                 }
             });
 
-            //自动选择合同状态
-            var s=$("#projectName").val()
-            if ($("#projectName").val() != "") {
-                if ($("#contractName").val() == "") {
-                    $("#ext1").attr("checked",true);
-                    $("#divv").hide();
-                    $("#divv3").hide();
-                }else{
-                    $("#ext").attr("checked",true);
-                    $("#divv").show();
-                    $("#divv3").show();
-                }
-            }
+
 
 
             $('#areaId').on("change", function () {
@@ -824,7 +806,8 @@
                        <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}"/>
+                               <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${fns:getMainDictLabel(ruralProjectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+<%--                               <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${ruralProjectRecords.workContractInfo.constructionProjectTypeStr}"/>--%>
                            </div>
                        </div>
                    </div>
@@ -941,7 +924,9 @@
 <%--                                <option value="${info.id}" <c:if test="${info.id == ruralProjectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>--%>
 <%--                            </c:forEach>--%>
 <%--                        </select>--%>
-                        <button type="button" class="layui-btn layui-btn-primary" style="width: 100%" id="demo100">
+                        <button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">
+                            <span>${engineeringInfo.engineeringName}</span>
+                            <input type="hidden" name="engineeringType" id="engineeringType" value="${engineeringInfo.id}"/>
                             <i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>
                         </button>
                     </div>

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

@@ -5,8 +5,10 @@
 	<title>项目管理</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript" src="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.js"></script>
-    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
-    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/layuidown.css"/>
+    <script type="text/javascript" src="${ctxStatic}/layui/layuidown.js"></script>
+<%--    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>--%>
+<%--    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>--%>
     <link rel='stylesheet' type="text/css" href="${ctxStatic}/helloweba_editable-select/jquery.editable-select.min.css"/>
     <style>
         #projectDesc-error{
@@ -83,6 +85,20 @@
             }
             layui.use(['form', 'layer'], function () {
                 var form = layui.form;
+                //自动选择合同状态
+                if ($("#projectName").val() != "") {
+                    if ($("#contractName").val() == "") {
+                        $("#ext1").attr("checked",true);
+                        $("#divv").hide();
+                        $("#divv3").hide();
+                        form.render();
+                    }else{
+                        $("#ext").attr("checked",true);
+                        $("#divv").show();
+                        $("#divv3").show();
+                        form.render();
+                    }
+                }
                 //有无合同监听器
                 layui.form.on('radio(ext)', function(data){
                     var span=data.value;
@@ -107,6 +123,25 @@
                         $("#divv3").hide();
                     }
                 });
+                $.ajax({
+                    type : "POST",
+                    url : "${ctx}/ruralProject/ruralProjectRecords/engineeringTreeMenu",
+                    //请求成功
+                    success : function(result) {
+                        var s='{"title": "menu item 4","id": "4"}'
+                        var str=jQuery.parseJSON(result);
+                        //工程类型树形菜单
+                        layui.dropdown.render({
+                            elem: '#demo100'
+                            ,style: 'width: 450px;'
+                            ,data:str
+                            ,click: function(item){
+                                $("#demo100").find("span").html(item.title)
+                                $("#demo100").find("#engineeringType").val(item.id)
+                            }
+                        });
+                    }
+                });
             });
             var radioVal ;
             validateForm = $("#inputForm").validate({
@@ -165,18 +200,7 @@
                 }
             });
 
-            //自动选择合同状态
-            if ($("#projectName").val() != "") {
-                if ($("#contractName").val() == "") {
-                    $("#ext1").attr("checked",true);
-                    $("#divv").hide();
-                    $("#divv3").hide();
-                }else{
-                    $("#ext").attr("checked",true);
-                    $("#divv").show();
-                    $("#divv3").show();
-                }
-            }
+
 
             <%--$('#scaleType').editableSelect({--%>
                 <%--effects: 'slide'--%>
@@ -739,7 +763,8 @@
                         <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}"/>
+                                <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${fns:getMainDictLabel(projectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+<%--                                <input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${projectRecords.workContractInfo.constructionProjectTypeStr}"/>--%>
                             </div>
                         </div>
                     </div>
@@ -875,7 +900,7 @@
                     </div>
                 </div>
 
-                <div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">项目负责人：</label>
                     <div class="layui-input-block  with-icon">
                         <sys:reportedtreeselectUser id="projectMaster" name="projectMasterId" value="${projectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${projectRecords.projectMasterName}" cssStyle="background-color: #fff"
@@ -885,12 +910,17 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">工程类型：</label>
                     <div class="layui-input-block">
-                        <select name="engineeringType">
-                            <option value=""></option>
-                            <c:forEach items="${engineeringInfo}" varStatus="index" var="info">
-                                <option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>
-                            </c:forEach>
-                        </select>
+<%--                        <select name="engineeringType">--%>
+<%--                            <option value=""></option>--%>
+<%--                            <c:forEach items="${engineeringInfo}" varStatus="index" var="info">--%>
+<%--                                <option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</option>--%>
+<%--                            </c:forEach>--%>
+<%--                        </select>--%>
+                        <button type="button" class="layui-btn layui-btn-primary" style="width: 100%;text-align: left" id="demo100">
+                            <span>${engInfo.engineeringName}</span>
+                            <input type="hidden" name="engineeringType" id="engineeringType" value="${engInfo.id}"/>
+                            <i class="layui-icon layui-icon-down layui-font-12" style="float: right"></i>
+                        </button>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

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

@@ -121,7 +121,9 @@
 					<div class="layui-item layui-col-sm6 lw6">
 						<label class="layui-form-label">合同类型：</label>
 						<div class="layui-input-block">
-							<input htmlEscape="false"  readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>
+							<input htmlEscape="false"  readonly="true" id="constructionProjectType"  class="form-control layui-input" value="${fns:getMainDictLabel(projectRecords.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+
+<%--							<input htmlEscape="false"  readonly="true" style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.workContractInfo.contractType}"/>--%>
 						</div>
 					</div>
 				</div>
@@ -221,21 +223,19 @@
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">工程类型：</label>
 					<div class="layui-input-block">
-						<form:select path="engineeringType" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
-							<form:options items="${engineeringInfo}" itemLabel="engineeringName" itemValue="id" htmlEscape="false"/>
-<%--							<c:forEach items="${engineeringInfo}" varStatus="index" var="info">--%>
-<%--								<form:option value="${info.id}" <c:if test="${info.id == projectRecords.engineeringType}"> selected</c:if>>${info.engineeringName}</form:option>--%>
-<%--							</c:forEach>--%>
-						</form:select>
+						<c:forEach items="${engineeringInfo}" varStatus="index" var="info">
+							<c:if test="${info.id == projectRecords.engineeringType}"><input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" id="engineeringType" class="form-control layui-input"  value="${info.engineeringName}"/></c:if>
+						</c:forEach>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">送审金额：</label>
 					<div class="layui-input-block">
-						<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">
-							<form:option value=""/>
-							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-						</form:select>
+<%--						<form:select path="submitMoney" disabled="true" style="background-color: #f1f1f1"  class="form-control simple-select">--%>
+<%--							<form:option value=""/>--%>
+<%--							<form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+<%--						</form:select>--%>
+						<input class=" form-control layui-input " readonly="true" id="submitMoney" name="submitMoney" style="background-color: #f1f1f1" value="${projectRecords.submitMoney}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw6">
@@ -256,7 +256,7 @@
 						<input htmlEscape="false"  style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw6">
 					<label class="layui-form-label">项目类别：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" readonly="true"  style="background-color: #f1f1f1" class="form-control layui-input" value="${projectRecords.attachmentProjectSort}"/>

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

@@ -473,11 +473,11 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm12 lw7 with-textarea">
-						<label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见11：</label>
+						<label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
 						<div class="layui-input-block">
 							<div class="layui-item layui-col-sm6 lw7 with-textarea">
 								<div class="layui-input-block" style="margin-left:0px;position: relative">
-									<form:textarea placeholder="请输入审批意见" path="projectReportData.technicistRemarks" id="technicistRemarks" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+									<form:textarea placeholder="请输入审批意见:" path="projectReportData.technicistRemarks" id="technicistRemarks" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
 									<a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 									<input type="file" name="upload_files" style="display: none;">
 								</div>
@@ -617,7 +617,7 @@
 			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div class="form-group-label"><h2>依据性文件</h2></div>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
 					<b><span id="baifenbi_gistdata" ></span></b>
@@ -761,7 +761,7 @@
 				<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" />
+						<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>
@@ -808,6 +808,8 @@
 			var s=$("input[name='sh']").length;
 			for(var i=0;i<s;i++){
 				$("input[name='sh']").attr("checked",false)
+				layui.form.render();
+
 			}
 			$("#opinion").val("");
 		})
@@ -815,6 +817,8 @@
 			var s=$("input[name='shs']").length;
 			for(var i=0;i<s;i++){
 				$("input[name='shs']").attr("checked",false)
+				layui.form.render();
+
 			}
 			$("#technicistRemarks").val("");
 		})

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

@@ -653,7 +653,7 @@
                     <div class="layui-input-block">
                         <div class="layui-item layui-col-sm6 lw7 with-textarea">
                             <div class="layui-input-block" style="margin-left:0px;position: relative">
-                                <form:textarea placeholder="请输入审批意见" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+                                <form:textarea placeholder="请输入审批意见：" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
                                 <a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
                                 <input type="file" name="upload_files" style="display: none;">
                             </div>
@@ -686,7 +686,7 @@
                     <div class="layui-input-block">
                         <div class="layui-item layui-col-sm6 lw7 with-textarea">
                         <div class="layui-input-block" style="margin-left:0px;position: relative">
-                            <form:textarea placeholder="请输入审批意见" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+                            <form:textarea placeholder="请输入审批意见：" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
                             <a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
                             <input type="file" name="upload_files" style="display: none;">
                         </div>
@@ -997,6 +997,8 @@
             var s=$("input[name='sh']").length;
             for(var i=0;i<s;i++){
                 $("input[name='sh']").attr("checked",false)
+                layui.form.render();
+
             }
             $("#zixunOpinion").val("");
         })
@@ -1004,6 +1006,8 @@
             var s=$("input[name='shs']").length;
             for(var i=0;i<s;i++){
                 $("input[name='shs']").attr("checked",false)
+                layui.form.render();
+
             }
             $("#fuzerenOpinion").val("");
         })
@@ -1061,6 +1065,8 @@
             var s=$("input[name='sh']").length;
             for(var i=0;i<s;i++){
                 $("input[name='sh']").attr("checked",false)
+                layui.form.render();
+
             }
             $("#opinion").val("");
         })

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

@@ -877,7 +877,7 @@
 					<div class="layui-input-block">
 						<div class="layui-item layui-col-sm6 lw7 with-textarea">
 							<div class="layui-input-block" style="margin-left:0px;position: relative">
-								<form:textarea placeholder="请输入审批意见" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+								<form:textarea placeholder="请输入审批意见：" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
 								<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 								<input type="file" name="upload_files" style="display: none;">
 							</div>
@@ -910,7 +910,7 @@
 					<div class="layui-input-block">
 							<div class="layui-item layui-col-sm6 lw7 with-textarea">
 								<div class="layui-input-block" style="margin-left:0px;position: relative">
-									<form:textarea placeholder="请输入审批意见" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+									<form:textarea placeholder="请输入审批意见：" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
 									<a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
 									<input type="file" name="upload_files" style="display: none;">
 								</div>
@@ -1313,6 +1313,8 @@
 			var s=$("input[name='sh']").length;
 			for(var i=0;i<s;i++){
 				$("input[name='sh']").attr("checked",false)
+				layui.form.render();
+
 			}
 			$("#zixunOpinion").val("");
 		})
@@ -1320,6 +1322,8 @@
 			var s=$("input[name='shs']").length;
 			for(var i=0;i<s;i++){
 				$("input[name='shs']").attr("checked",false)
+				layui.form.render();
+
 			}
 			$("#fuzerenOpinion").val("");
 		})

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

@@ -992,7 +992,7 @@
                 <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="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+                        <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>
@@ -1041,6 +1041,8 @@
             var s=$("input[name='sh']").length;
             for(var i=0;i<s;i++){
                 $("input[name='sh']").attr("checked",false)
+                layui.form.render();
+
             }
             $("#opinion").val("");
         })

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

@@ -201,7 +201,7 @@
 <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 type="button"  id="Button" onclick="copyText()" style="height: 40px;" class="layui-btn layui-btn-xs layui-btn-primary"><i class="fa fa-search"> 查询</i>
 				 </button>
 			</span>
 </div>

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

@@ -211,7 +211,7 @@
 <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 type="button"  id="Button" onclick="copyText()" style="height: 40px;" class="layui-btn layui-btn-xs layui-btn-primary"><i class="fa fa-search"> 查询</i>
 				 </button>
 			</span>
 </div>

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

@@ -211,7 +211,7 @@
 	<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 type="button"  id="Button" onclick="copyText()" style="height: 40px;" class="layui-btn layui-btn-xs layui-btn-primary"><i class="fa fa-search"> 查询</i>
 				 </button>
 			</span>
 	</div>

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

@@ -211,7 +211,7 @@
 	<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 type="button"  id="Button" onclick="copyText()" style="height: 40px;" class="layui-btn layui-btn-xs layui-btn-primary"><i class="fa fa-search"> 查询</i>
 				 </button>
 			</span>
 	</div>

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

@@ -190,7 +190,7 @@
 				<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="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<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>
@@ -222,10 +222,14 @@
 </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)
+				layui.form.render();
+
+			}
+			$("#opinion").val("");
 		})
 		layui.use(['form', 'layer'], function () {
 			var form = layui.form;

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

@@ -213,7 +213,7 @@
                     <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="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+                            <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>
@@ -258,6 +258,8 @@
                 var s=$("input[name='sh']").length;
                 for(var i=0;i<s;i++){
                     $("input[name='sh']").attr("checked",false)
+                    layui.form.render();
+
                 }
                 $("#opinion").val("");
             })

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

@@ -235,7 +235,7 @@
 				<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="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<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>
@@ -271,6 +271,8 @@
 			var s=$("input[name='sh']").length;
 			for(var i=0;i<s;i++){
 				$("input[name='sh']").attr("checked",false)
+				layui.form.render();
+
 			}
 			$("#opinion").val("");
 		})

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

@@ -157,7 +157,7 @@
 				<div class="layui-item layui-col-sm12  with-textarea">
 					<label class="layui-form-label">说明：</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入说明" path="instruction" htmlEscape="false" rows="4"    class="form-control "/>
+						<form:textarea placeholder="请输入说明:" path="instruction" htmlEscape="false" rows="4"    class="form-control "/>
 					</div>
 				</div>
 			</div>

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

@@ -567,7 +567,7 @@
 				<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="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+						<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>
@@ -678,6 +678,7 @@
 							var s=$("input[name='sh']").length;
 							for(var i=0;i<s;i++){
 								$("input[name='sh']").attr("checked",false)
+								layui.form.render();
 							}
 							$("#opinion").val("");
 						})

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

@@ -432,7 +432,7 @@
 			<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="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+					<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>
@@ -479,6 +479,7 @@
 			var s=$("input[name='sh']").length;
 			for(var i=0;i<s;i++){
 				$("input[name='sh']").attr("checked",false)
+				layui.form.render();
 			}
 			$("#opinion").val("");
 		})

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

@@ -751,7 +751,7 @@
                 <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="act.comment" id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
+                        <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>
@@ -797,6 +797,7 @@
             var s=$("input[name='sh']").length;
             for(var i=0;i<s;i++){
                 $("input[name='sh']").attr("checked",false)
+                layui.form.render();
             }
             $("#opinion").val("");
         })