项目查看，报告页签（应显示“金额合同”和“金额”，或者“费率合同”和“费率”；）

src/main/webapp/webpage/modules/identification/AuditTemplateList.jsp

@@ -156,19 +156,19 @@
         <div style="clear:both;"></div>
     </div>
     <div class="single-form">
-        <div class="container" style="width: 95%">
-            <table class="table table-bordered">
+        <div class="container" style="width: 98%">
+            <table class="oa-table layui-table">
                 <thead>
-                    <th>模板类型</th>
-                    <th>模板</th>
-                    <th>创建人</th>
-                    <th>操作</th>
+                    <th width="20%">模板类型</th>
+                    <th width="40%">模板</th>
+                    <th width="20%">创建人</th>
+                    <th width="20%">操作</th>
                 </thead>
                 <tbody>
                     <c:forEach items="${page.list}" var="tem">
                         <tr align="center" >
                             <td>${tem.name}</td>
-                            <td>${tem.content}</td>
+                            <td><span title="${tem.content}">${tem.content}</span></td>
                             <td>${tem.createBy.name}</td>
                             <td>
                                 <div class="layui-btn-group">

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

@@ -5,6 +5,8 @@
 	<title>报告详情管理</title>
 	<meta name="decorator" content="default"/>
 	<%@include file="/webpage/include/treetable.jsp" %>
+	<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">
 
 		$(document).ready(function() {
@@ -39,6 +41,28 @@
 			$("#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();
+				}
+			}
+			layui.use(['form', 'layer'], function () {
+				var form = layui.form;
+				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();
+					}
+				})
+			})
 		});
 
 		function openDialogre(title,url,width,height,target,buttons) {
@@ -162,7 +186,7 @@
 	</c:if>
 	<c:if test="${projectReportData.id!=null}">
 	<div class="container${container}  view-form" style="margin-top: 40px;">
-		<form:form id="inputForm" modelAttribute="projectcontentinfo"  method="post" class="form-horizontal">
+		<form:form id="inputForm" modelAttribute="projectcontentinfo"  method="post" class="form-horizontal layui-form">
 			<input type="hidden" id="status" value="${projectReportData.status}">
 			<%--<div class="form-group layui-row first lw12">
 				<div class="form-group-label"><h2>基本信息</h2></div>
@@ -181,7 +205,7 @@
 			</div>--%>
 			<div class="form-group layui-row first lw12">
 				<div class="form-group-label">
-					<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="nav-btn layui-btn" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
+					<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('下载模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=${projectRecords.id}','35%', '35%','','下载,关闭')" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载模板</a></div>
 					<h2>报告信息</h2>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -197,11 +221,24 @@
 					</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" disabled title="金额合同" lay-filter="jine" name="projectReportData.contractCategory" id="jine" value="0" checked <c:if test="${projectReportData.contractCategory=='0'}">checked</c:if>>
+						<input type="radio" disabled 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 id="contractFee" cssStyle="background-color: #f1f1f1" path="projectReportData.contractFee" htmlEscape="false"  class="form-control layui-input" readonly="true"/>
 					</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" cssStyle="background-color: #f1f1f1" path="projectReportData.contractRate" htmlEscape="false"  class="form-control layui-input " readonly="true"/>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">核增核减额(元)：</label>
 					<div class="layui-input-block with-icon">
@@ -259,7 +296,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl?id=${projectReportData.id}"  onclick="return confirmx('确认要下载控制流程单吗？', this.href)" class="nav-btn layui-btn" ><i class="fa fa-file-excel-o"></i> 下载流程单</a></div>
+				<div style="float: right"> <a href="${ctx}/workfullmanage/workFullManage/downloadMassControl?id=${projectReportData.id}"  onclick="return confirmx('确认要下载控制流程单吗？', this.href)" class="layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 下载流程单</a></div>
 				<%--<div style="float: right"> <a href="javascript:void(0)" onclick="preview('预览','${ctx}/workfullmanage/workFullManage/preViewMassControl?id=${projectReportData.id}','80%','80%')">预览流程单</a></div>--%>
 				<div class="form-group-label"><h2><span class="require-item">*</span>项目组成员</h2></div>
 				<div class="layui-item layui-col-sm12 lw6">