Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -192,6 +192,9 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private Integer newRecordAuditNotifyFlag; //新归档(审批)判定条件
 
 
+	private Integer planCount;	//项目计划数量
+
+
 	private List<String> civilProjectList = Lists.newArrayList();
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
@@ -1350,4 +1353,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setNewRecordAuditNotifyFlag(Integer newRecordAuditNotifyFlag) {
 		this.newRecordAuditNotifyFlag = newRecordAuditNotifyFlag;
 	}
+
+	public Integer getPlanCount() {
+		return planCount;
+	}
+
+	public void setPlanCount(Integer planCount) {
+		this.planCount = planCount;
+	}
 }

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -1270,7 +1270,8 @@
 		wci.name AS "workContractInfo.name",
 		wct.id AS "workContractInfo.client.id",
 		wct.name AS "workContractInfo.client.name",
-		o.top_company AS "office.name"
+		o.top_company AS "office.name",
+		COUNT(pi.id) AS "planCount"
 		FROM rural_project_records a
 		<include refid="projectRecordsJoins"/>
 
@@ -1282,6 +1283,7 @@
 		LEFT JOIN work_contract_info wci on a.contract_id = wci.id
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		LEFT JOIN sys_office o ON o.id = a.office_id
+		LEFT JOIN project_plan_info pi on pi.project_id = a.id
 		<where>
 			<if test="projectId != null and projectId != ''">
 				AND a.project_id like concat('%',#{projectId},'%')

src/main/webapp/static/oss/ossupload.js

@@ -744,8 +744,8 @@ function multitest (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadP
                     }else{
                         str = str +'<a href="javascript:location.href=\''+realPath+'/a/workfullmanage/workFullManage/downLoadAttach?file=\'+encodeURIComponent(\''+data.url+'\');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
                     }
-                    str = str +'<a href="javascript:void(0)" onclick="deleteFileFromAliyun1(this,\''+realPath+'/a/sys/workattachment/deleteFileFromAliyun?url='+encodeURIComponent(data.url)+'&id='+data.id+'&type=2\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>'+
-                        '<a href="javascript:void(0)" onclick="ossCollectingAccessory(this,\''+realPath+'/projectAccessory/projectAccessory/saveCollectAccessory?url='+data.url+'&fileName='+data.attachmentName+'\',\''+addFile+'\',\''+data.createBy+'\')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>'+
+                    str = str + '<a href="javascript:void(0)" onclick="ossCollectingAccessory(this,\''+realPath+'/projectAccessory/projectAccessory/saveCollectAccessory?url='+data.url+'&fileName='+data.attachmentName+'\',\''+addFile+'\',\''+data.createBy+'\')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>'+
+                        '<a href="javascript:void(0)" onclick="deleteFileFromAliyun1(this,\''+realPath+'/a/sys/workattachment/deleteFileFromAliyun?url='+encodeURIComponent(data.url)+'&id='+data.id+'&type=2\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>'+
                         '</div>' +
                         '</td>'+
                         '</tr>';

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/projectrecord/plan/projectPlanConsultingList.jsp

@@ -274,6 +274,10 @@
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanConsulting/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" > 编辑</a>";
 						}
+						if(d.canedit5 != undefined && d.canedit5 =="1")
+						{
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('添加项目计划信息', '${ctx}/project/projectPlanConsulting/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 添加</a>";
+						}
 						xml+="</div>"
 						return xml;
 
@@ -299,7 +303,12 @@
 						,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</shiro:hasPermission>
 					<shiro:hasPermission name="project:projectPlanConsulting:edit">
-						,"canedit4":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+						<c:if test="${projectRecords.planCount>0}">
+							,"canedit4":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+						</c:if>
+						<c:if test="${projectRecords.planCount==0}">
+							,"canedit5":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+						</c:if>
 					</shiro:hasPermission>
 					<shiro:hasPermission name="ruralProject:ruralProjectView:consultingPlanView">
 					,"showView":1

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

@@ -274,6 +274,10 @@
 						{
 							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('编辑项目计划信息', '${ctx}/project/projectPlanCost/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 编辑</a>";
 						}
+						if(d.canedit5 != undefined && d.canedit5 =="1")
+						{
+							xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('添加项目计划信息', '${ctx}/project/projectPlanConsulting/form?view=form&id='+encodeURIComponent('" + d.id + "'),'95%','95%','')\" class=\"layui-btn layui-btn-xs  layui-bg-blue\" > 添加</a>";
+						}
 						xml+="</div>"
 						return xml;
 
@@ -299,7 +303,12 @@
 						,"canedit3":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</shiro:hasPermission>
 					<shiro:hasPermission name="project:projectPlanCost:edit">
+						<c:if test="${projectRecords.planCount>0}">
 						,"canedit4":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+						</c:if>
+						<c:if test="${projectRecords.planCount==0}">
+						,"canedit5":<c:choose><c:when test="${projectRecords.projectStatus == 5 && (fns:getUser().id == projectRecords.leaderIds || fns:getUser().id eq projectRecords.createBy.id)}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+						</c:if>
 					</shiro:hasPermission>
 					<shiro:hasPermission name="ruralProject:ruralProjectView:costPlanView">
 					,"showView":1

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

@@ -320,6 +320,9 @@
                                                 <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                             </c:otherwise>
                                         </c:choose>
+                                        <c:if test="${workClientAttachment.collectFlag != 1}">
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                        </c:if>
                                     </div>
                                 </td>
                             </tr>

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

@@ -575,6 +575,9 @@
 								<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
 								<td  class="op-td">
 									<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+									<c:if test="${workClientAttachment.collectFlag != 1}">
+										<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+									</c:if>
 <%--									<a href="javascript:location.href=encodeURI('${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file=${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>--%>
 									<%--<a href="#" onclick="seeFile('${workClientAttachment.url}','${workClientAttachment.attachmentName}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;查看</a>--%>
 								</td>

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

@@ -482,7 +482,7 @@
 						<tr>
 							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
-							<th width="100px">操作</th>
+							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
@@ -581,6 +581,9 @@
 															<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:otherwise>
 													</c:choose>
+													<c:if test="${fileAttachment.collectFlag != 1}">
+														<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileAttachment.url}','${fileAttachment.createBy.id}','${fileAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+													</c:if>
 												</c:otherwise>
 											</c:choose>
 										</div>
@@ -611,7 +614,7 @@
 						<tr>
 							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
-							<th width="100px">操作</th>
+							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
@@ -710,6 +713,9 @@
 														<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 													</c:otherwise>
 												</c:choose>
+												<c:if test="${fileGistdata.collectFlag != 1}">
+													<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileGistdata.url}','${fileGistdata.createBy.id}','${fileGistdata.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+												</c:if>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -741,7 +747,7 @@
 						<tr>
 							<th width="55%">文件类型</th>
 							<th width="">文件名</th>
-							<th width="100px">操作</th>
+							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
@@ -840,6 +846,9 @@
 														<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 													</c:otherwise>
 												</c:choose>
+												<c:if test="${fileOther.collectFlag != 1}">
+													<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileOther.url}','${fileOther.createBy.id}','${fileOther	.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+												</c:if>
 											</c:otherwise>
 										</c:choose>
 									</div>

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

@@ -523,6 +523,9 @@
                                                     <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                 </c:otherwise>
                                             </c:choose>
+                                            <c:if test="${workClientAttachment.collectFlag != 1}">
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                            </c:if>
                                         </div>
                                     </td>
                                 </tr>

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

@@ -125,7 +125,7 @@
 								<%-- <th>序号</th>--%>
 							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
-							<th width="100px">操作</th>
+							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
@@ -208,6 +208,9 @@
 											</c:when>
 											<c:otherwise>
 												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+												<c:if test="${fileAttachment.collectFlag != 1}">
+													<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileAttachment.url}','${fileAttachment.createBy.id}','${fileAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+												</c:if>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -240,7 +243,7 @@
 								<%-- <th>序号</th>--%>
 							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
-							<th width="100px">操作</th>
+							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
@@ -324,6 +327,9 @@
 											</c:when>
 											<c:otherwise>
 												<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+												<c:if test="${fileGistdata.collectFlag != 1}">
+													<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileGistdata.url}','${fileGistdata.createBy.id}','${fileGistdata.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+												</c:if>
 											</c:otherwise>
 										</c:choose>
 									</div>
@@ -355,7 +361,7 @@
 								<%-- <th>序号</th>--%>
 							<th width="30%">文件类型</th>
 							<th width="">文件名</th>
-							<th width="100px">操作</th>
+							<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
@@ -439,6 +445,9 @@
 													</c:when>
 													<c:otherwise>
 														<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+														<c:if test="${fileOther.collectFlag != 1}">
+															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileOther.url}','${fileOther.createBy.id}','${fileOther.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+														</c:if>
 													</c:otherwise>
 												</c:choose>
 											</div>

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

@@ -337,7 +337,11 @@
                                 <td class="op-td">
                                     <div class="op-btn-box" >
                                         <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                        <c:if test="${workClientAttachment.collectFlag != 1}">
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                        </c:if>
                                     </div>
+
                                 </td>
                             </tr>
                         </c:forEach>

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">

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

@@ -542,6 +542,9 @@
                                     <td class="op-td">
                                         <div class="op-btn-box" >
                                             <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                            <c:if test="${workClientAttachment.collectFlag != 1}">
+                                                <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                            </c:if>
                                         </div>
                                     </td>
                                 </tr>

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

@@ -311,6 +311,9 @@
                                     <td class="op-td">
                                         <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));"
                                            class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                        <c:if test="${workClientAttachment.collectFlag != 1}">
+                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                        </c:if>
                                     </td>
                                 </tr>
                             </c:forEach>
@@ -473,6 +476,9 @@
                                                         <a href="javascript:location.href='${ctx}/workcontractinfo/workContractInfo/downLoadAttach?file='+encodeURIComponent(encodeURIComponent('${workClientAttachment.url}'));" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                     </c:otherwise>
                                                 </c:choose>
+                                                <c:if test="${workClientAttachment.collectFlag != 1}">
+                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                                </c:if>
                                             </div>
                                         </td>
                                     </tr>

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

@@ -302,6 +302,9 @@
 											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 										</c:otherwise>
 									</c:choose>
+									<c:if test="${workClientAttachment.collectFlag != 1}">
+										<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+									</c:if>
 								</td>
 							</tr>
 						</c:forEach>