新增报告，报告信息里面的 合同价区分，金额合同和费率合同；

src/main/java/com/jeeplus/modules/projectcontentinfo/entity/ProjectReportData.java

@@ -114,6 +114,9 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	private String technicistRemarks;  //项目技术员意见
 	private Date technicistDate;  //项目技术员审核时间
 
+	private String contractCategory;	//报告合同类别
+	private String contractRate;	//合同费率
+
 
 	public String getUpId() {
 		return upId;
@@ -724,4 +727,20 @@ public class ProjectReportData extends ActEntity<ProjectReportData> {
 	public void setTechnicistDate(Date technicistDate) {
 		this.technicistDate = technicistDate;
 	}
+
+	public String getContractCategory() {
+		return contractCategory;
+	}
+
+	public void setContractCategory(String contractCategory) {
+		this.contractCategory = contractCategory;
+	}
+
+	public String getContractRate() {
+		return contractRate;
+	}
+
+	public void setContractRate(String contractRate) {
+		this.contractRate = contractRate;
+	}
 }

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataDao.xml

@@ -50,8 +50,9 @@
 		a.technicist_remarks as "technicistRemarks",
 		a.consultant_date as "consultantDate",
 		a.principal_date as "principalDate",
-		a.technicist_date as "technicistDate"
-
+		a.technicist_date as "technicistDate",
+		a.contract_category as "contractCategory",
+		a.contract_rate as "contractRate"
 	</sql>
 
 	<sql id="projectReportDataJoins">
@@ -557,7 +558,9 @@
 			principal_remarks,
 			consultant_date,
 			principal_date,
-			technicist_date
+			technicist_date,
+			contract_category,
+			contract_rate
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -601,7 +604,9 @@
 			#{principalRemarks},
 			#{consultantDate},
 			#{principalDate},
-			#{technicistDate}
+			#{technicistDate},
+			#{contractCategory},
+			#{contractRate}
 		)
 	</insert>
 
@@ -696,7 +701,9 @@
 		principal_id = #{principal.id},
 		principal_remarks = #{principalRemarks},
 		technicist_id = #{technicist.id},
-		technicist_remarks = #{technicistRemarks}
+		technicist_remarks = #{technicistRemarks},
+		contract_category = #{contractCategory},
+		contract_rate = #{contractRate}
 		WHERE id = #{id}
 	</update>
 

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

@@ -232,6 +232,15 @@
 					tips: 3
 				});
 			})
+			if ("${projectReportData.contractCategory}" !=null){
+				if("${projectReportData.contractCategory}"=='1'){
+					$("#contractFee").parent().parent().hide();
+					$("#contractRate").parent().parent().show();
+				}else if("${projectReportData.contractCategory}"=='0'){
+					$("#contractFee").parent().parent().show();
+					$("#contractRate").parent().parent().hide();
+				}
+			}
         });
         function hasInArr(id,idArr) {
             for(var i=0;i<idArr.length;i++){
@@ -870,12 +879,25 @@
 							<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">合同价(元)：</label>
-						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input number"/>
-						</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同类别：</label>
+					<div class="layui-input-block with-icon">
+						<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+						<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
 					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<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 layui-input number"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6" style="display: none;">
+					<label class="layui-form-label">费率合同(费率)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  class="form-control layui-input "/>
+					</div>
+				</div>
 					<%--<c:choose>
 						<c:when test="${not empty projectcontentinfo.projectReportData.bzshbUserId}">
 							<div class="layui-item layui-col-sm6 lw7">
@@ -1645,6 +1667,16 @@
 					$("#fuzerenOpinion").val(opinion);
 				}
 			});
+			layui.form.on('radio(jine)', function(data){
+				var span=data.value;
+				if(span==1){
+					$("#contractFee").parent().parent().hide();
+					$("#contractRate").parent().parent().show();
+				}else{
+					$("#contractFee").parent().parent().show();
+					$("#contractRate").parent().parent().hide();
+				}
+			})
 		});
 	})
 </script>

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

@@ -213,6 +213,15 @@
 					tips: 3
 				});
 			})
+			if ("${projectReportData.contractCategory}" !=null){
+				if("${projectReportData.contractCategory}"=='1'){
+					$("#contractFee").parent().parent().hide();
+					$("#contractRate").parent().parent().show();
+				}else if("${projectReportData.contractCategory}"=='0'){
+					$("#contractFee").parent().parent().show();
+					$("#contractRate").parent().parent().hide();
+				}
+			}
         });
         function hasInArr(id,idArr) {
             for(var i=0;i<idArr.length;i++){
@@ -771,12 +780,26 @@
 							<form:input placeholder="请输入审定价" id="approvalFee" path="projectReportData.approvalFee" htmlEscape="false"  class="form-control required 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>
-						<div class="layui-input-block with-icon">
-							<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control required layui-input number"/>
-						</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同类别：</label>
+					<div class="layui-input-block with-icon">
+						<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+						<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+							<%--							<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">
+					<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 layui-input number"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6" style="display: none;">
+					<label class="layui-form-label">费率合同(费率)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  class="form-control layui-input "/>
+					</div>
+				</div>
 					<div class="layui-item layui-col-sm6">
 						<label class="layui-form-label">核增核减额(元)：</label>
 						<div class="layui-input-block with-icon">
@@ -1516,6 +1539,16 @@
 					$("#fuzerenOpinion").val(opinion);
 				}
 			});
+			layui.form.on('radio(jine)', function(data){
+				var span=data.value;
+				if(span==1){
+					$("#contractFee").parent().parent().hide();
+					$("#contractRate").parent().parent().show();
+				}else{
+					$("#contractFee").parent().parent().show();
+					$("#contractRate").parent().parent().hide();
+				}
+			})
 		});
 	})
 </script>

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

@@ -61,7 +61,15 @@
                     }
                 }
             });
-
+			if ("${projectReportData.contractCategory}" !=null){
+				if("${projectReportData.contractCategory}"=='1'){
+					$("#contractFee").parent().parent().hide();
+					$("#contractRate").parent().parent().show();
+				}else if("${projectReportData.contractCategory}"=='0'){
+					$("#contractFee").parent().parent().show();
+					$("#contractRate").parent().parent().hide();
+				}
+			}
             var contractNum = $("#contractNum").val();
             if (contractNum == null || contractNum === "") {
                 $("#div1").hide();
@@ -399,9 +407,23 @@
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label">合同类别：</label>
+							<div class="layui-input-block with-icon">
+								<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+								<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+									<%--							<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">
 							<label class="layui-form-label">合同价(元)：</label>
 							<div class="layui-input-block with-icon">
-								<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+								<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false" readonly="true" class="form-control layui-input number"/>
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm6" style="display: none;">
+							<label class="layui-form-label">费率合同(费率)：</label>
+							<div class="layui-input-block with-icon">
+								<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  readonly="true" class="form-control layui-input "/>
 							</div>
 						</div>
 						<div class="layui-item layui-col-sm6">

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

@@ -135,7 +135,15 @@
                 }
 
             });
-
+            if ("${projectReportData.contractCategory}" !=null){
+                if("${projectReportData.contractCategory}"=='1'){
+                    $("#contractFee").parent().parent().hide();
+                    $("#contractRate").parent().parent().show();
+                }else if("${projectReportData.contractCategory}"=='0'){
+                    $("#contractFee").parent().parent().show();
+                    $("#contractRate").parent().parent().hide();
+                }
+            }
             var contractNum = $("#contractNum").val();
             if (contractNum == null || contractNum === "") {
                 $("#div1").hide();
@@ -503,9 +511,22 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
+                    <label class="layui-form-label">合同类别：</label>
+                    <div class="layui-input-block with-icon">
+                        <input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0"  <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+                        <input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6">
                     <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 layui-input"/>
+                        <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" style="display: none;">
+                    <label class="layui-form-label">费率合同(费率)：</label>
+                    <div class="layui-input-block with-icon">
+                        <form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  class="form-control layui-input "/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
@@ -1174,6 +1195,16 @@
                     $("#fuzerenOpinion").val(opinion);
                 }
             });
+            layui.form.on('radio(jine)', function(data){
+                var span=data.value;
+                if(span==1){
+                    $("#contractFee").parent().parent().hide();
+                    $("#contractRate").parent().parent().show();
+                }else{
+                    $("#contractFee").parent().parent().show();
+                    $("#contractRate").parent().parent().hide();
+                }
+            })
         });
     })
 </script>

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

@@ -122,6 +122,15 @@
 					tips: 3
 				});
 			})
+			if ("${projectReportData.contractCategory}" !=null){
+				if("${projectReportData.contractCategory}"=='1'){
+					$("#contractFee").parent().parent().hide();
+					$("#contractRate").parent().parent().show();
+				}else if("${projectReportData.contractCategory}"=='0'){
+					$("#contractFee").parent().parent().show();
+					$("#contractRate").parent().parent().hide();
+				}
+			}
 			layui.use(['form', 'layer'], function () {
 				var form = layui.form;
 			})
@@ -792,11 +801,25 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm6">
+						<label class="layui-form-label">合同类别：</label>
+						<div class="layui-input-block with-icon">
+								<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+								<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+<%--							<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">
 						<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 layui-input number"/>
 						</div>
 					</div>
+					<div class="layui-item layui-col-sm6" style="display: none;">
+						<label class="layui-form-label">费率合同(费率)：</label>
+						<div class="layui-input-block with-icon">
+							<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false"  class="form-control layui-input "/>
+						</div>
+					</div>
 					<%--<c:choose>
 						<c:when test="${not empty projectcontentinfo.projectReportData.bzshbUserId}">
 							<div class="layui-item layui-col-sm6 lw7">
@@ -1573,6 +1596,16 @@
 					$("#fuzerenOpinion").val(opinion);
 				}
 			});
+			layui.form.on('radio(jine)', function(data){
+				var span=data.value;
+				if(span==1){
+					$("#contractFee").parent().parent().hide();
+					$("#contractRate").parent().parent().show();
+				}else{
+					$("#contractFee").parent().parent().show();
+					$("#contractRate").parent().parent().hide();
+				}
+			})
 		});
 	})
 </script>

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

@@ -4,9 +4,14 @@
 <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"/>
 	<%@include file="/webpage/include/treetable.jsp" %>
 	<script type="text/javascript">
 		$(document).ready(function() {
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+			})
 			$("#upTable").treeTable({expandLevel : 5},{ expandable: true });
 			$("#gistdata_upTable").treeTable({expandLevel : 5},{ expandable: true });
 			$("#upTable_other").treeTable({expandLevel : 5},{ expandable: true });
@@ -34,6 +39,15 @@
 			$("#other_btn").click(function () {
 				$("#other_file").click();
 			});
+			if ("${projectReportData.contractCategory}" !=null){
+				if("${projectReportData.contractCategory}"=='1'){
+					$("#contractFee").parent().parent().hide();
+					$("#contractRate").parent().parent().show();
+				}else if("${projectReportData.contractCategory}"=='0'){
+					$("#contractFee").parent().parent().show();
+					$("#contractRate").parent().parent().hide();
+				}
+			}
 		});
 
 		function readOpenInfo(value) {
@@ -49,7 +63,7 @@
 <body>
 <div class="single-form">
 	<div class="container${container}  view-form">
-		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralProjectMessage/reportAudit" method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectcontentinfo" action="${ctx}/ruralProject/ruralProjectMessage/reportAudit" method="post" class="form-horizontal layui-form">
 			<%--<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
 				<div class="layui-item layui-col-sm6">
@@ -284,9 +298,22 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">合同类别：</label>
+					<div class="layui-input-block with-icon">
+						<input type="radio" title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" disabled <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+						<input type="radio" title="费率合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine1" value="1" disabled <c:if test="${projectReportData.contractCategory=='1'}">checked</c:if>>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同价(元)：</label>
 					<div class="layui-input-block with-icon">
-						<form:input id="contractFee" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
+						<form:input placeholder="请输入合同价" id="contractFee" path="projectReportData.contractFee" htmlEscape="false" readonly="true" class="form-control layui-input number"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6" style="display: none;">
+					<label class="layui-form-label">费率合同(费率)：</label>
+					<div class="layui-input-block with-icon">
+						<form:input placeholder="请输入合同费率" id="contractRate" path="projectReportData.contractRate" htmlEscape="false" readonly="true" class="form-control layui-input "/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">