Merge remote-tracking branch 'origin/master'

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

@@ -197,6 +197,8 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String newRecordNotifyId; //新归档代办判定条件
 	private Integer newRecordAuditNotifyFlag; //新归档(审批)判定条件
 
+	private Integer reportDataFlag; //报告号是否存在判定条件
+
 
 	private Integer planCount;	//项目计划数量
 	private BigDecimal submitScale;	//送审规模
@@ -1416,4 +1418,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setPrdtProcessinstanceId(String prdtProcessinstanceId) {
 		this.prdtProcessinstanceId = prdtProcessinstanceId;
 	}
+
+	public Integer getReportDataFlag() {
+		return reportDataFlag;
+	}
+
+	public void setReportDataFlag(Integer reportDataFlag) {
+		this.reportDataFlag = reportDataFlag;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -485,7 +485,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			}
 		}
 
-		//项目添加报告号
+		/*//项目添加报告号
 		//查询该项目是否已经存在报告号，若存在则不进行添加
 		ProjectReportData reportData = projectReportDataDao.getProjectReportData(projectRecords.getId());
 		if(null == reportData){
@@ -509,19 +509,18 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				projectReportData.setCreateDate(new Date());
 				projectReportDataDao.insert(projectReportData);
 			}
-			//添加项目工作内容表
-			Projectcontentinfo projectcontentinfo = new Projectcontentinfo();
-			projectcontentinfo.setProjectOnRural(projectRecords);
-			projectcontentinfo.setCompanyId(projectRecords.getCompany().getId());
-			projectcontentinfo.setOfficeId(projectRecords.getOffice().getId());
-			projectcontentinfo.setSort(30);
-			projectcontentinfo.setParentIds("0,");
-			projectcontentinfo.setParent(new Projectcontentinfo("0"));
-			projectcontentinfo.setName(projectRecords.getProjectId());
-			projectcontentinfo.preInsert();
-			projectcontentinfoDao.insertOnRural(projectcontentinfo);
-		}
-
+		}*/
+		//添加项目工作内容表
+		Projectcontentinfo projectcontentinfo = new Projectcontentinfo();
+		projectcontentinfo.setProjectOnRural(projectRecords);
+		projectcontentinfo.setCompanyId(projectRecords.getCompany().getId());
+		projectcontentinfo.setOfficeId(projectRecords.getOffice().getId());
+		projectcontentinfo.setSort(30);
+		projectcontentinfo.setParentIds("0,");
+		projectcontentinfo.setParent(new Projectcontentinfo("0"));
+		projectcontentinfo.setName(projectRecords.getProjectId());
+		projectcontentinfo.preInsert();
+		projectcontentinfoDao.insertOnRural(projectcontentinfo);
 		logger.info("保存项目耗时：{}ms;启动流程耗时：{}ms",t4-t1,System.currentTimeMillis()-t4);
 	}
 
@@ -2140,4 +2139,50 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		String msg = projectReportNumService.saveNumber(bizCode);//保存
 		return msg;
 	}
+
+	/**
+	 * 生成报告号
+	 * @param projectRecords
+	 */
+	@Transactional(readOnly = false)
+	public void createReportDataId(RuralProjectRecords projectRecords) {
+		//项目添加报告号
+		//查询该项目是否已经存在报告号，若存在则不进行添加
+		ProjectReportData reportData = projectReportDataDao.getProjectReportData(projectRecords.getId());
+		if(null == reportData){
+			//添加查询报告号模板的bizCode参数
+			ProjectReportData projectReportData = new ProjectReportData();
+			if("1".equals(projectRecords.getProjectType())){
+				projectReportData.setConditionType("10");
+			}else if("2".equals(projectRecords.getProjectType())){
+				projectReportData.setConditionType("1003");
+			}
+			synchronized (SYN_BYTE) {
+				String reportNo = createReportNo(projectReportData.getConditionType());
+				projectReportData.setNumber(reportNo);
+				ProjectRecords project = new ProjectRecords();
+				project.setId(projectRecords.getId());
+				projectReportData.setProject(project);
+				projectReportData.setCompanyId(UserUtils.getSelectCompany().getId());
+				projectReportData.setOfficeId(UserUtils.getSelectOffice().getId());
+				projectReportData.setName(projectRecords.getProjectName());
+				projectReportData.preInsert();
+				projectReportData.setCreateDate(new Date());
+				projectReportDataDao.insert(projectReportData);
+			}
+		}else if(StringUtils.isBlank(reportData.getNumber())){
+			//添加查询报告号模板的bizCode参数
+			if("1".equals(projectRecords.getProjectType())){
+				reportData.setConditionType("10");
+			}else if("2".equals(projectRecords.getProjectType())){
+				reportData.setConditionType("1003");
+			}
+			synchronized (SYN_BYTE) {
+				String reportNo = createReportNo(reportData.getConditionType());
+				reportData.setNumber(reportNo);
+				reportData.preUpdate();
+				projectReportDataDao.update(reportData);
+			}
+		}
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -912,4 +912,21 @@ public class RuralCostProjectRecordsController extends BaseController {
 		}
 		return "modules/ruralprojectrecords/projectAccessoryForm";
 	}
+
+	/**
+	 * 生成报告号
+	 */
+	@RequestMapping(value = "createReportDataId")
+	public String createReportDataId(RuralProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
+		projectRecordsService.createReportDataId(projectRecords);
+		addMessage(redirectAttributes, "生成报告号成功");
+		if (StringUtils.isNotBlank(projectRecords.getHome()) && "home".equals(projectRecords.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/home/?repage";
+		}else {
+			if("1".equals(projectRecords.getProjectType())){
+				return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectRecords/?repage";
+			}
+			return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectRecords/?repage";
+		}
+	}
 }

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

@@ -128,6 +128,7 @@
 		o.top_company AS "office.name"
 		,ifnull(prr.status ,0) as "projectReportRecordStatus"
 		,ifnull(prd.status ,0) as "projectReportStatus"
+		,if(prd.number is not null,"1","0") as reportDataFlag
 		FROM rural_project_records a
 		<include refid="projectRecordsJoins"/>
 

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

@@ -528,7 +528,7 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-                ,{field:'op',align:'center',title:"操作",width:180,templet:function(d){
+                ,{field:'op',align:'center',title:"操作",width:240,templet:function(d){
                         ////对操作进行初始化
                         var xml="<div class=\"layui-btn-group\">";
 						if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
@@ -560,6 +560,10 @@
 						{
 							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralCostProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传文件</a>";
 						}
+						if(d.reportDataFlag != undefined && d.reportDataFlag =="1")
+						{
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/createReportDataId?id=" + d.id + "&projectType=2"+"\" onclick=\"return confirmx('确认要生成报告号吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 生成报告号</a>";
+						}
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {
                             //xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogre('项目变更管理', '${ctx}/ruralProject/ruralCostProjectRecordsAlter/form?alterBeforeRecords.id='+encodeURIComponent('" + d.id + "'),'95%','95%','','送审,暂存,关闭')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 变更</a>";
@@ -609,6 +613,7 @@
                     ,"cancancel":<c:choose><c:when test="${projectRecords.projectStatus == 2 && fns:getUser().id == projectRecords.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					,"deleteAdmin":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					,"modifyRecords":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '2' != projectRecords.projectReportStatus && '5' != projectRecords.projectReportStatus && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+					,"reportDataFlag":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 
 					</c:when>
                     <c:otherwise>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/projectReportRecordForm.jsp

@@ -246,13 +246,12 @@
 				<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" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th>类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -269,7 +268,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -345,6 +348,9 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
@@ -414,15 +420,14 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th>类型限制</th>
-<%--							<th>文件名</th>--%>
-							<th width="150px">操作</th>
+								<th width="30%">文件类型</th>
+								<th width="">文件描述/文件</th>
+								<th width="100px">文件大小(M)</th>
+								<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
@@ -439,7 +444,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -515,6 +524,9 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
@@ -584,14 +596,13 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th>类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -609,7 +620,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -685,6 +700,9 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/projectReportRecordModify.jsp

@@ -286,15 +286,14 @@
 				<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" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
-							<th width="150px">操作</th>
+									<th width="30%">文件类型</th>
+									<th width="">文件描述/文件</th>
+									<th width="100px">文件大小(M)</th>
+									<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
@@ -310,7 +309,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileAttachment.attachLength}M;${fileAttachment.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -385,6 +388,9 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
 									<td class="op-td">
 										<div class="op-btn-box" >
@@ -457,15 +463,14 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th>类型限制</th>
-<%--							<th>文件名</th>--%>
-							<th width="150px">操作</th>
+									<th width="30%">文件类型</th>
+									<th width="">文件描述/文件</th>
+									<th width="100px">文件大小(M)</th>
+									<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
@@ -482,7 +487,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+								</td>
+								<td></td>
 
 								<td class="op-td">
 									<div class="op-btn-box" >
@@ -559,6 +568,9 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
 									<td class="op-td">
 										<div class="op-btn-box" >
@@ -632,15 +644,14 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th>类型限制</th>
-<%--							<th>文件名</th>--%>
-							<th width="150px">操作</th>
+									<th width="30%">文件类型</th>
+									<th width="">文件描述/文件</th>
+									<th width="100px">文件大小(M)</th>
+									<th width="150px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
@@ -657,7 +668,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -733,6 +748,9 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
 									<td class="op-td">
 										<div class="op-btn-box" >

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordAudit.jsp

@@ -7,6 +7,7 @@
 	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
 	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/common/css/style.css"/>
 	<%@include file="/webpage/include/treetable.jsp" %>
 	<script type="text/javascript">
         var validateForm;
@@ -424,12 +425,13 @@
 								<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" style="padding:0 16px;">
-									<table id="upTable" class="table table-bordered table-condensed details">
+									<table id="upTable" class="table table-bordered table-condensed">
 										<thead>
 										<tr>
 											<th width="30%">文件类型</th>
-											<th width="">文件名</th>
-											<th width="100px">操作</th>
+											<th width="">文件描述/文件</th>
+											<th width="100px">文件大小(M)</th>
+											<th width="150px">操作</th>
 										</tr>
 										</thead>
 										<tbody id="file_attachment">
@@ -450,14 +452,15 @@
 														</c:choose>
 													</c:otherwise>
 												</c:choose>
-												<td style="text-align:center;">
+												<td>
 													<c:choose>
 														<c:when test="${fileAttachment.flag == 0}">
-															${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}
+															<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+															<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
 														</c:when>
 														<c:otherwise>
 															<c:choose>
-																<c:when test="${projectReportRecord.uploadMode == 2}">
+																<c:when test="${projectcontentinfo.uploadMode == 2}">
 																	<c:choose>
 																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
                                                            or fn:containsIgnoreCase(fileAttachment.attachName,'png')
@@ -469,7 +472,7 @@
 																		<c:otherwise>
 																			<c:choose>
 																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
+																					<a class="attention-info" href="javascript:void(0)"  onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
 																				</c:when>
 																				<c:otherwise>
 																					<c:choose>
@@ -499,7 +502,7 @@
 																		</c:when>
 																		<c:otherwise>
 																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
+																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
 																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
 																				</c:when>
 																				<c:otherwise>
@@ -525,6 +528,9 @@
 													</c:choose>
 												</td>
 												<td class="op-td" style="text-align:center;">
+														${fileAttachment.fileSize}
+												</td>
+												<td class="op-td" style="text-align:center;">
 													<div class="op-btn-box" >
 														<c:choose>
 															<c:when test="${fileAttachment.flag == 0}">
@@ -575,12 +581,13 @@
 								<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 								<span id="gistdata_title"></span>
 								<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-									<table id="gistdata_upTable" class="table table-bordered table-condensed details">
+									<table id="gistdata_upTable" class="table table-bordered table-condensed">
 										<thead>
 										<tr>
 											<th width="30%">文件类型</th>
-											<th width="">文件名</th>
-											<th width="100px">操作</th>
+											<th width="">文件描述/文件</th>
+											<th width="100px">文件大小(M)</th>
+											<th width="150px">操作</th>
 										</tr>
 										</thead>
 										<tbody id="file_gistdata">
@@ -602,80 +609,84 @@
 														</c:choose>
 													</c:otherwise>
 												</c:choose>
-												<td style="text-align:center;">
-													<c:choose>
-														<c:when test="${fileGistdata.flag == 0}">
-															${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}
-														</c:when>
-														<c:otherwise>
+														<td>
 															<c:choose>
-																<c:when test="${projectReportRecord.uploadMode == 2}">
+																<c:when test="${fileGistdata.flag == 0}">
+																	<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+																	<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+																</c:when>
+																<c:otherwise>
 																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
+																		<c:when test="${projectcontentinfo.uploadMode == 2}">
+																			<c:choose>
+																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
                                                            or fn:containsIgnoreCase(fileGistdata.attachName,'png')
                                                            or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
                                                            or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
                                                            or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																			<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
+																					<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
 																				</c:when>
 																				<c:otherwise>
 																					<c:choose>
-																						<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
+																						<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
+																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
+																						</c:when>
+																						<c:otherwise>
+																							<c:choose>
+																								<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
 																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
 																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
 																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',3)">${fileGistdata.attachName}</a>
-																						</c:when>
-																						<c:otherwise>
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName}</a>
+																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',3)">${fileGistdata.attachName}</a>
+																								</c:when>
+																								<c:otherwise>
+																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName}</a>
+																								</c:otherwise>
+																							</c:choose>
 																						</c:otherwise>
 																					</c:choose>
 																				</c:otherwise>
 																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
+																		</c:when>
+																		<c:otherwise>
+																			<c:choose>
+																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
 																				   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
 																				   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
 																				   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
 																				   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																			<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
+																					<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
 																				</c:when>
 																				<c:otherwise>
 																					<c:choose>
-																						<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
+																						<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
+																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
+																						</c:when>
+																						<c:otherwise>
+																							<c:choose>
+																								<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
 																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
 																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
 																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',3)">${fileGistdata.attachName}</a>
-																						</c:when>
-																						<c:otherwise>
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName}</a>
+																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',3)">${fileGistdata.attachName}</a>
+																								</c:when>
+																								<c:otherwise>
+																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName}</a>
+																								</c:otherwise>
+																							</c:choose>
 																						</c:otherwise>
 																					</c:choose>
 																				</c:otherwise>
 																			</c:choose>
 																		</c:otherwise>
 																	</c:choose>
+																	<%--												<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
 																</c:otherwise>
 															</c:choose>
-															<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
-														</c:otherwise>
-													</c:choose>
-												</td>
+														</td>
+														<td class="op-td"  style="text-align:center;">
+																${fileGistdata.fileSize}
+														</td>
 												<td class="op-td"  style="text-align:center;">
 													<div class="op-btn-box" >
 														<c:choose>
@@ -729,12 +740,13 @@
 								<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 								<span id="other_title"></span>
 								<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-									<table id="upTable_other" class="table table-bordered table-condensed details">
+									<table id="upTable_other" class="table table-bordered table-condensed">
 										<thead>
 										<tr>
 											<th width="30%">文件类型</th>
-											<th width="">文件名</th>
-											<th width="100px">操作</th>
+											<th width="">文件描述/文件</th>
+											<th width="100px">文件大小(M)</th>
+											<th width="150px">操作</th>
 										</tr>
 										</thead>
 										<tbody id="file_other">
@@ -756,80 +768,84 @@
 														</c:choose>
 													</c:otherwise>
 												</c:choose>
-												<td style="text-align:center;">
-													<c:choose>
-														<c:when test="${fileOther.flag == 0}">
-															${fileOther.attachLength}M;  ${fileOther.attachTypes}
-														</c:when>
-														<c:otherwise>
+														<td>
 															<c:choose>
-																<c:when test="${projectReportRecord.uploadMode == 2}">
+																<c:when test="${fileOther.flag == 0}">
+																	<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+																	<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+																</c:when>
+																<c:otherwise>
 																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
+																		<c:when test="${projectcontentinfo.uploadMode == 2}">
+																			<c:choose>
+																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
                                                            or fn:containsIgnoreCase(fileOther.attachName,'png')
                                                            or fn:containsIgnoreCase(fileOther.attachName,'gif')
                                                            or fn:containsIgnoreCase(fileOther.attachName,'bmp')
                                                            or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																			<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
+																					<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
 																				</c:when>
 																				<c:otherwise>
 																					<c:choose>
-																						<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																						<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
+																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
+																						</c:when>
+																						<c:otherwise>
+																							<c:choose>
+																								<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
 																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
 																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
 																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',3)">${fileOther.attachName}</a>
-																						</c:when>
-																						<c:otherwise>
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName}</a>
+																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',3)">${fileOther.attachName}</a>
+																								</c:when>
+																								<c:otherwise>
+																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName}</a>
+																								</c:otherwise>
+																							</c:choose>
 																						</c:otherwise>
 																					</c:choose>
 																				</c:otherwise>
 																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
+																		</c:when>
+																		<c:otherwise>
+																			<c:choose>
+																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
 																				   or fn:containsIgnoreCase(fileOther.attachName,'png')
 																				   or fn:containsIgnoreCase(fileOther.attachName,'gif')
 																				   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
 																				   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																			<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
+																					<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
 																				</c:when>
 																				<c:otherwise>
 																					<c:choose>
-																						<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																						<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
+																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
+																						</c:when>
+																						<c:otherwise>
+																							<c:choose>
+																								<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
 																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
 																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
 																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',3)">${fileOther.attachName}</a>
-																						</c:when>
-																						<c:otherwise>
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName}</a>
+																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',3)">${fileOther.attachName}</a>
+																								</c:when>
+																								<c:otherwise>
+																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName}</a>
+																								</c:otherwise>
+																							</c:choose>
 																						</c:otherwise>
 																					</c:choose>
 																				</c:otherwise>
 																			</c:choose>
 																		</c:otherwise>
 																	</c:choose>
+																	<!--													<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>-->
 																</c:otherwise>
 															</c:choose>
-															<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>--%>
-														</c:otherwise>
-													</c:choose>
-												</td>
+														</td>
+														<td class="op-td" style="text-align:center;">
+																${fileOther.fileSize}
+														</td>
 												<td class="op-td" style="text-align:center;">
 													<div class="op-btn-box" >
 														<c:choose>

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordForm.jsp

@@ -252,14 +252,12 @@
 				<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" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -276,7 +274,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -352,6 +354,9 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
 									<td class="op-td">
 										<div class="op-btn-box" >
@@ -418,14 +423,13 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th  width="40%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -443,7 +447,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -518,6 +526,9 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
 									<td class="op-td">
 										<div class="op-btn-box" >
@@ -584,14 +595,13 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th>类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -609,7 +619,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileOther.attachLength}M;${fileOther.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -684,6 +698,9 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
 									<td class="op-td">
 										<div class="op-btn-box" >

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordModify.jsp

@@ -265,14 +265,13 @@
 				<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" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -289,7 +288,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+								</td>
+								<td></td>
 <%--								<td></td>--%>
 								<td class="op-td">
 									<div class="op-btn-box" >
@@ -365,6 +368,9 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
 									<td class="op-td">
 										<div class="op-btn-box" >
@@ -431,14 +437,13 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -456,7 +461,11 @@
 										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
 									</c:otherwise>
 								</c:choose>
-								<td>${fileGistdata.attachLength}M；${fileGistdata.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -532,6 +541,9 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
 									<td class="op-td">
 										<div class="op-btn-box" >
@@ -599,14 +611,13 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -625,7 +636,11 @@
 									</c:otherwise>
 								</c:choose>
 <%--								<td></td>--%>
-								<td>${fileOther.attachLength}M；${fileOther.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -700,6 +715,9 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
 <%--									</td>--%>
 									<td class="op-td">

src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordModifyApply.jsp

@@ -257,14 +257,13 @@
 				<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" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -274,7 +273,7 @@
 								<td style="display:none">${fileAttachment.id}</td>
 								<td style="display:none">${fileAttachment.mustFlag}</td>
 								<c:choose>
-									<c:when test="${fileOther.mustFlag == 1}">
+									<c:when test="${fileAttachment.mustFlag == 1}">
 										<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
 									</c:when>
 									<c:otherwise>
@@ -282,7 +281,11 @@
 									</c:otherwise>
 								</c:choose>
 <%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>--%>
-								<td>${fileAttachment.attachLength}M；${fileAttachment.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -310,7 +313,7 @@
 														</c:when>
 														<c:otherwise>
 															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
@@ -341,7 +344,7 @@
 														</c:when>
 														<c:otherwise>
 															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
@@ -360,6 +363,9 @@
 <%--									<td>--%>
 <%--										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
 <%--									</td>--%>
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
@@ -404,14 +410,13 @@
 				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
 				<span id="gistdata_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed details tree_table">
+					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -431,7 +436,11 @@
 								</c:choose>
 <%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>--%>
 <%--								<td></td>--%>
-								<td>${fileGistdata.attachLength}M；${fileGistdata.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -460,7 +469,7 @@
 														</c:when>
 														<c:otherwise>
 															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
@@ -491,7 +500,7 @@
 														</c:when>
 														<c:otherwise>
 															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
@@ -510,6 +519,10 @@
 <%--									<td>--%>
 <%--										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
 <%--									</td>--%>
+
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
@@ -554,14 +567,13 @@
 				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
 				<span id="other_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed details tree_table">
+					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -580,7 +592,11 @@
 									</c:otherwise>
 								</c:choose>
 <%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>--%>
-								<td>${fileOther.attachLength}M；${fileOther.attachTypes}</td>
+								<td>
+									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>
+									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+								</td>
+								<td></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -609,7 +625,7 @@
 														</c:when>
 														<c:otherwise>
 															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
@@ -640,7 +656,7 @@
 														</c:when>
 														<c:otherwise>
 															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
@@ -659,6 +675,10 @@
 <%--									<td>--%>
 <%--										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
 <%--									</td>--%>
+
+									<td class="op-td" style="text-align:center;">
+											${workClientAttachment.fileSize}
+									</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>

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

@@ -497,7 +497,7 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-                ,{field:'op',align:'center',title:"操作",width:180,templet:function(d){
+                ,{field:'op',align:'center',title:"操作",width:240,templet:function(d){
                         ////对操作进行初始化
                         var xml="<div class=\"layui-btn-group\">";
                         if(d.notifyFlag != undefined && d.notifyFlag !=null && "" != d.notifyFlag && d.notifyFlag == 1)
@@ -529,6 +529,10 @@
                         {
 							xml+="<a href=\"#\" onclick=\"openDialogView('文件上传', '${ctx}/ruralProject/ruralProjectRecords/formAccessory?id=" + d.id + "','95%', '95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 上传文件</a>";
                         }
+						if(d.reportDataFlag != undefined && d.reportDataFlag =="1")
+						{
+							xml+="<a href=\"${ctx}/ruralProject/ruralCostProjectRecords/createReportDataId?id=" + d.id + "&projectType=1"+"\" onclick=\"return confirmx('确认要生成报告号吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-orange\"> 生成报告号</a>";
+						}
                         if(d.canedit3 != undefined && d.canedit3 =="1")
                         {
                             //xml+="<a href=\"javascript:void(0)\" onclick=\"openDialogre('项目变更管理', '${ctx}/ruralProject/ruralProjectRecordsAlter/form?alterBeforeRecords.id='+encodeURIComponent('" + d.id + "'),'95%','95%','','送审,暂存,关闭')\" style=\"color: white;background: darkseagreen\" class=\"op-btn op-btn-op-btn-revert\" ><i class=\"fa fa-edit\"></i> 变更</a>";
@@ -579,6 +583,7 @@
 
                     ,"deleteAdmin":<c:choose><c:when test="${'1' == projectRecords.flagAdmin && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					,"modifyRecords":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '2' != projectRecords.projectReportStatus && '5' != projectRecords.projectReportStatus && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+					,"reportDataFlag":<c:choose><c:when test="${fns:getUser().id == projectRecords.createBy.id && '0' == projectRecords.reportDataFlag && projectRecords.projectStatus == 5}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 					</c:when>
                     <c:otherwise>
                     ,"candel":"0"