Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp

src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -146,6 +146,8 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private Integer borrowNotifyFlag; //借用代办判定条件
 	private String borrowNotifyId; //借用代办判定条件
 
+	private String contractInformation; //合同金额类别
+
 	public String getBeginInvestmentAmount() {
 		return beginInvestmentAmount;
 	}
@@ -1044,4 +1046,12 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setBorrowNotifyId(String borrowNotifyId) {
 		this.borrowNotifyId = borrowNotifyId;
 	}
+
+	public String getContractInformation() {
+		return contractInformation;
+	}
+
+	public void setContractInformation(String contractInformation) {
+		this.contractInformation = contractInformation;
+	}
 }

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

@@ -102,6 +102,8 @@ import com.jeeplus.modules.workchangejob.entity.WorkChangeJobUser;
 import com.jeeplus.modules.workchangejob.service.WorkChangeJobService;
 import com.jeeplus.modules.workchangejob.service.WorkChangeJobUserService;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkCntractBorrow;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractBorrowService;
@@ -318,6 +320,8 @@ public class WorkProjectNotifyController extends BaseController {
 	@Autowired
 	private WorkContractInfoService workContractInfoService;
 	@Autowired
+	private WorkClientInfoService workClientInfoService;
+	@Autowired
 	private WorkFullPayService workFullPayService;
 	@Autowired
 	private WorkAskCheckPriceService workAskCheckPriceService;
@@ -475,6 +479,8 @@ public class WorkProjectNotifyController extends BaseController {
 	private RuralProjectRecordsReportedDao ruralProjectRecordsReportedDao;
 	@Autowired
 	private ProjectEngineeringService engineeringService;
+	@Autowired
+	private SubProjectInfoService subProjectInfoService;
 
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required=false) String id) {
@@ -1982,12 +1988,24 @@ public class WorkProjectNotifyController extends BaseController {
 					}else{
 						projectcontentinfo.setHome("home");
 					}
+					//获取子项目列表信息
+					List<SubProjectInfo> subProjectInfos=this.queryReportDetails(projectcontentinfo.getProject().getId());
+					//获取合同信息
+					WorkContractInfo workContractInfo=this.queryWorkContract(projectcontentinfo.getProject().getId());
+					//查询合同对应委托方客户信息
+					if(null != workContractInfo){
+						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+						model.addAttribute("workClientInfo", clientInfo);
+					}
 					model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
 					model.addAttribute("projectId", projectcontentinfo.getProject().getId());
 					model.addAttribute("id", projectcontentinfo.getId());
 					model.addAttribute("projectcontentinfo", projectcontentinfo);
 					model.addAttribute("projectRecords", ruralProjectRecords);
 					model.addAttribute("consultantinfo", consultants);
+					model.addAttribute("subProjectInfos", subProjectInfos);
+					model.addAttribute("workContractInfo", workContractInfo);
+
 					WorkReviewAudit workReviewAudit = new WorkReviewAudit();
 					String type = "";
 					if ("master".equals(act.getTaskDefKey())) {
@@ -2115,12 +2133,23 @@ public class WorkProjectNotifyController extends BaseController {
 					}else{
 						projectcontentinfo.setHome("home");
 					}
+					//获取子项目列表信息
+					List<SubProjectInfo> subProjectInfos=this.queryReportDetails(projectcontentinfo.getProject().getId());
+					//获取合同信息
+					WorkContractInfo workContractInfo=this.queryWorkContract(projectcontentinfo.getProject().getId());
+					//查询合同对应委托方客户信息
+					if(null != workContractInfo){
+						WorkClientInfo clientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+						model.addAttribute("workClientInfo", clientInfo);
+					}
 					model.addAttribute("processInstanceId",projectReportData.getProcessInstanceId());
 					model.addAttribute("projectId", projectcontentinfo.getProject().getId());
 					model.addAttribute("id", projectcontentinfo.getId());
 					model.addAttribute("projectcontentinfo", projectcontentinfo);
 					model.addAttribute("projectRecords", ruralProjectRecords);
 					model.addAttribute("consultantinfo", consultants);
+					model.addAttribute("subProjectInfos", subProjectInfos);
+					model.addAttribute("workContractInfo", workContractInfo);
 					WorkReviewAudit workReviewAudit = new WorkReviewAudit();
 					String type = "";
 					if ("master".equals(act.getTaskDefKey())) {
@@ -4038,5 +4067,36 @@ public class WorkProjectNotifyController extends BaseController {
 		return map;
 	}
 
+	/**
+	 * 查询报告审核子项目详细信息
+	 */
+	public List<SubProjectInfo> queryReportDetails(String projectId){
+		RuralProjectRecords projectRecords=new RuralProjectRecords();
+		if (null!=projectId){
+			projectRecords = ruralProjectRecordsService.get(projectId);
+		}
+		//获取子项目信息
+		SubProjectInfo subProjectInfo=new SubProjectInfo();
+		subProjectInfo.setParentProId(projectId);
+		subProjectInfo.setProjectType(projectRecords.getProjectType());
+		List<SubProjectInfo> recordsList = subProjectInfoService.findList(subProjectInfo);
+		for (SubProjectInfo info: recordsList) {
+			info.setProjectType(subProjectInfo.getProjectType());
+		}
+		return recordsList;
+	}
+	/**
+	 * 查询报告审核客户合同详细信息
+	 */
+	public WorkContractInfo queryWorkContract(String projectId){
+		RuralProjectRecords projectRecords=new RuralProjectRecords();
+		if (null!=projectId){
+			projectRecords = ruralProjectRecordsService.get(projectId);
+		}
+		//获取合同信息
+		WorkContractInfo workContractInfo = workContractInfoService.get(projectRecords.getWorkContractInfo().getId());
+		return workContractInfo;
+	}
+
 
 }

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -61,7 +61,8 @@
 		a.completion_status AS "completionStatus",
 		a.signature_status as "signatureStatus",
 		a.office_id AS "officeId",
-		(select count(1) from work_contract_info c where c.total_contract_id = a.id)  cnt
+		(select count(1) from work_contract_info c where c.total_contract_id = a.id)  cnt,
+		a.contract_information AS "contractInformation"
 	</sql>
 	
 	<sql id="workContractInfoJoins">
@@ -134,6 +135,7 @@
 		a.signature_status as "signatureStatus",
 		a.charge_criterion as "chargeCriterion",
 		a.other_details as "otherDetails",
+		a.contract_information as "contractInformation",
 		wcr.file_num as "fileNum",
 		wcr.file_num_tow as "fileNumTow"
 		FROM work_contract_info a
@@ -908,7 +910,8 @@
 			signature_status,
 			contract_num_path,
 			charge_criterion,
-			other_details
+			other_details,
+			contract_information
 		) VALUES (
 			#{id},
 			#{project.id},
@@ -965,7 +968,8 @@
 			#{signatureStatus},
 			#{contractNumPath},
 			#{chargeCriterion},
-			#{otherDetails}
+			#{otherDetails},
+			#{contractInformation}
 		)
 	</insert>
 	
@@ -1021,8 +1025,8 @@
 			signature_status=#{signatureStatus},
 			contract_num_path=#{contractNumPath},
 			charge_criterion=#{chargeCriterion},
-			other_details=#{otherDetails}
-
+			other_details=#{otherDetails},
+			contract_information=#{contractInformation}
 		WHERE id = #{id}
 	</update>
 

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

@@ -815,9 +815,9 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
+						<label class="layui-form-label">合同价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control judgment layui-input number"/>
+							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>
 						</div>
 					</div>
 					<%--<c:choose>
@@ -1520,7 +1520,7 @@
 			layui.form.on('select(zixunOpinion)', function(data){
 				var span=data.value;
 				if(span!=""){
-					var opinion=$("#zixunOpinion").val()+span+";"
+					var opinion=$("#zixunOpinion").val()+span
 					$("#zixunOpinion").val(opinion);
 				}
 			});
@@ -1528,14 +1528,14 @@
 				var span=data.value;
 				if(span!=""){
 					$(this).attr("checked",false)
-					var opinion=$("#zixunOpinion").val()+span+";"
+					var opinion=$("#zixunOpinion").val()+span
 					$("#zixunOpinion").val(opinion);
 				}
 			});
 			layui.form.on('select(fuzerenOpinion)', function(data){
 				var span=data.value;
 				if(span!=""){
-					var opinion=$("#fuzerenOpinion").val()+span+";"
+					var opinion=$("#fuzerenOpinion").val()+span
 					$("#fuzerenOpinion").val(opinion);
 				}
 			});
@@ -1543,7 +1543,7 @@
 				var span=data.value;
 				if(span!=""){
 					$(this).attr("checked",false)
-					var opinion=$("#fuzerenOpinion").val()+span+";"
+					var opinion=$("#fuzerenOpinion").val()+span
 					$("#fuzerenOpinion").val(opinion);
 				}
 			});

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

@@ -767,9 +767,9 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
+						<label class="layui-form-label">合同价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
+							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
@@ -1440,7 +1440,7 @@
 			layui.form.on('select(zixunOpinion)', function(data){
 				var span=data.value;
 				if(span!=""){
-					var opinion=$("#zixunOpinion").val()+span+";"
+					var opinion=$("#zixunOpinion").val()+span
 					$("#zixunOpinion").val(opinion);
 				}
 			});
@@ -1448,14 +1448,14 @@
 				var span=data.value;
 				if(span!=""){
 					$(this).attr("checked",false)
-					var opinion=$("#zixunOpinion").val()+span+";"
+					var opinion=$("#zixunOpinion").val()+span
 					$("#zixunOpinion").val(opinion);
 				}
 			});
 			layui.form.on('select(fuzerenOpinion)', function(data){
 				var span=data.value;
 				if(span!=""){
-					var opinion=$("#fuzerenOpinion").val()+span+";"
+					var opinion=$("#fuzerenOpinion").val()+span
 					$("#fuzerenOpinion").val(opinion);
 				}
 			});
@@ -1463,7 +1463,7 @@
 				var span=data.value;
 				if(span!=""){
 					$(this).attr("checked",false)
-					var opinion=$("#fuzerenOpinion").val()+span+";"
+					var opinion=$("#fuzerenOpinion").val()+span
 					$("#fuzerenOpinion").val(opinion);
 				}
 			});

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

@@ -503,9 +503,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
+                    <label class="layui-form-label">合同价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input"/>
+                        <form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">

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

@@ -7,6 +7,7 @@
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
 	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+	<script src="${ctxStatic}/common/html/js/script.js"></script>
 	<%@include file="/webpage/include/treetable.jsp" %>
 
 	<style>
@@ -21,80 +22,86 @@
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
             if(validateForm.form()){
 				var projectId = '${projectRecords.id}';
-				var leng = $("#file_attachment tr").length;
-				var leng1 = $("#reportedConsultantList tr").length;
 				var boolFlag = true;
-				var startDate = new Date($("#startDate").val());
-				var endingDate = new Date($("#endingDate").val());
-				var bzshbUserId = $("#bzshbUserId").val();
-				if(bzshbUserId == undefined || bzshbUserId ==null || bzshbUserId ==''){
-					parent.layer.msg("请选择审核人员!", {icon: 5});
-					return false;
-				}
-				if(startDate.getTime() > endingDate.getTime()){
-					parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
-					return false;
-				}
-				if (leng1==0){
-					top.layer.msg("请添加咨询员信息！", {icon: 0});
-					return false;
-				}
-				for(var i=0; i<leng; i++) {
-					var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
-					var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
-					var name = $("#file_attachment tr").eq(i).find("td:eq(2)").html();
-					var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
-					if(second == 1){
-					if(numberStr != undefined && numberStr !=null && numberStr !=''){
-						if (fileFlag==1){
-
-						}else{
-							top.layer.msg("请上传成果文件！", {icon: 0});
+				if(boolFlag){
+					if(obj == 1){
+						var leng = $("#file_attachment tr").length;
+						var leng1 = $("#reportedConsultantList tr").length;
+						var startDate = new Date($("#startDate").val());
+						var endingDate = new Date($("#endingDate").val());
+						var bzshbUserId = $("#bzshbUserId").val();
+						if(bzshbUserId == undefined || bzshbUserId ==null || bzshbUserId ==''){
+							parent.layer.msg("请选择审核人员!", {icon: 5});
 							return false;
 						}
-					}
-					}
-				}
-				if(boolFlag){
-					var gistdata = $("#file_gistdata tr").length;
-					for(var i=0; i<gistdata; i++) {
-						var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
-						var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
-						if(second == 1){
-						if(numberStr != undefined && numberStr !=null && numberStr !=''){
-							if (fileFlag==1){
+						if(startDate.getTime() > endingDate.getTime()){
+							parent.layer.msg("工作开始日期不得大于工作结束日期!", {icon: 5});
+							return false;
+						}
+						if (leng1==0){
+							top.layer.msg("请添加咨询员信息！", {icon: 0});
+							return false;
+						}
+						for(var i=0; i<leng; i++) {
+							var numberStr = $("#file_attachment tr").eq(i).find("td:first").html();
+							var second = $("#file_attachment tr").eq(i).find("td:eq(1)").html();
+							var name = $("#file_attachment tr").eq(i).find("td:eq(2)").html();
+							var fileFlag = $("#file_attachment tr").eq(i).find("td:last").html();
+							if(second == 1){
+								if(numberStr != undefined && numberStr !=null && numberStr !=''){
+									if (fileFlag==1){
 
-							}else{
-								top.layer.msg("请上传依据性文件！", {icon: 0});
-								return false;
+									}else{
+										top.layer.msg("请上传成果文件！", {icon: 0});
+										return false;
+									}
+								}
 							}
 						}
+						if(boolFlag){
+							var gistdata = $("#file_gistdata tr").length;
+							for(var i=0; i<gistdata; i++) {
+								var numberStr = $("#file_gistdata tr").eq(i).find("td:first").html();
+								var second = $("#file_gistdata tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_gistdata tr").eq(i).find("td:last").html();
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
+
+										}else{
+											top.layer.msg("请上传依据性文件！", {icon: 0});
+											return false;
+										}
+									}
+								}
+							}
 						}
-					}
-				}
-				if(boolFlag){
-					var other = $("#ile_other tr").length;
-					for(var i=0; i<other; i++) {
-						var numberStr = $("#ile_other tr").eq(i).find("td:first").html();
-						var second = $("#ile_other tr").eq(i).find("td:eq(1)").html();
-						var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
-						if(second == 1){
-						if(numberStr != undefined && numberStr !=null && numberStr !=''){
-							if (fileFlag==1){
+						if(boolFlag){
+							var other = $("#ile_other tr").length;
+							for(var i=0; i<other; i++) {
+								var numberStr = $("#ile_other tr").eq(i).find("td:first").html();
+								var second = $("#ile_other tr").eq(i).find("td:eq(1)").html();
+								var fileFlag = $("#file_other tr").eq(i).find("td:last").html();
+								if(second == 1){
+									if(numberStr != undefined && numberStr !=null && numberStr !=''){
+										if (fileFlag==1){
 
-							}else{
-								top.layer.msg("请上传其它文件！", {icon: 0});
-								return false;
+										}else{
+											top.layer.msg("请上传其它文件！", {icon: 0});
+											return false;
+										}
+									}
+								}
 							}
 						}
+						var flags=judgment();
+						if (!flags){
+							return flags;
+						}else{
+							$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessageNew/saveReport");
 						}
-					}
-				}
-				if(boolFlag){
-					if(obj == 1){
-						$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessageNew/saveReport");
 					}else{
+
 						$("#inputForm").attr("action","${ctx}/ruralProject/ruralProjectMessageNew/holdSaveReport");
 					}
 					$("#inputForm").submit();
@@ -749,19 +756,19 @@
 					<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">
-							<form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getFee()" onblur="getAttachment()"/>
+							<form:input placeholder="请输入送审价" id="reviewFee" path="projectReportData.reviewFee" htmlEscape="false"  class="form-control judgment layui-input number" onchange="getFee()" onblur="getAttachment()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label"><span class="require-item">*</span>审定价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required layui-input number" onchange="getApprovalFee()"/>
+							<form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control judgment layui-input number" onchange="getApprovalFee()"/>
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
-						<label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
+						<label class="layui-form-label">合同价(元)：</label>
 						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
+							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>
 						</div>
 					</div>
 					<%--<c:choose>
@@ -795,7 +802,7 @@
 					<div class="layui-item layui-col-sm6 lw7">
 						<label class="layui-form-label"><span class="require-item">*</span>审核人员：</label>
 						<div class="layui-input-block">
-							<select class="form-control required layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
+							<select class="form-control judgment layui-input" id="bzshbUserId"  name="projectReportData.bzshbUserId">
 								<option value=""/>
 								<c:forEach items="${projectRecords.bzshbUserList}" var="user" varStatus="status">
 									<option value="${user.id}" <c:if test="${projectcontentinfo.projectReportData.bzshbUserId eq user.id }">selected</c:if>>${user.name}</option>
@@ -864,7 +871,7 @@
 					<label class="layui-form-label"><span class="require-item">*</span>专业咨询员：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:inquireselectUser id="consultant" name="projectReportData.consultant.id" value="${projectReportData.consultant.id}" labelName="projectReportData.consultant.name" labelValue="${projectReportData.consultant.name}"
-										cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+										cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7">
@@ -872,7 +879,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 judgment" 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>
@@ -890,14 +897,14 @@
 								</div>
 							</div>
 						</div>
-<%--						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>--%>
+<%--						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control judgment"/>--%>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6 lw7" style="margin-top: 20px;">
 					<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${projectRecords.projectMasterId}" labelName="projectReportData.principal.name" labelValue="${projectRecords.projectMasterName}"
-									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control judgment layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
@@ -905,7 +912,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 judgment" 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>
@@ -923,7 +930,7 @@
 									</div>
 								</div>
 							</div>
-<%--						<form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>--%>
+<%--						<form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control judgment"/>--%>
 					</div>
 				</div>
 			</div>
@@ -1065,7 +1072,7 @@
 								<td style="display:none">${fileAttachment.fileFlag}</td>
 							</tr>
 							<c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_attachment_tr">
+								<tr class="file_attachment_${fileAttachment.id}_tr">
 									<td></td>
 									<c:choose>
 										<c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -1208,7 +1215,7 @@
 								<td style="display:none">${fileGistdata.fileFlag}</td>
 							</tr>
 							<c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_gistdata_tr">
+								<tr class="file_gistdata_${fileGistdata.id}_tr">
 									<td></td>
 									<c:choose>
 										<c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -1349,7 +1356,7 @@
 								<td style="display:none">${fileOther.fileFlag}</td>
 							</tr>
 							<c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_other_tr">
+								<tr class="file_other_${fileOther.id}_tr">
 									<td></td>
 									<c:choose>
 										<c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -1467,7 +1474,7 @@
 			layui.form.on('select(zixunOpinion)', function(data){
 				var span=data.value;
 				if(span!=""){
-					var opinion=$("#zixunOpinion").val()+span+";"
+					var opinion=$("#zixunOpinion").val()+span
 					$("#zixunOpinion").val(opinion);
 				}
 			});
@@ -1475,14 +1482,14 @@
 				var span=data.value;
 				if(span!=""){
 					$(this).attr("checked",false)
-					var opinion=$("#zixunOpinion").val()+span+";"
+					var opinion=$("#zixunOpinion").val()+span
 					$("#zixunOpinion").val(opinion);
 				}
 			});
 			layui.form.on('select(fuzerenOpinion)', function(data){
 				var span=data.value;
 				if(span!=""){
-					var opinion=$("#fuzerenOpinion").val()+span+";"
+					var opinion=$("#fuzerenOpinion").val()+span
 					$("#fuzerenOpinion").val(opinion);
 				}
 			});
@@ -1490,7 +1497,7 @@
 				var span=data.value;
 				if(span!=""){
 					$(this).attr("checked",false)
-					var opinion=$("#fuzerenOpinion").val()+span+";"
+					var opinion=$("#fuzerenOpinion").val()+span
 					$("#fuzerenOpinion").val(opinion);
 				}
 			});

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

@@ -608,9 +608,9 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
-                    <label class="layui-form-label"><span class="require-item">*</span>合同价(元)：</label>
+                    <label class="layui-form-label">合同价(元)：</label>
                     <div class="layui-input-block with-icon">
-                        <form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input"/>
+                        <form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -689,9 +689,9 @@
                         </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;"><input type="checkbox" lay-filter="zxraopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+                                <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="zxraopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+                                <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="zxraopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
                                 <div style="padding: 5px 0px;">
                                     <form:select path="projectReportData.consultantRemarks" id="auditOpinion" lay-filter="zixunOpinion" lay-verify="zixunOpinion" class="form-control simple-select">
                                         <form:option value=""/>
@@ -1208,22 +1208,22 @@
             layui.form.on('select(zixunOpinion)', function(data){
                 var span=data.value;
                 if(span!=""){
-                    var opinion=$("#zixunOpinion").val()+span+";"
+                    var opinion=$("#zixunOpinion").val()+span
                     $("#zixunOpinion").val(opinion);
                 }
             });
-            layui.form.on('checkbox(raopinion)', function(data){
+            layui.form.on('checkbox(zxraopinion)', function(data){
                 var span=data.value;
                 if(span!=""){
                     $(this).attr("checked",false)
-                    var opinion=$("#zixunOpinion").val()+span+";"
+                    var opinion=$("#zixunOpinion").val()+span
                     $("#zixunOpinion").val(opinion);
                 }
             });
             layui.form.on('select(fuzerenOpinion)', function(data){
                 var span=data.value;
                 if(span!=""){
-                    var opinion=$("#fuzerenOpinion").val()+span+";"
+                    var opinion=$("#fuzerenOpinion").val()+span
                     $("#fuzerenOpinion").val(opinion);
                 }
             });
@@ -1231,7 +1231,7 @@
                 var span=data.value;
                 if(span!=""){
                     $(this).attr("checked",false)
-                    var opinion=$("#fuzerenOpinion").val()+span+";"
+                    var opinion=$("#fuzerenOpinion").val()+span
                     $("#fuzerenOpinion").val(opinion);
                 }
             });

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

@@ -38,6 +38,17 @@
                     }
                 }
             });
+            if("${workContractInfo.contractInformation}" == "1"){
+                $("#contractPrice").parent().parent().hide();
+                $("#contractPrice").removeClass("judgment")
+                $("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
+                $("#otherDetails").attr("class","form-control layui-input judgment")
+            }else{
+                $("#contractPrice").parent().parent().show();
+                $("#contractPrice").attr("class","form-control judgment number layui-input")
+                $("#chargeCriterionList").find("label").eq(0).html("收费标准：")
+                $("#otherDetails").attr("class","form-control layui-input")
+            }
         });
 	</script>
 </head>
@@ -100,15 +111,22 @@
                                     </div>
                                 </div>
                                 <div class="layui-item layui-col-sm6">
+                                    <label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
+                                    <div class="layui-input-block">
+                                        <input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" disabled id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
+                                        <input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+                                    </div>
+                                </div>
+                                <div class="layui-item layui-col-sm6">
                                     <label class="layui-form-label double-line">合同金额(元)预计金额：</label>
                                     <div class="layui-input-block">
                                         <input htmlEscape="false" id="contractPrice" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
                                     </div>
-                                    <shiro:hasPermission name="workcontractinfo:workContractInfo:contractPrice">
-                                        <c:if test="${fns:getUser().office.id eq workContractInfo.officeId && workContractInfo.contractState < 10}">
-                                            <a onclick="openDialogre('修改合同金额', '${ctx}/workcontractinfo/workContractInfo/formContractPrice?id=${workContractInfo.id}','50%','300px',false,'inputForm')", class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-edit"></i> 修改</a>
-                                        </c:if>
-                                    </shiro:hasPermission>
+<%--                                    <shiro:hasPermission name="workcontractinfo:workContractInfo:contractPrice">--%>
+<%--                                        <c:if test="${fns:getUser().office.id eq workContractInfo.officeId && workContractInfo.contractState < 10}">--%>
+<%--                                            <a onclick="openDialogre('修改合同金额', '${ctx}/workcontractinfo/workContractInfo/formContractPrice?id=${workContractInfo.id}','50%','300px',false,'inputForm')", class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-edit"></i> 修改</a>--%>
+<%--                                        </c:if>--%>
+<%--                                    </shiro:hasPermission>--%>
                                 </div>
                                 <div class="layui-item layui-col-sm6">
                                     <label class="layui-form-label ">对方合同编号：</label>
@@ -116,7 +134,7 @@
                                         <input htmlEscape="false"  readonly="true" class="form-control layui-input" value="${workContractInfo.anotherContractNum}"/>
                                     </div>
                                 </div>
-                                <div class="layui-item layui-col-sm12">
+                                <div class="layui-item layui-col-sm12" id="chargeCriterionList" >
                                     <label class="layui-form-label">收费标准</label>
                                     <div class="layui-input-block">
                                         <form:checkboxes path="chargeCriterionList" disabled="true" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="false" items="${fns:getMainDictList('charge_criterion')}" />
@@ -125,7 +143,7 @@
                                 <div class="layui-item layui-col-sm12">
                                     <label class="layui-form-label "><!--其他详情：--></label>
                                     <div class="layui-input-block">
-                                        <form:input path="otherDetails" readonly="true" htmlEscape="false" class="form-control layui-input"/>
+                                        <form:input path="otherDetails" id="otherDetails"  readonly="true" htmlEscape="false" class="form-control layui-input"/>
                                     </div>
                                 </div>
                                 <%--<div class="layui-item layui-col-sm6">

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

@@ -102,6 +102,19 @@
             }else{
                 $("#ext").iCheck('check')
             }
+			if("${workContractInfo.contractInformation}" == "1"){
+				$("#contractPrice").parent().parent().hide();
+				$("#contractPrice").removeClass("judgment")
+				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
+				$("#otherDetails").attr("class","form-control layui-input judgment")
+			}else{
+				$("#contractPrice").parent().parent().show();
+				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
+				$("#otherDetails").attr("class","form-control layui-input")
+			}
+
+
 
             // getRandom();
             $("#contractFee").change(function(){
@@ -655,9 +668,16 @@
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
+								<div class="layui-input-block">
+									<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" checked id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
+									<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额 (元)<br/>预计金额：</label>
 								<div class="layui-input-block">
-									<form:input path="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control judgment number  layui-input"/>
+									<form:input path="contractPrice" id="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control judgment number  layui-input"/>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
@@ -666,8 +686,8 @@
 									<form:input path="anotherContractNum" placeholder="请输入对方合同编号" htmlEscape="false" class="form-control layui-input"/>
 								</div>
 							</div>
-							<div class="layui-item layui-col-sm12">
-								<label class="layui-form-label">收费标准</label>
+							<div class="layui-item layui-col-sm12" id="chargeCriterionList" >
+								<label class="layui-form-label">收费标准：</label>
 								<div class="layui-input-block">
 									<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="true" items="${fns:getMainDictList('charge_criterion')}" />
 <%--									<form:checkboxes path="chargeCriterionList" cssStyle="display: none;" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="value" htmlEscape="true" items="${fns:getMainDictList('charge_criterion')}" />--%>
@@ -902,6 +922,21 @@
 				// 	$("#otherDetails").val(ids);
 				// }
 			});
+			layui.form.on('radio(jine)', function(data){
+				var span=data.value;
+				if(span==1){
+					$("#contractPrice").parent().parent().hide();
+					$("#contractPrice").removeClass("judgment")
+					$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
+					$("#otherDetails").attr("class","form-control layui-input judgment")
+
+				}else{
+					$("#contractPrice").parent().parent().show();
+					$("#contractPrice").attr("class","form-control judgment number layui-input")
+					$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
+					$("#otherDetails").attr("class","form-control layui-input")
+				}
+			})
 		});
 	</script>
 	<script type="text/javascript">

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

@@ -96,6 +96,19 @@
             }else{
                 $("#ext").iCheck('check')
             }
+			//判定合同金额类别
+			if("${workContractInfo.contractInformation}" == "1"){
+				$("#contractPrice").parent().parent().hide();
+				$("#contractPrice").removeClass("judgment")
+				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
+				$("#otherDetails").attr("class","form-control layui-input judgment")
+			}else{
+				$("#contractPrice").parent().parent().show();
+				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
+				$("#otherDetails").attr("class","form-control layui-input")
+			}
+
 
             laydate.render({
                 elem: '#contractDate',
@@ -598,9 +611,16 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
+							<div class="layui-input-block">
+								<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" readonly id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
+								<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" readonly id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额(元)预计金额：</label>
 							<div class="layui-input-block">
-								<form:input placeholder="请输入合同金额" path="contractPrice" htmlEscape="false"     pattern="#.00" class="form-control required number  layui-input"/>
+								<form:input placeholder="请输入合同金额" path="contractPrice" id="contractPrice" htmlEscape="false"     pattern="#.00" class="form-control required number  layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
@@ -609,7 +629,7 @@
 								<form:input placeholder="请输入对方合同编号" path="anotherContractNum" htmlEscape="false" class="form-control layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item layui-col-sm12">
+						<div class="layui-item layui-col-sm12" id="chargeCriterionList">
 							<label class="layui-form-label">收费标准</label>
 							<div class="layui-input-block">
 								<form:checkboxes path="chargeCriterionList" lay-filter="chargeCriterionList" lay-skin="primary" itemLabel="label" itemValue="label" htmlEscape="true" items="${fns:getMainDictList('charge_criterion')}" />
@@ -1013,6 +1033,21 @@
 					$("#otherDetails").val(zhi);
 				// }
 			});
+			layui.form.on('radio(jine)', function(data){
+				var span=data.value;
+				if(span==1){
+					$("#contractPrice").parent().parent().hide();
+					$("#contractPrice").removeClass("judgment")
+					$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
+					$("#otherDetails").attr("class","form-control layui-input judgment")
+
+				}else{
+					$("#contractPrice").parent().parent().show();
+					$("#contractPrice").attr("class","form-control judgment number layui-input")
+					$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
+					$("#otherDetails").attr("class","form-control layui-input")
+				}
+			})
 		});
 	</script>
 </div>

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

@@ -108,7 +108,19 @@
             }
             return str;
         }
-
+		$(document).ready(function() {
+			if("${workContractInfo.contractInformation}" == "1"){
+				$("#contractPrice").parent().parent().hide();
+				$("#contractPrice").removeClass("judgment")
+				$("#chargeCriterionList").find("label").eq(0).html("<span class=\"require-item\">*</span>收费标准：")
+				$("#otherDetails").attr("class","form-control layui-input judgment")
+			}else{
+				$("#contractPrice").parent().parent().show();
+				$("#contractPrice").attr("class","form-control judgment number layui-input")
+				$("#chargeCriterionList").find("label").eq(0).html("收费标准：")
+				$("#otherDetails").attr("class","form-control layui-input")
+			}
+		})
     </script>
 </head>
 <body>
@@ -160,15 +172,22 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
+							<div class="layui-input-block">
+								<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" disabled id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
+								<input type="radio" title="框架合同" lay-filter="jine" name="contractInformation" disabled id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label double-line">合同金额(元)预计金额：</label>
 							<div class="layui-input-block">
 								<input htmlEscape="false" id="contractPrice" readonly="true" class="form-control layui-input" value="<fmt:formatNumber value="${workContractInfo.contractPrice}" pattern="#,#00.00"/>"/>
 							</div>
-							<shiro:hasPermission name="workcontractinfo:workContractInfo:contractPrice">
-								<c:if test="${fns:getUser().office.id eq workContractInfo.officeId && workContractInfo.contractState < 10}">
-									<a onclick="openDialogre('修改合同金额', '${ctx}/workcontractinfo/workContractInfo/formContractPrice?id=${workContractInfo.id}','50%','300px',false,'inputForm')", class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-edit"></i> 修改</a>
-								</c:if>
-							</shiro:hasPermission>
+<%--							<shiro:hasPermission name="workcontractinfo:workContractInfo:contractPrice">--%>
+<%--								<c:if test="${fns:getUser().office.id eq workContractInfo.officeId && workContractInfo.contractState < 10}">--%>
+<%--									<a onclick="openDialogre('修改合同金额', '${ctx}/workcontractinfo/workContractInfo/formContractPrice?id=${workContractInfo.id}','50%','300px',false,'inputForm')", class="nav-btn nav-btn-add" style="margin-right: 0px;top:0px;right:16px;position: absolute;height:40px;line-height: 40px;"><i class="fa fa-edit"></i> 修改</a>--%>
+<%--								</c:if>--%>
+<%--							</shiro:hasPermission>--%>
 						</div>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label ">对方合同编号：</label>