Merge remote-tracking branch 'origin/master'

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/cost/ruralCostProjectRecordsForm.jsp

@@ -1333,70 +1333,70 @@
                 </div>
             </div>--%>
 
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>项目计划附件信息</h2></div>
-                <%--<div class="layui-item nav-btns">
-                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-                    <a class="nav-btn nav-btn-export" title="下载模板"  onclick="window.location.href='${ctx}/ruralProject/ruralCostProjectRecords/downloadTemplate';"><i class="fa fa-download"></i>&nbsp;下载模板</a>
-                </div>--%>
-                <div id="addFile_attachment" style="display: none" class="upload-progress">
-                    <span id="fileName_attachment" ></span>
-                    <b><span id="baifenbi_attachment" ></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-                <span id="attachment_title"></span>
-                <div class="layui-item layui-col-xs12 form-table-container">
-                    <table id="listAttachment" class="table table-bordered table-condensed details">
-                        <thead>
-                        <tr>
-                                <%-- <th>序号</th>--%>
-                            <th width="25%">文件</th>
-                            <th width="25%">上传人</th>
-                            <th width="25%">上传时间</th>
-                            <th width="150px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_attachment">
-                        <c:forEach items="${ruralProjectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-                            <tr class="trIdAdds">
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                            </c:when>
-                                            <c:otherwise>
-                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <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>
-                                        <%--<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
+<%--            <div class="form-group layui-row">--%>
+<%--                <div class="form-group-label"><h2>项目计划附件信息</h2></div>--%>
+<%--                &lt;%&ndash;<div class="layui-item nav-btns">--%>
+<%--                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
+<%--                    <a class="nav-btn nav-btn-export" title="下载模板"  onclick="window.location.href='${ctx}/ruralProject/ruralCostProjectRecords/downloadTemplate';"><i class="fa fa-download"></i>&nbsp;下载模板</a>--%>
+<%--                </div>&ndash;%&gt;--%>
+<%--                <div id="addFile_attachment" style="display: none" class="upload-progress">--%>
+<%--                    <span id="fileName_attachment" ></span>--%>
+<%--                    <b><span id="baifenbi_attachment" ></span></b>--%>
+<%--                    <div class="progress">--%>
+<%--                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
+<%--                </div>--%>
+<%--                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>--%>
+<%--                <span id="attachment_title"></span>--%>
+<%--                <div class="layui-item layui-col-xs12 form-table-container">--%>
+<%--                    <table id="listAttachment" class="table table-bordered table-condensed details">--%>
+<%--                        <thead>--%>
+<%--                        <tr>--%>
+<%--                                &lt;%&ndash; <th>序号</th>&ndash;%&gt;--%>
+<%--                            <th width="25%">文件</th>--%>
+<%--                            <th width="25%">上传人</th>--%>
+<%--                            <th width="25%">上传时间</th>--%>
+<%--                            <th width="150px">操作</th>--%>
+<%--                        </tr>--%>
+<%--                        </thead>--%>
+<%--                        <tbody id="file_attachment">--%>
+<%--                        <c:forEach items="${ruralProjectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">--%>
+<%--                            <tr class="trIdAdds">--%>
+<%--                                    &lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;--%>
+<%--                                <c:choose>--%>
+<%--                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">--%>
+<%--                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">--%>
+<%--                                    </c:when>--%>
+<%--                                    <c:otherwise>--%>
+<%--                                        <c:choose>--%>
+<%--                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">--%>
+<%--                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--                                            </c:when>--%>
+<%--                                            <c:otherwise>--%>
+<%--                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--                                            </c:otherwise>--%>
+<%--                                        </c:choose>--%>
+<%--                                    </c:otherwise>--%>
+<%--                                </c:choose>--%>
+<%--                                <td>${workClientAttachment.createBy.name}</td>--%>
+<%--                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>--%>
+<%--                                <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>--%>
+<%--                                        &lt;%&ndash;<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>&ndash;%&gt;--%>
+<%--                                    </div>--%>
+<%--                                </td>--%>
+<%--                            </tr>--%>
+<%--                        </c:forEach>--%>
+<%--                        </tbody>--%>
+<%--                    </table>--%>
+<%--                </div>--%>
+<%--            </div>--%>
             <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>

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

@@ -1304,69 +1304,69 @@
                 </div>
             </div>--%>
 
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>项目计划附件信息</h2></div>
-                <%--<div class="layui-item nav-btns">
-                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-                </div>--%>
-                <div id="addFile_attachment" style="display: none" class="upload-progress">
-                    <span id="fileName_attachment" ></span>
-                    <b><span id="baifenbi_attachment" ></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-                <span id="attachment_title"></span>
-                <div class="layui-item layui-col-xs12 form-table-container">
-                    <table id="listAttachment" class="table table-bordered table-condensed details">
-                        <thead>
-                        <tr>
-                                <%-- <th>序号</th>--%>
-                            <th width="25%">文件</th>
-                            <th width="25%">上传人</th>
-                            <th width="25%">上传时间</th>
-                            <th width="25%">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_attachment">
-                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-                            <tr class="trIdAdds">
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                            </c:when>
-                                            <c:otherwise>
-                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <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>
-                                        <%--<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
+<%--            <div class="form-group layui-row">--%>
+<%--                <div class="form-group-label"><h2>项目计划附件信息</h2></div>--%>
+<%--                &lt;%&ndash;<div class="layui-item nav-btns">--%>
+<%--                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
+<%--                </div>&ndash;%&gt;--%>
+<%--                <div id="addFile_attachment" style="display: none" class="upload-progress">--%>
+<%--                    <span id="fileName_attachment" ></span>--%>
+<%--                    <b><span id="baifenbi_attachment" ></span></b>--%>
+<%--                    <div class="progress">--%>
+<%--                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
+<%--                </div>--%>
+<%--                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>--%>
+<%--                <span id="attachment_title"></span>--%>
+<%--                <div class="layui-item layui-col-xs12 form-table-container">--%>
+<%--                    <table id="listAttachment" class="table table-bordered table-condensed details">--%>
+<%--                        <thead>--%>
+<%--                        <tr>--%>
+<%--                                &lt;%&ndash; <th>序号</th>&ndash;%&gt;--%>
+<%--                            <th width="25%">文件</th>--%>
+<%--                            <th width="25%">上传人</th>--%>
+<%--                            <th width="25%">上传时间</th>--%>
+<%--                            <th width="25%">操作</th>--%>
+<%--                        </tr>--%>
+<%--                        </thead>--%>
+<%--                        <tbody id="file_attachment">--%>
+<%--                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">--%>
+<%--                            <tr class="trIdAdds">--%>
+<%--                                    &lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;--%>
+<%--                                <c:choose>--%>
+<%--                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">--%>
+<%--                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">--%>
+<%--                                    </c:when>--%>
+<%--                                    <c:otherwise>--%>
+<%--                                        <c:choose>--%>
+<%--                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">--%>
+<%--                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--                                            </c:when>--%>
+<%--                                            <c:otherwise>--%>
+<%--                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--                                            </c:otherwise>--%>
+<%--                                        </c:choose>--%>
+<%--                                    </c:otherwise>--%>
+<%--                                </c:choose>--%>
+<%--                                <td>${workClientAttachment.createBy.name}</td>--%>
+<%--                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>--%>
+<%--                                <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>--%>
+<%--                                        &lt;%&ndash;<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>&ndash;%&gt;--%>
+<%--                                    </div>--%>
+<%--                                </td>--%>
+<%--                            </tr>--%>
+<%--                        </c:forEach>--%>
+<%--                        </tbody>--%>
+<%--                    </table>--%>
+<%--                </div>--%>
+<%--            </div>--%>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >

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

@@ -664,52 +664,52 @@
 					</div>
 				</div>
 			</div>
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>项目计划附件信息</h2></div>
-				<div class="layui-item layui-col-xs12 form-table-container" >
-					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">
-						<thead>
-						<tr>
-							<th width="25%">文件预览</th>
-							<th width="25%">上传人</th>
-							<th width="25%">上传时间</th>
-							<th width="25%">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">
-							<tr>
-									<%--<td>${status.index + 1}</td>--%>
-								<c:choose>
-									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-										<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>
-											</c:when>
-											<c:otherwise>
-												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
-								<td>${workClientAttachment.createBy.name}</td>
-								<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
-								<td  class="op-td">
-									<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>
-								</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
+<%--			<div class="form-group layui-row">--%>
+<%--				<div class="form-group-label"><h2>项目计划附件信息</h2></div>--%>
+<%--				<div class="layui-item layui-col-xs12 form-table-container" >--%>
+<%--					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">--%>
+<%--						<thead>--%>
+<%--						<tr>--%>
+<%--							<th width="25%">文件预览</th>--%>
+<%--							<th width="25%">上传人</th>--%>
+<%--							<th width="25%">上传时间</th>--%>
+<%--							<th width="25%">操作</th>--%>
+<%--						</tr>--%>
+<%--						</thead>--%>
+<%--						<tbody id="file_attachment">--%>
+<%--						<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">--%>
+<%--							<tr>--%>
+<%--									&lt;%&ndash;<td>${status.index + 1}</td>&ndash;%&gt;--%>
+<%--								<c:choose>--%>
+<%--									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')--%>
+<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')--%>
+<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')--%>
+<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')--%>
+<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">--%>
+<%--										<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">--%>
+<%--									</c:when>--%>
+<%--									<c:otherwise>--%>
+<%--										<c:choose>--%>
+<%--											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">--%>
+<%--												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--											</c:when>--%>
+<%--											<c:otherwise>--%>
+<%--												<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--											</c:otherwise>--%>
+<%--										</c:choose>--%>
+<%--									</c:otherwise>--%>
+<%--								</c:choose>--%>
+<%--								<td>${workClientAttachment.createBy.name}</td>--%>
+<%--								<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>--%>
+<%--								<td  class="op-td">--%>
+<%--									<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>--%>
+<%--								</td>--%>
+<%--							</tr>--%>
+<%--						</c:forEach>--%>
+<%--						</tbody>--%>
+<%--					</table>--%>
+<%--				</div>--%>
+<%--			</div>--%>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批意见</h2></div>
 				<div class="layui-item layui-col-sm8 lw6 with-textarea">

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

@@ -1343,70 +1343,70 @@
                 </div>
             </div>--%>
 
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>项目计划附件信息</h2></div>
-                <%--<div class="layui-item nav-btns">
-                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-                    <a class="nav-btn nav-btn-export" title="下载模板"  onclick="window.location.href='${ctx}/ruralProject/ruralProjectRecords/downloadTemplate';"><i class="fa fa-download"></i>&nbsp;下载模板</a>
-                </div>--%>
-                <div id="addFile_attachment" style="display: none" class="upload-progress">
-                    <span id="fileName_attachment" ></span>
-                    <b><span id="baifenbi_attachment" ></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-                <span id="attachment_title"></span>
-                <div class="layui-item layui-col-xs12 form-table-container">
-                    <table id="listAttachment" class="table table-bordered table-condensed details">
-                        <thead>
-                        <tr>
-                                <%-- <th>序号</th>--%>
-                            <th width="25%">文件</th>
-                            <th width="25%">上传人</th>
-                            <th width="25%">上传时间</th>
-                            <th width="150px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_attachment">
-                        <c:forEach items="${ruralProjectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-                            <tr class="trIdAdds">
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                            </c:when>
-                                            <c:otherwise>
-                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <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>
-                                        <%--<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
+<%--            <div class="form-group layui-row">--%>
+<%--                <div class="form-group-label"><h2>项目计划附件信息</h2></div>--%>
+<%--                &lt;%&ndash;<div class="layui-item nav-btns">--%>
+<%--                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
+<%--                    <a class="nav-btn nav-btn-export" title="下载模板"  onclick="window.location.href='${ctx}/ruralProject/ruralProjectRecords/downloadTemplate';"><i class="fa fa-download"></i>&nbsp;下载模板</a>--%>
+<%--                </div>&ndash;%&gt;--%>
+<%--                <div id="addFile_attachment" style="display: none" class="upload-progress">--%>
+<%--                    <span id="fileName_attachment" ></span>--%>
+<%--                    <b><span id="baifenbi_attachment" ></span></b>--%>
+<%--                    <div class="progress">--%>
+<%--                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
+<%--                </div>--%>
+<%--                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>--%>
+<%--                <span id="attachment_title"></span>--%>
+<%--                <div class="layui-item layui-col-xs12 form-table-container">--%>
+<%--                    <table id="listAttachment" class="table table-bordered table-condensed details">--%>
+<%--                        <thead>--%>
+<%--                        <tr>--%>
+<%--                                &lt;%&ndash; <th>序号</th>&ndash;%&gt;--%>
+<%--                            <th width="25%">文件</th>--%>
+<%--                            <th width="25%">上传人</th>--%>
+<%--                            <th width="25%">上传时间</th>--%>
+<%--                            <th width="150px">操作</th>--%>
+<%--                        </tr>--%>
+<%--                        </thead>--%>
+<%--                        <tbody id="file_attachment">--%>
+<%--                        <c:forEach items="${ruralProjectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">--%>
+<%--                            <tr class="trIdAdds">--%>
+<%--                                    &lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;--%>
+<%--                                <c:choose>--%>
+<%--                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">--%>
+<%--                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">--%>
+<%--                                    </c:when>--%>
+<%--                                    <c:otherwise>--%>
+<%--                                        <c:choose>--%>
+<%--                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">--%>
+<%--                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--                                            </c:when>--%>
+<%--                                            <c:otherwise>--%>
+<%--                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--                                            </c:otherwise>--%>
+<%--                                        </c:choose>--%>
+<%--                                    </c:otherwise>--%>
+<%--                                </c:choose>--%>
+<%--                                <td>${workClientAttachment.createBy.name}</td>--%>
+<%--                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>--%>
+<%--                                <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>--%>
+<%--                                        &lt;%&ndash;<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>&ndash;%&gt;--%>
+<%--                                    </div>--%>
+<%--                                </td>--%>
+<%--                            </tr>--%>
+<%--                        </c:forEach>--%>
+<%--                        </tbody>--%>
+<%--                    </table>--%>
+<%--                </div>--%>
+<%--            </div>--%>
             <div class="form-group layui-row page-end"></div>
         </form:form>
     </div>

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

@@ -1299,69 +1299,69 @@
                 </div>
             </div>--%>
 
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>项目计划附件信息</h2></div>
-                <%--<div class="layui-item nav-btns">
-                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
-                </div>--%>
-                <div id="addFile_attachment" style="display: none" class="upload-progress">
-                    <span id="fileName_attachment" ></span>
-                    <b><span id="baifenbi_attachment" ></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-                <span id="attachment_title"></span>
-                <div class="layui-item layui-col-xs12 form-table-container">
-                    <table id="listAttachment" class="table table-bordered table-condensed details">
-                        <thead>
-                        <tr>
-                                <%-- <th>序号</th>--%>
-                            <th width="25%">文件</th>
-                            <th width="25%">上传人</th>
-                            <th width="25%">上传时间</th>
-                            <th width="25%">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_attachment">
-                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-                            <tr class="trIdAdds">
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                            </c:when>
-                                            <c:otherwise>
-                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <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>
-                                        <%--<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
+<%--            <div class="form-group layui-row">--%>
+<%--                <div class="form-group-label"><h2>项目计划附件信息</h2></div>--%>
+<%--                &lt;%&ndash;<div class="layui-item nav-btns">--%>
+<%--                    <a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"  onclick="addFile()"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
+<%--                </div>&ndash;%&gt;--%>
+<%--                <div id="addFile_attachment" style="display: none" class="upload-progress">--%>
+<%--                    <span id="fileName_attachment" ></span>--%>
+<%--                    <b><span id="baifenbi_attachment" ></span></b>--%>
+<%--                    <div class="progress">--%>
+<%--                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
+<%--                </div>--%>
+<%--                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>--%>
+<%--                <span id="attachment_title"></span>--%>
+<%--                <div class="layui-item layui-col-xs12 form-table-container">--%>
+<%--                    <table id="listAttachment" class="table table-bordered table-condensed details">--%>
+<%--                        <thead>--%>
+<%--                        <tr>--%>
+<%--                                &lt;%&ndash; <th>序号</th>&ndash;%&gt;--%>
+<%--                            <th width="25%">文件</th>--%>
+<%--                            <th width="25%">上传人</th>--%>
+<%--                            <th width="25%">上传时间</th>--%>
+<%--                            <th width="25%">操作</th>--%>
+<%--                        </tr>--%>
+<%--                        </thead>--%>
+<%--                        <tbody id="file_attachment">--%>
+<%--                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">--%>
+<%--                            <tr class="trIdAdds">--%>
+<%--                                    &lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;--%>
+<%--                                <c:choose>--%>
+<%--                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">--%>
+<%--                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">--%>
+<%--                                    </c:when>--%>
+<%--                                    <c:otherwise>--%>
+<%--                                        <c:choose>--%>
+<%--                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">--%>
+<%--                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--                                            </c:when>--%>
+<%--                                            <c:otherwise>--%>
+<%--                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--                                            </c:otherwise>--%>
+<%--                                        </c:choose>--%>
+<%--                                    </c:otherwise>--%>
+<%--                                </c:choose>--%>
+<%--                                <td>${workClientAttachment.createBy.name}</td>--%>
+<%--                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>--%>
+<%--                                <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>--%>
+<%--                                        &lt;%&ndash;<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>&ndash;%&gt;--%>
+<%--                                    </div>--%>
+<%--                                </td>--%>
+<%--                            </tr>--%>
+<%--                        </c:forEach>--%>
+<%--                        </tbody>--%>
+<%--                    </table>--%>
+<%--                </div>--%>
+<%--            </div>--%>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >

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

@@ -604,79 +604,79 @@
 					</div>
 				</div>
 			</div>
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>项目计划附件信息</h2></div>
-				<div class="layui-item layui-col-xs12 form-table-container" >
-					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">
-						<thead>
-						<tr>
-							<th width="25%">文件预览</th>
-							<th width="25%">上传人</th>
-							<th width="25%">上传时间</th>
-							<th width="25%">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">
-							<tr>
-									<%--<td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${projectRecords.uploadMode == 2}">
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-														<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-															</c:when>
-															<c:otherwise>
-																<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-														<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>
-															</c:when>
-															<c:otherwise>
-																<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-								<td>${workClientAttachment.createBy.name}</td>
-								<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>
-<%--									<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>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
+<%--			<div class="form-group layui-row">--%>
+<%--				<div class="form-group-label"><h2>项目计划附件信息</h2></div>--%>
+<%--				<div class="layui-item layui-col-xs12 form-table-container" >--%>
+<%--					<table id="listAttachment" class="table table-bordered table-condensed no-bottom-margin details">--%>
+<%--						<thead>--%>
+<%--						<tr>--%>
+<%--							<th width="25%">文件预览</th>--%>
+<%--							<th width="25%">上传人</th>--%>
+<%--							<th width="25%">上传时间</th>--%>
+<%--							<th width="25%">操作</th>--%>
+<%--						</tr>--%>
+<%--						</thead>--%>
+<%--						<tbody id="file_attachment">--%>
+<%--						<c:forEach items="${projectRecords.workAttachments}" var="workClientAttachment" varStatus="status">--%>
+<%--							<tr>--%>
+<%--									&lt;%&ndash;<td>${status.index + 1}</td>&ndash;%&gt;--%>
+<%--										<c:choose>--%>
+<%--											<c:when test="${projectRecords.uploadMode == 2}">--%>
+<%--												<c:choose>--%>
+<%--													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')--%>
+<%--                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">--%>
+<%--														<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">--%>
+<%--													</c:when>--%>
+<%--													<c:otherwise>--%>
+<%--														<c:choose>--%>
+<%--															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">--%>
+<%--																<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--															</c:when>--%>
+<%--															<c:otherwise>--%>
+<%--																<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--															</c:otherwise>--%>
+<%--														</c:choose>--%>
+<%--													</c:otherwise>--%>
+<%--												</c:choose>--%>
+<%--											</c:when>--%>
+<%--											<c:otherwise>--%>
+<%--												<c:choose>--%>
+<%--													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')--%>
+<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')--%>
+<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')--%>
+<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')--%>
+<%--															   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">--%>
+<%--														<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">--%>
+<%--													</c:when>--%>
+<%--													<c:otherwise>--%>
+<%--														<c:choose>--%>
+<%--															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">--%>
+<%--																<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%','1')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--															</c:when>--%>
+<%--															<c:otherwise>--%>
+<%--																<td><a href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','95%','95%')">${workClientAttachment.attachmentName}</a></td>--%>
+<%--															</c:otherwise>--%>
+<%--														</c:choose>--%>
+<%--													</c:otherwise>--%>
+<%--												</c:choose>--%>
+<%--											</c:otherwise>--%>
+<%--										</c:choose>--%>
+<%--								<td>${workClientAttachment.createBy.name}</td>--%>
+<%--								<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>--%>
+<%--&lt;%&ndash;									<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>&ndash;%&gt;--%>
+<%--									&lt;%&ndash;<a href="#" onclick="seeFile('${workClientAttachment.url}','${workClientAttachment.attachmentName}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;查看</a>&ndash;%&gt;--%>
+<%--								</td>--%>
+<%--							</tr>--%>
+<%--						</c:forEach>--%>
+<%--						</tbody>--%>
+<%--					</table>--%>
+<%--				</div>--%>
+<%--			</div>--%>
 			<script>
                 var workClientLinkmanRowIdx = 0, workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
                 var workConstructionLinkmanRowIdx = 0, workConstructionLinkmanTpl = $("#workConstructionLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");

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