Merge remote-tracking branch 'origin/master'

src/main/webapp/static/common/css/style.css

@@ -10392,4 +10392,15 @@ table.details tbody tr td.input-td input:focus{
 }
 .bg-white{
     background-color: #fff;
+}
+
+
+td .file_nei{
+    font-weight: bold;
+    float: left;
+    width: 9%;
+}
+td .file_neirong{
+    float: left;
+    width: 91%
 }

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

@@ -418,12 +418,13 @@
 				<span id="attachment_title"></span>
 				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
 					<%--<table id="upTable" class="layui-table" lay-filter="permissionTable"></table>--%>
-					<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 width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="100px">操作</th>
 						</tr>
 						</thead>
@@ -445,10 +446,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><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>
@@ -520,6 +522,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}">
@@ -601,12 +606,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>序号</th>--%>
 							<th width="30%">文件类型</th>
-							<th width="">文件名</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="100px">操作</th>
 						</tr>
 						</thead>
@@ -629,10 +635,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><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>
@@ -704,6 +711,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}">
@@ -784,12 +794,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>序号</th>--%>
 							<th width="30%">文件类型</th>
-							<th width="">文件名</th>
+							<th width="">文件描述/文件</th>
+							<th width="100px">文件大小(M)</th>
 							<th width="100px">操作</th>
 						</tr>
 						</thead>
@@ -812,10 +823,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>
@@ -887,6 +899,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}">