上传文件格式更改

src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -425,7 +425,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
             projectFilingbatchRelationDao.insert(filingbatchRelation);
         }
         //新增项目树形信息
-        if (proInfos.length!=0){
+        if (proInfos.length!=0|| null == proInfos){
             this.insertProInfo(proInfos,flags,proId,projectFilingBatch.getId());
         }
         long t4 = System.currentTimeMillis();

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp

@@ -1760,12 +1760,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">
+						<table id="upTable" class="table table-bordered table-condensed">
 							<thead>
 							<tr>
-									<%-- <th>序号</th>--%>
 								<th width="30%">文件类型</th>
-								<th width="">文件名</th>
+								<th >文件描述/文件</th>
+								<th width="100px">文件大小(M)</th>
 								<th width="100px">操作</th>
 							</tr>
 							</thead>
@@ -1787,10 +1787,11 @@
 											</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 style="overflow: hidden"><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>
@@ -1841,6 +1842,7 @@
 											</c:otherwise>
 										</c:choose>
 									</td>
+									<td>${fileAttachment.fileSize}</td>
 									<td class="op-td" style="text-align:center;">
 										<div class="op-btn-box" >
 											<c:choose>
@@ -1889,12 +1891,12 @@
 					<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>序号</th>--%>
 								<th width="30%">文件类型</th>
-								<th width="">文件名</th>
+								<th >文件描述/文件</th>
+								<th width="100px">文件大小(M)</th>
 								<th width="100px">操作</th>
 							</tr>
 							</thead>
@@ -1917,10 +1919,11 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-									<td style="text-align:center;">
+									<td>
 										<c:choose>
 											<c:when test="${fileGistdata.flag == 0}">
-												${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}
+												<div style="overflow: hidden"><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>
@@ -1971,6 +1974,7 @@
 											</c:otherwise>
 										</c:choose>
 									</td>
+									<td>${fileGistdata.fileSize}</td>
 									<td class="op-td"  style="text-align:center;">
 										<div class="op-btn-box" >
 											<c:choose>
@@ -2019,12 +2023,12 @@
 					<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>序号</th>--%>
 								<th width="30%">文件类型</th>
-								<th width="">文件名</th>
+								<th >文件描述/文件</th>
+								<th width="100px">文件大小(M)</th>
 								<th width="100px">操作</th>
 							</tr>
 							</thead>
@@ -2047,10 +2051,11 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-									<td style="text-align:center;">
+									<td>
 										<c:choose>
 											<c:when test="${fileOther.flag == 0}">
-												${fileOther.attachLength}M;  ${fileOther.attachTypes}
+												<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>
@@ -2101,6 +2106,7 @@
 											</c:otherwise>
 										</c:choose>
 									</td>
+									<td>${fileGistdata.fileSize}</td>
 									<td class="op-td" style="text-align:center;">
 										<div class="op-btn-box" >
 											<c:choose>

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

@@ -1235,14 +1235,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>类型限制</th>
-<%--									<th>文件名</th>--%>
+							<th width="30%">文件类型</th>
+							<th>文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="100px">操作</th>
 						</tr>
 						</thead>
@@ -1259,7 +1257,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 style="overflow: hidden"><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=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -1336,6 +1338,7 @@
 									</c:otherwise>
 									</c:choose>
 <%--										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
+									<td class="op-td">${workClientAttachment.fileSize}</td>
 									<td class="op-td">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
@@ -1411,15 +1414,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 >类型限制</th>
-<%--									<th>文件名</th>--%>
-							<th width="150px">操作</th>
+							<th width="30%">文件类型</th>
+							<th >文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
@@ -1436,7 +1437,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 style="overflow: hidden"><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=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -1514,6 +1519,9 @@
 									</c:choose>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
 									<td class="op-td">
+										${workClientAttachment.fileSize}
+									</td>
+									<td class="op-td">
 										<div class="op-btn-box" >
 
 												<%--附件下载删除--%>
@@ -1589,15 +1597,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="150px">操作</th>
+							<th width="30%">文件类型</th>
+							<th>文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
@@ -1614,7 +1620,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 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>
+								</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=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -1689,7 +1699,8 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
+									<td>${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/cost/projectcontentinfo/new/reportModify.jsp

@@ -1101,15 +1101,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>类型限制</th>
-<%--							<th>文件名</th>--%>
-							<th width="150px">操作</th>
+							<th width="30%">文件类型</th>
+							<th>文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
@@ -1126,8 +1124,12 @@
 										<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 class="op-td">
+								<td>
+									<div style="overflow: hidden"><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" style="text-align: center">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectId}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
@@ -1203,7 +1205,10 @@
 										</c:otherwise>
 									</c:choose>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td">
+									<td>
+											${workClientAttachment.fileSize}
+									</td>
+									<td class="op-td" style="text-align: center">
 										<div class="op-btn-box" >
 											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 
@@ -1263,15 +1268,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>类型限制</th>
-<%--							<th>文件名</th>--%>
-							<th width="150px">操作</th>
+							<th width="30%">文件类型</th>
+							<th>文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
@@ -1288,8 +1291,12 @@
 										<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 class="op-td">
+								<td>
+									<div style="overflow: hidden"><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" style="text-align: center">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectId}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
@@ -1343,7 +1350,10 @@
 										</c:otherwise>
 									</c:choose>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td">
+									<td>
+											${workClientAttachment.fileSize}
+									</td>
+									<td class="op-td" style="text-align: center">
 										<div class="op-btn-box" >
 											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 
@@ -1403,15 +1413,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>类型限制</th>
-<%--							<th>文件名</th>--%>
-							<th width="150px">操作</th>
+							<th width="30%">文件类型</th>
+							<th>文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
@@ -1428,9 +1436,13 @@
 										<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 class="op-td">
-									<div class="op-btn-box" >
+								<td>
+									<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>
+								</td>
+								<td></td>
+								<td class="op-td" style="text-align: center">
+									<div class="op-btn-box" style="text-align: center">
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectId}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
 								</td>
@@ -1482,7 +1494,10 @@
 										</c:otherwise>
 									</c:choose>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td">
+									<td>
+										${workClientAttachment.fileSize}
+									</td>
+									<td class="op-td" style="text-align: center">
 										<div class="op-btn-box" >
 											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 

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

@@ -542,11 +542,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">
+							<table id="upTable" class="table table-bordered table-condensed">
 								<thead>
 								<tr>
 									<th width="30%">文件类型</th>
-									<th width="">文件名</th>
+									<th width="">文件描述/文件</th>
+									<th width="100px">文件大小(M)</th>
 									<th width="150px">操作</th>
 								</tr>
 								</thead>
@@ -568,10 +569,11 @@
 												</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 style="overflow: hidden"><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>
 
@@ -643,6 +645,7 @@
 												</c:otherwise>
 											</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>
@@ -693,11 +696,12 @@
 						<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="">文件描述/文件</th>
+									<th width="100px">文件大小(M)</th>
 									<th width="150px">操作</th>
 								</tr>
 								</thead>
@@ -720,10 +724,11 @@
 												</c:choose>
 											</c:otherwise>
 										</c:choose>
-										<td style="text-align:center;">
+										<td>
 											<c:choose>
 												<c:when test="${fileGistdata.flag == 0}">
-													${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}
+													<div style="overflow: hidden"><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>
@@ -794,6 +799,9 @@
 												</c:otherwise>
 											</c:choose>
 										</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>
@@ -846,11 +854,12 @@
 						<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 width="30%">文件类型</th>
-									<th width="">文件名</th>
+									<th width="">文件描述/文件</th>
+									<th width="100px">文件大小(M)</th>
 									<th width="150px">操作</th>
 								</tr>
 								</thead>
@@ -873,10 +882,11 @@
 												</c:choose>
 											</c:otherwise>
 										</c:choose>
-										<td style="text-align:center;">
+										<td>
 											<c:choose>
 												<c:when test="${fileOther.flag == 0}">
-													${fileOther.attachLength}M;  ${fileOther.attachTypes}
+													<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>
@@ -948,6 +958,9 @@
 											</c:choose>
 										</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>
 													<c:when test="${fileOther.flag == 0}">

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

@@ -536,11 +536,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">
+							<table id="upTable" class="table table-bordered table-condensed">
 								<thead>
 								<tr>
 									<th width="30%">文件类型</th>
-									<th width="">文件名</th>
+									<th >文件描述/文件</th>
+									<th width="100px">文件大小(M)</th>
 									<th width="150px">操作</th>
 								</tr>
 								</thead>
@@ -562,10 +563,11 @@
 												</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 style="overflow: hidden"><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>
 
@@ -617,7 +619,10 @@
 												</c:otherwise>
 											</c:choose>
 										</td>
-										<td class="op-td" style="text-align:center;">
+										<td>
+												${fileAttachment.fileSize}
+										</td>
+										<td class="op-td" style="text-align: center">
 											<div class="op-btn-box" >
 												<c:choose>
 													<c:when test="${fileAttachment.flag == 0}">
@@ -667,11 +672,12 @@
 						<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 >文件描述/文件</th>
+									<th width="100px">文件大小(M)</th>
 									<th width="150px">操作</th>
 								</tr>
 								</thead>
@@ -694,10 +700,11 @@
 												</c:choose>
 											</c:otherwise>
 										</c:choose>
-										<td style="text-align:center;">
+										<td>
 											<c:choose>
 												<c:when test="${fileGistdata.flag == 0}">
-													${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}
+													<div style="overflow: hidden"><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>
@@ -748,7 +755,10 @@
 												</c:otherwise>
 											</c:choose>
 										</td>
-										<td class="op-td"  style="text-align:center;">
+										<td>
+												${fileGistdata.fileSize}
+										</td>
+										<td class="op-td" style="text-align: center">
 											<div class="op-btn-box" >
 												<c:choose>
 													<c:when test="${fileGistdata.flag == 0}">
@@ -800,11 +810,12 @@
 						<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 width="30%">文件类型</th>
-									<th width="">文件名</th>
+									<th >文件描述/文件</th>
+									<th width="100px">文件大小(M)</th>
 									<th width="150px">操作</th>
 								</tr>
 								</thead>
@@ -827,10 +838,11 @@
 												</c:choose>
 											</c:otherwise>
 										</c:choose>
-										<td style="text-align:center;">
+										<td>
 											<c:choose>
 												<c:when test="${fileOther.flag == 0}">
-													${fileOther.attachLength}M;  ${fileOther.attachTypes}
+													<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>
@@ -881,6 +893,9 @@
 												</c:otherwise>
 											</c:choose>
 										</td>
+										<td>
+												${fileGistdata.fileSize}
+										</td>
 										<td class="op-td" style="text-align:center;">
 											<div class="op-btn-box" >
 												<c:choose>

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

@@ -16,10 +16,10 @@
             var span=$(obj).find("td").eq(2);
             $(span).toggle(function () {
                 $(tiao).hide();
-                $(span).find("span").attr("class","default_shut")
+                $(span).find("span").eq(0).attr("class","default_shut")
             },function () {
                 $(tiao).show();
-                $(span).find("span").attr("class","default_open")
+                $(span).find("span").eq(0).attr("class","default_open")
             });
         }
         var validateForm;
@@ -821,19 +821,18 @@
                 <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="150px">操作</th>
+                            <th width="30%">文件类型</th>
+                            <th >文件描述/文件</th>
+                            <th width="100px">文件大小(M)</th>
+                            <th width="100px">操作</th>
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
                         <c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-                                <tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
+                                <tr id="file_attachment_${fileAttachment.id}" onclick="listTr(this)">
                                     <td style="display:none"><span class="faid">${fileAttachment.id}</span></td>
                                     <td style="display:none">${fileAttachment.mustFlag}</td>
                                     <c:choose>
@@ -845,8 +844,12 @@
                                         </c:otherwise>
                                     </c:choose>
 <%--                                    <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>--%>
-                                    <td>${fileAttachment.attachLength}M;${fileAttachment.attachTypes}</td>
-                                    <td class="op-td">
+                                    <td>
+                                        <div style="overflow: hidden"><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" style="text-align: center">
                                         <div class="op-btn-box" >
                                             <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
                                         </div>
@@ -854,7 +857,7 @@
                                     <td style="display:none">${fileAttachment.fileFlag}</td>
                                 </tr>
                             <c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_attachment_tr">
+                                <tr class="file_attachment_${fileAttachment.id}">
                                     <td></td>
                                     <c:choose>
                                         <c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -922,6 +925,9 @@
                                     </c:choose>
 <%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
                                     <td class="op-td">
+                                        ${workClientAttachment.fileSize}
+                                    </td>
+                                    <td class="op-td" style="text-align: center">
                                         <div class="op-btn-box" >
                                                 <%--附件下载删除--%>
                                             <c:choose>
@@ -965,19 +971,18 @@
                 <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="100px">最大容量(M)</th>--%>
-                            <th >类型限制</th>
-<%--                            <th>文件名</th>--%>
-                            <th width="150px">操作</th>
+                            <th width="30%">文件类型</th>
+                            <th >文件描述/文件</th>
+                            <th width="100px">文件大小(M)</th>
+                            <th width="100px">操作</th>
                         </tr>
                         </thead>
                         <tbody id="file_gistdata">
                         <c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-                                <tr id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
+                                <tr id="file_gistdata_${fileGistdata.id}" onclick="listTr(this)">
                                     <td style="display:none"><span class="fgid">${fileGistdata.id}</span></td>
                                     <td style="display:none">${fileGistdata.mustFlag}</td>
                                     <c:choose>
@@ -989,8 +994,12 @@
                                         </c:otherwise>
                                     </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>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
-                                    <td class="op-td">
+                                    <td>
+                                        <div style="overflow: hidden"><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" style="text-align: center">
                                         <div class="op-btn-box" >
                                             <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
                                         </div>
@@ -999,7 +1008,7 @@
 
                                 </tr>
                             <c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_gistdata_tr">
+                                <tr class="file_gistdata_${fileGistdata.id}">
                                     <td></td>
                                     <c:choose>
                                         <c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -1067,6 +1076,9 @@
                                     </c:choose>
 <%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
                                     <td class="op-td">
+                                        ${workClientAttachment.fileSize}
+                                    </td>
+                                    <td class="op-td" style="text-align: center">
                                         <div class="op-btn-box" >
                                                 <%--附件下载删除--%>
                                             <c:choose>
@@ -1110,19 +1122,18 @@
                 <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 width="30%">电子件名称</th>
-<%--                            <th width="100px">最大容量(M)</th>--%>
-                            <th >类型限制</th>
-<%--                            <th>文件名</th>--%>
-                            <th width="150px">操作</th>
+                            <th width="30%">文件类型</th>
+                            <th >文件描述/文件</th>
+                            <th width="100px">文件大小(M)</th>
+                            <th width="100px">操作</th>
                         </tr>
                         </thead>
                         <tbody id="file_other">
                         <c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-                                <tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
+                                <tr id="file_other_${fileOther.id}" onclick="listTr(this)">
                                     <td style="display:none"><span class="foid">${fileOther.id}</span></td>
                                     <td style="display:none">${fileOther.mustFlag}</td>
                                     <c:choose>
@@ -1134,9 +1145,13 @@
                                         </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 class="op-td">
-                                        <div class="op-btn-box" >
+                                    <td>
+                                        <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>
+                                    </td>
+                                    <td></td>
+                                    <td class="op-td " style="text-align: center">
+                                        <div class="op-btn-box" style="text-align: center">
                                             <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable_other',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
                                         </div>
                                     </td>
@@ -1144,7 +1159,7 @@
 
                                 </tr>
                             <c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_other_tr">
+                                <tr class="file_other_${fileOther.id}">
                                     <td></td>
                                     <c:choose>
                                         <c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -1212,6 +1227,9 @@
                                     </c:choose>
 <%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
                                     <td class="op-td">
+                                        ${workClientAttachment.fileSize}
+                                    </td>
+                                    <td class="op-td" style="text-align: center">
                                         <div class="op-btn-box" >
                                                 <%--附件下载删除--%>
                                             <c:choose>

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

@@ -16,10 +16,10 @@
             var span=$(obj).find("td").eq(2);
             $(span).toggle(function () {
                 $(tiao).hide();
-                $(span).find("span").attr("class","default_shut")
+                $(span).find("span").eq(0).attr("class","default_shut")
             },function () {
                 $(tiao).show();
-                $(span).find("span").attr("class","default_open")
+                $(span).find("span").eq(0).attr("class","default_open")
             });
         }
         var validateForm;
@@ -527,19 +527,18 @@
                 <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="150px">操作</th>
+                            <th width="30%">文件类型</th>
+                            <th >文件描述/文件</th>
+                            <th width="100px">文件大小(M)</th>
+                            <th width="100px">操作</th>
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
                         <c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-                                <tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
+                                <tr id="file_attachment_${fileAttachment.id}" onclick="listTr(this)">
                                     <td style="display:none"><span class="faid">${fileAttachment.id}</span></td>
                                     <td style="display:none">${fileAttachment.mustFlag}</td>
                                     <c:choose>
@@ -551,8 +550,12 @@
                                         </c:otherwise>
                                     </c:choose>
 <%--                                    <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>--%>
-                                    <td>${fileAttachment.attachLength}M;${fileAttachment.attachTypes}</td>
-                                    <td class="op-td">
+                                    <td>
+                                        <div style="overflow: hidden"><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" style="text-align: center">
                                         <div class="op-btn-box" >
                                             <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
                                         </div>
@@ -560,7 +563,7 @@
                                     <td style="display:none">${fileAttachment.fileFlag}</td>
                                 </tr>
                             <c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_attachment_tr">
+                                <tr class="file_attachment_${fileAttachment.id}">
                                     <td></td>
                                     <c:choose>
                                         <c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -607,7 +610,10 @@
                                         </c:otherwise>
                                     </c:choose>
 <%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-                                    <td class="op-td">
+                                    <td>
+                                            ${workClientAttachment.fileSize}
+                                    </td>
+                                    <td class="op-td" style="text-align: center">
                                         <div class="op-btn-box" >
                                                 <%--附件下载删除--%>
                                             <c:choose>
@@ -651,19 +657,18 @@
                 <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="100px">最大容量(M)</th>--%>
-                            <th >类型限制</th>
-<%--                            <th>文件名</th>--%>
-                            <th width="150px">操作</th>
+                            <th width="30%">文件类型</th>
+                            <th >文件描述/文件</th>
+                            <th width="100px">文件大小(M)</th>
+                            <th width="100px">操作</th>
                         </tr>
                         </thead>
                         <tbody id="file_gistdata">
                         <c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-                                <tr id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
+                                <tr id="file_gistdata_${fileGistdata.id}" onclick="listTr(this)">
                                     <td style="display:none"><span class="fgid">${fileGistdata.id}</span></td>
                                     <td style="display:none">${fileGistdata.mustFlag}</td>
                                     <c:choose>
@@ -675,8 +680,12 @@
                                         </c:otherwise>
                                     </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>${fileGistdata.attachLength}M;${fileGistdata.attachTypes}</td>
-                                    <td class="op-td">
+                                    <td>
+                                        <div style="overflow: hidden"><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" style="text-align: center">
                                         <div class="op-btn-box" >
                                             <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
                                         </div>
@@ -685,7 +694,7 @@
 
                                 </tr>
                             <c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_gistdata_tr">
+                                <tr class="file_gistdata_${fileGistdata.id}">
                                     <td></td>
                                     <c:choose>
                                         <c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -732,7 +741,10 @@
                                         </c:otherwise>
                                     </c:choose>
 <%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-                                    <td class="op-td">
+                                    <td>
+                                            ${workClientAttachment.fileSize}
+                                    </td>
+                                    <td class="op-td" style="text-align: center">
                                         <div class="op-btn-box" >
                                                 <%--附件下载删除--%>
                                             <c:choose>
@@ -776,19 +788,18 @@
                 <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 width="30%">电子件名称</th>
-<%--                            <th width="100px">最大容量(M)</th>--%>
-                            <th >类型限制</th>
-<%--                            <th>文件名</th>--%>
-                            <th width="150px">操作</th>
+                            <th width="30%">文件类型</th>
+                            <th >文件描述/文件</th>
+                            <th width="100px">文件大小(M)</th>
+                            <th width="100px">操作</th>
                         </tr>
                         </thead>
                         <tbody id="file_other">
                         <c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-                                <tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
+                                <tr id="file_other_${fileOther.id}" onclick="listTr(this)">
                                     <td style="display:none"><span class="foid">${fileOther.id}</span></td>
                                     <td style="display:none">${fileOther.mustFlag}</td>
                                     <c:choose>
@@ -800,8 +811,12 @@
                                         </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 class="op-td">
+                                    <td>
+                                        <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>
+                                    </td>
+                                    <td></td>
+                                    <td class="op-td" style="text-align: center">
                                         <div class="op-btn-box" >
                                             <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable_other',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
                                         </div>
@@ -810,7 +825,7 @@
 
                                 </tr>
                             <c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_other_tr">
+                                <tr class="file_other_${fileOther.id}">
                                     <td></td>
                                     <c:choose>
                                         <c:when test="${projectcontentinfo.uploadMode == 2}">
@@ -857,7 +872,10 @@
                                         </c:otherwise>
                                     </c:choose>
 <%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-                                    <td class="op-td">
+                                    <td>
+                                            ${workClientAttachment.fileSize}
+                                    </td>
+                                    <td class="op-td" style="text-align: center">
                                         <div class="op-btn-box" >
                                                 <%--附件下载删除--%>
                                             <c:choose>

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

@@ -1165,15 +1165,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 >类型限制</th>
-<%--							<th>文件名</th>--%>
-							<th width="150px">操作</th>
+							<th width="30%">文件类型</th>
+							<th >文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
@@ -1189,10 +1187,12 @@
 										<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 class="op-td">
+								<td>
+									<div style="overflow: hidden"><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"  style="text-align: center">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
@@ -1267,7 +1267,10 @@
 										</c:otherwise>
 									</c:choose>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td">
+									<td>
+											${workClientAttachment.fileSize}
+									</td>
+									<td class="op-td" style="text-align: center">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
 											<c:choose>
@@ -1343,15 +1346,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 >类型限制</th>
-<%--							<th>文件名</th>--%>
-							<th width="150px">操作</th>
+							<th width="30%">文件类型</th>
+							<th >文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
@@ -1368,9 +1369,12 @@
 										<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 class="op-td">
+								<td>
+									<div style="overflow: hidden"><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"  style="text-align: center">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
@@ -1445,7 +1449,10 @@
 										</c:otherwise>
 									</c:choose>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td">
+									<td>
+											${workClientAttachment.fileSize}
+									</td>
+									<td class="op-td" style="text-align: center">
 										<div class="op-btn-box" >
 
 												<%--附件下载删除--%>
@@ -1521,15 +1528,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="150px">操作</th>
+							<th width="30%">文件类型</th>
+							<th >文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
@@ -1546,8 +1551,12 @@
 										<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 class="op-td">
+								<td>
+									<div style="overflow: hidden"><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"  style="text-align: center">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
@@ -1622,7 +1631,10 @@
 										</c:otherwise>
 									</c:choose>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td">
+									<td>
+											${workClientAttachment.fileSize}
+									</td>
+									<td class="op-td" style="text-align: center">
 										<div class="op-btn-box" >
 
 												<%--附件下载删除--%>

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

@@ -785,15 +785,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 >类型限制</th>
-<%--							<th>文件名</th>--%>
-							<th width="150px">操作</th>
+							<th width="30%">文件类型</th>
+							<th >文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
@@ -809,10 +807,12 @@
 										<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 class="op-td">
+								<td>
+									<div style="overflow: hidden"><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" style="text-align: center">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
@@ -867,7 +867,10 @@
 										</c:otherwise>
 									</c:choose>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td">
+									<td>
+											${workClientAttachment.fileSize}
+									</td>
+									<td class="op-td" style="text-align: center">
 										<div class="op-btn-box" >
 												<%--附件下载删除--%>
 											<c:choose>
@@ -943,15 +946,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 >类型限制</th>
-<%--							<th>文件名</th>--%>
-							<th width="150px">操作</th>
+							<th width="30%">文件类型</th>
+							<th >文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_gistdata">
@@ -968,9 +969,12 @@
 										<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 class="op-td">
+								<td>
+									<div style="overflow: hidden"><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" style="text-align: center">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
@@ -1025,7 +1029,10 @@
 										</c:otherwise>
 									</c:choose>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td">
+									<td>
+											${workClientAttachment.fileSize}
+									</td>
+									<td class="op-td" style="text-align: center">
 										<div class="op-btn-box" >
 
 												<%--附件下载删除--%>
@@ -1101,15 +1108,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="150px">操作</th>
+							<th width="30%">文件类型</th>
+							<th >文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
+							<th width="100px">操作</th>
 						</tr>
 						</thead>
 						<tbody id="file_other">
@@ -1126,8 +1131,12 @@
 										<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 class="op-td">
+								<td>
+									<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>
+								</td>
+								<td></td>
+								<td class="op-td"  style="text-align: center">
 									<div class="op-btn-box" >
 										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
 									</div>
@@ -1182,7 +1191,10 @@
 										</c:otherwise>
 									</c:choose>
 <%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td">
+									<td>
+										${workClientAttachment.fileSize}
+									</td>
+									<td class="op-td" style="text-align: center">
 										<div class="op-btn-box" >
 
 												<%--附件下载删除--%>

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

@@ -415,11 +415,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">
+					<table id="upTable" class="table table-bordered table-condensed">
 						<thead>
 						<tr>
-							<th width="55%">文件类型</th>
-							<th width="">文件名</th>
+							<th width="30%">文件类型</th>
+							<th >文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -444,7 +445,8 @@
 								<td style="text-align:center;">
 									<c:choose>
 										<c:when test="${fileAttachment.flag == 0}">
-											${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}
+											<div style="overflow: hidden"><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>
@@ -515,6 +517,7 @@
 										</c:otherwise>
 									</c:choose>
 								</td>
+								<td>${fileAttachment.fileSize}</td>
 								<td class="op-td" style="text-align:center;">
 									<div class="op-btn-box" >
 										<div class="op-btn-box" >
@@ -567,11 +570,12 @@
 				<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="55%">文件类型</th>
-							<th width="">文件名</th>
+							<th width="30%">文件类型</th>
+							<th >文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -597,7 +601,8 @@
 								<td style="text-align:center;">
 									<c:choose>
 										<c:when test="${fileGistdata.flag == 0}">
-											${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}
+											<div style="overflow: hidden"><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>
@@ -668,6 +673,7 @@
 										</c:otherwise>
 									</c:choose>
 								</td>
+								<td>${fileGistdata.fileSize}</td>
 								<td class="op-td"  style="text-align:center;">
 									<div class="op-btn-box" >
 										<c:choose>
@@ -720,11 +726,12 @@
 				<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="55%">文件类型</th>
-							<th width="">文件名</th>
+							<th width="30%">文件类型</th>
+							<th >文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -750,7 +757,8 @@
 								<td style="text-align:center;">
 									<c:choose>
 										<c:when test="${fileOther.flag == 0}">
-											${fileOther.attachLength}M;  ${fileOther.attachTypes}
+											<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>
@@ -821,6 +829,7 @@
 										</c:otherwise>
 									</c:choose>
 								</td>
+								<td>${fileOther.fileSize}</td>
 								<td class="op-td" style="text-align:center;">
 									<div class="op-btn-box" >
 										<c:choose>

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

@@ -508,11 +508,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">
+					<table id="upTable" class="table table-bordered table-condensed">
 						<thead>
 						<tr>
-							<th width="55%">文件类型</th>
-							<th width="">文件名</th>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -534,10 +535,11 @@
 										</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 style="overflow: hidden"><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>
@@ -609,6 +611,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" >
 										<div class="op-btn-box" >
 											<c:choose>
@@ -648,7 +653,7 @@
 			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性资料</h2></div>
+				<div class="form-group-label"><h2>依据性文件</h2></div>
 				<div id="addFile_gistdata" style="display: none" class="upload-progress">
 					<span id="fileName_gistdata" ></span>
 					<b><span id="baifenbi_gistdata" ></span></b>
@@ -660,11 +665,12 @@
 				<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="55%">文件类型</th>
-							<th width="">文件名</th>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -687,10 +693,11 @@
 										</c:choose>
 									</c:otherwise>
 								</c:choose>
-								<td style="text-align:center;">
+								<td >
 									<c:choose>
 										<c:when test="${fileGistdata.flag == 0}">
-											${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}
+											<div style="overflow: hidden"><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>
@@ -762,6 +769,9 @@
 									</c:choose>
 								</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>
 											<c:when test="${fileGistdata.flag == 0}">
@@ -813,11 +823,12 @@
 				<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="55%">文件类型</th>
-							<th width="">文件名</th>
+							<th width="30%">文件类型</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -840,10 +851,11 @@
 										</c:choose>
 									</c:otherwise>
 								</c:choose>
-								<td style="text-align:center;">
+								<td>
 									<c:choose>
 										<c:when test="${fileOther.flag == 0}">
-											${fileOther.attachLength}M;  ${fileOther.attachTypes}
+											<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>
@@ -915,6 +927,9 @@
 									</c:choose>
 								</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>
 											<c:when test="${fileOther.flag == 0}">

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

@@ -119,12 +119,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">
+					<table id="upTable" class="table table-bordered table-condensed">
 						<thead>
 						<tr>
-								<%-- <th>序号</th>--%>
 							<th width="30%">文件类型</th>
-							<th width="">文件名</th>
+							<th >文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -146,10 +146,11 @@
 										</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 style="overflow: hidden"><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>
@@ -220,6 +221,7 @@
 										</c:otherwise>
 									</c:choose>
 								</td>
+								<td>${fileAttachment.fileSize}</td>
 								<td class="op-td" style="text-align:center;">
 									<div class="op-btn-box" >
 										<c:choose>
@@ -272,12 +274,12 @@
 				<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>序号</th>--%>
 							<th width="30%">文件类型</th>
-							<th width="">文件名</th>
+							<th >文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -300,11 +302,12 @@
 												</c:choose>
 											</c:otherwise>
 										</c:choose>
-								<td style="text-align:center;">
+								<td>
 									<c:choose>
 										<c:when test="${fileGistdata.flag == 0}">
-												${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}
-											</c:when>
+											<div style="overflow: hidden"><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="${projectcontentinfo.uploadMode == 2}">
@@ -374,6 +377,7 @@
 										</c:otherwise>
 									</c:choose>
 								</td>
+								<td>${fileGistdata.fileSize}</td>
 								<td class="op-td"  style="text-align:center;">
 									<div class="op-btn-box" >
 										<c:choose>
@@ -425,12 +429,12 @@
 				<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>序号</th>--%>
 							<th width="30%">文件类型</th>
-							<th width="">文件名</th>
+							<th >文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>
@@ -453,10 +457,11 @@
 												</c:choose>
 											</c:otherwise>
 										</c:choose>
-										<td style="text-align:center;">
+										<td>
 											<c:choose>
 												<c:when test="${fileOther.flag == 0}">
-													${fileOther.attachLength}M;  ${fileOther.attachTypes}
+													<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>
@@ -527,6 +532,7 @@
 												</c:otherwise>
 											</c:choose>
 										</td>
+										<td>${fileOther.fileSize}</td>
 										<td class="op-td" style="text-align:center;">
 											<div class="op-btn-box" >
 												<c:choose>