项目文件上传组件部分功能开发

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -1802,6 +1802,7 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
 
     public List<WorkStaffBasicInfoExcel> getExcelData(Page<WorkStaffBasicInfo> page) {
         List<WorkStaffBasicInfoExcel> excels = new ArrayList<>();
+
         for (WorkStaffBasicInfo info : page.getList()) {
             info = this.getByAchiveId(info);
             WorkStaffCertificate entity = new WorkStaffCertificate();
@@ -1826,7 +1827,14 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
             infoExcel.setOfficeName(info.getOffice().getName());
             infoExcel.setEntryDate(info.getEntryDate());
             infoExcel.setStatus(info.getStatus());
-            infoExcel.setHighestEducation(info.getHighestEducation());
+
+            //获取人员最高学历信息
+            String hightEduByAchiveId = workStaffAchivesDao.getHightEduByAchiveId(info.getAchiveId());
+            if(StringUtils.isNotBlank(hightEduByAchiveId)){
+                String educationLevel = DictUtils.getDictLabel(hightEduByAchiveId, "education_level", "");
+                infoExcel.setHighestEducation(educationLevel);
+            }
+
             if (info.getCertificateList().size() > 0) {
                 WorkStaffCertificate certificate = info.getCertificateList().get(0);
                 infoExcel.setCertificateName(certificate.getName());
@@ -2135,46 +2143,57 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
                 switch (type){
                     //一级造价师
                     case "161":
+                    case "一级造价师":
                         mainDictDetails = DictUtils.getMainDictList("certificate_major");
                         break;
                     //二级造价师
                     case "171":
+                    case "二级造价师":
                         mainDictDetails = DictUtils.getMainDictList("costEngineer_major");
                         break;
                     //一级建造师
                     case "151":
+                    case "一级建造师":
                         mainDictDetails = DictUtils.getMainDictList("architect_major");
                         break;
                     //二级建造师
                     case "152":
+                    case "二级建造师":
                         mainDictDetails = DictUtils.getMainDictList("architect_two_major");
                         break;
                     //一级监理师
                     case "181":
+                    case "一级监理师":
                         mainDictDetails = DictUtils.getMainDictList("certificate_first_supervisor");
                         break;
                     //注册会计师
                     case "182":
+                    case "注册会计师":
                         mainDictDetails = DictUtils.getMainDictList("certificate_cpa_accountant");
                         break;
                     //资产评估师
                     case "183":
+                    case "资产评估师":
                         mainDictDetails = DictUtils.getMainDictList("certificate_asset_appraiser");
                         break;
                     //税务师
                     case "184":
+                    case "税务师":
                         mainDictDetails = DictUtils.getMainDictList("certificate_tax_accountant");
                         break;
                     //房地产评估师
                     case "185":
+                    case "房地产评估师":
                         mainDictDetails = DictUtils.getMainDictList("certificate_real_estate_appraiser");
                         break;
                     //咨询工程师
                     case "186":
+                    case "咨询工程师":
                         mainDictDetails = DictUtils.getMainDictList("certificate_consulting_engineer");
                         break;
                     //其他
                     case "187":
+                    case "其他":
                         mainDictDetails = DictUtils.getMainDictList("certificate_other");
                         break;
                     default:

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -1150,7 +1150,7 @@ public class WorkStaffBasicInfoController extends BaseController {
 	}
 	@RequestMapping(value = "back")
 	public String back(WorkStaffBasicInfo workStaffBasicInfo, Model model, RedirectAttributes redirectAttributes,HttpServletRequest request) throws Exception{
-		if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())){
+		if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && ("home".equals(workStaffBasicInfo.getHome()) || "notifyList".equals(workStaffBasicInfo.getHome())) ){
 			WorkProjectNotify workProjectNotify = new WorkProjectNotify();
 			workProjectNotify.setNotifyId(workStaffBasicInfo.getId());
 			workProjectNotify.setType("86");

src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -540,8 +540,10 @@
 			qq_id = #{qqId},
 			try_out_job = #{tryOutJob},
 			trial_period = #{trialPeriod},
-			individual_resume = #{individualResume},
-			hand_signature = #{handSignature}
+			individual_resume = #{individualResume}
+			<if test="handSignature!=null and handSignature != ''">
+				,hand_signature = #{handSignature}
+			</if>
 			<if test="otherServiceFlag!=null and otherServiceFlag != ''">
 				,other_service_flag = #{otherServiceFlag}
 			</if>

src/main/webapp/WEB-INF/tags/table/fileShowDisplay.tag

@@ -0,0 +1,148 @@
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ tag pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+
+<%-- 附件列表参数定义（新增deleteDomPrefix参数） --%>
+<%@ attribute name="attachments" type="java.util.List" required="true" description="附件列表数据（必填）"%>
+<%@ attribute name="showSerialNo" type="java.lang.Boolean" description="是否显示序号列"%>
+<%@ attribute name="uploadMode" type="java.lang.Integer" description="上传模式（1：百度云，2：阿里云）"%>
+<%@ attribute name="previewUrl" type="java.lang.String" description="图片预览基础地址"%>
+<%@ attribute name="downloadUrl" type="java.lang.String" description="下载接口地址"%>
+<%@ attribute name="deleteUrl" type="java.lang.String" description="删除接口地址"%>
+<%@ attribute name="enableDelete" type="java.lang.Boolean" description="是否启用删除功能（默认true）"%>
+<%@ attribute name="deleteBtnShowRule" type="java.lang.String" description="删除按钮显示规则（all：全部显示，createUser：仅创建者可见）"%>
+<%@ attribute name="deleteParamsSuffix" type="java.lang.String" description="删除参数后缀（防冲突）"%>
+<%@ attribute name="deleteDomPrefix" type="java.lang.String" description="删除操作关联的DOM前缀（默认addFile_attachment）"%>
+
+<%-- 初始化默认值（新增deleteDomPrefix默认值） --%>
+<c:set var="ctx" value="${pageContext.request.contextPath}${fns:getAdminPath()}" />
+<c:set var="defShowSerialNo" value="false" />
+<c:set var="defUploadMode" value="2" />
+<c:set var="defPreviewUrl" value="${ctx}/sys/picturepreview/picturePreview?url=" />
+<c:set var="defDownloadUrl" value="${ctx}/workfullmanage/workFullManage/downLoadAttach?file=" />
+<c:set var="defDeleteUrl" value="${ctx}/sys/workattachment/deleteFileFromAliyun" />
+<c:set var="defEnableDelete" value="true" /> <%-- 默认展示删除按钮 --%>
+<c:set var="defDeleteBtnShowRule" value="all" /> <%-- 默认全部可见 --%>
+<c:set var="defDeleteParamsSuffix" value="" />
+<c:set var="defDeleteDomPrefix" value="addFile_attachment" /> <%-- 默认DOM前缀 --%>
+
+<%-- 参数默认值处理（新增deleteDomPrefix处理） --%>
+<c:if test="${empty showSerialNo}"><c:set var="showSerialNo" value="${defShowSerialNo}" /></c:if>
+<c:if test="${empty uploadMode}"><c:set var="uploadMode" value="${defUploadMode}" /></c:if>
+<c:if test="${empty previewUrl}"><c:set var="previewUrl" value="${defPreviewUrl}" /></c:if>
+<c:if test="${empty downloadUrl}"><c:set var="downloadUrl" value="${defDownloadUrl}" /></c:if>
+<c:if test="${empty deleteUrl}"><c:set var="deleteUrl" value="${defDeleteUrl}" /></c:if>
+<c:if test="${empty enableDelete}"><c:set var="enableDelete" value="${defEnableDelete}" /></c:if>
+<c:if test="${empty deleteBtnShowRule}"><c:set var="deleteBtnShowRule" value="${defDeleteBtnShowRule}" /></c:if>
+<c:if test="${empty deleteParamsSuffix}"><c:set var="deleteParamsSuffix" value="${defDeleteParamsSuffix}" /></c:if>
+<c:if test="${empty deleteDomPrefix}"><c:set var="deleteDomPrefix" value="${defDeleteDomPrefix}" /></c:if> <%-- 处理DOM前缀默认值 --%>
+
+<%-- 附件列表表格内容 --%>
+<c:forEach items="${attachments}" var="workClientAttachment" varStatus="status">
+    <tr>
+            <%-- 序号列 --%>
+        <c:if test="${showSerialNo}">
+            <td>${status.index + 1}</td>
+        </c:if>
+
+            <%-- 文件预览（保留原有逻辑） --%>
+        <c:choose>
+            <%-- 阿里云模式（uploadMode=2） --%>
+            <c:when test="${uploadMode == 2}">
+                <c:choose>
+                    <%-- 图片类型 --%>
+                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                        <td>
+                            <img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openPreview('${workClientAttachment.temporaryUrl}',5)" alt="${workClientAttachment.attachmentName}">
+                        </td>
+                    </c:when>
+                    <%-- 非图片类型（省略原有嵌套逻辑，保持不变） --%>
+                    <c:otherwise>
+                        <!-- 原有非图片类型处理逻辑保持不变 -->
+                        <c:choose>
+                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                <td>
+                                    <a class="attention-info" href="javascript:void(0)"
+                                       onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a>
+                                </td>
+                            </c:when>
+                            <%-- 压缩包（rar/zip等） --%>
+                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                <td>
+                                    <a class="attention-info" href="javascript:void(0)"
+                                       onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a>
+                                </td>
+                            </c:when>
+                            <c:otherwise>
+                                <!-- 原有其他文件类型处理逻辑保持不变 -->
+                                <td>
+
+                                    <a class="attention-info" href="javascript:void(0)"
+                                       onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a>
+                                </td>
+                            </c:otherwise>
+                        </c:choose>
+                    </c:otherwise>
+                </c:choose>
+            </c:when>
+            <%-- 百度云模式（uploadMode=1，省略原有逻辑，保持不变） --%>
+            <c:otherwise>
+                <td>${workClientAttachment.attachmentName}</td>
+            </c:otherwise>
+        </c:choose>
+
+            <%-- 上传人信息 --%>
+        <td>${workClientAttachment.createBy.name}</td>
+
+            <%-- 上传时间 --%>
+        <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+
+            <%-- 操作按钮（删除按钮使用动态参数） --%>
+        <td class="op-td">
+            <div class="op-btn-box">
+                    <%-- 下载按钮 --%>
+                <a href="javascript:location.href='${downloadUrl}'+encodeURIComponent('${workClientAttachment.url}');"
+                   class="op-btn op-btn-download">
+                    <i class="fa fa-download"></i>&nbsp;下载
+                </a>
+
+                    <%-- 删除按钮（核心变更：使用deleteDomPrefix变量） --%>
+                <c:if test="${enableDelete}">
+                    <c:choose>
+                        <c:when test="${deleteBtnShowRule == 'createUser'}">
+                            <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
+                                <a href="javascript:void(0)"
+                                   onclick="deleteFileFromAliyun(this,
+                                           '${deleteUrl}?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2',
+                                           '${deleteDomPrefix}',  <%-- 这里使用动态变量 --%>
+                                           '${deleteParamsSuffix}')"
+                                   class="op-btn op-btn-delete">
+                                    <i class="fa fa-trash"></i>&nbsp;删除
+                                </a>
+                            </c:if>
+                        </c:when>
+                        <c:otherwise>
+                            <a href="javascript:void(0)"
+                               onclick="deleteFileFromAliyun(this,
+                                       '${deleteUrl}?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2',
+                                       '${deleteDomPrefix}',  <%-- 这里使用动态变量 --%>
+                                       '${deleteParamsSuffix}')"
+                               class="op-btn op-btn-delete">
+                                <i class="fa fa-trash"></i>&nbsp;删除
+                            </a>
+                        </c:otherwise>
+                    </c:choose>
+                </c:if>
+            </div>
+        </td>
+    </tr>
+</c:forEach>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalAudit.jsp

@@ -555,139 +555,23 @@
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
-						<c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-							<tr>
-									<%-- <td>${status.index + 1}</td>--%>
-								<c:choose>
-									<c:when test="${projectRecords.uploadMode == 2}">
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-												<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-														<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-															</c:when>
-															<c:otherwise>
-																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-												<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-														<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${workReimbursement.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-																		<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-																	</c:when>
-																	<c:otherwise>
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																				<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-																			</c:when>
-																			<c:otherwise>
-																				<c:choose>
-																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-																					</c:when>
-																					<c:otherwise>
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-																					</c:otherwise>
-																				</c:choose>
-																			</c:otherwise>
-																		</c:choose>
-																	</c:otherwise>
-																</c:choose>
-															</c:when>
-															<c:otherwise>
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-																		<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-																	</c:when>
-																	<c:otherwise>
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																				<td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-																			</c:when>
-																			<c:otherwise>
-																				<c:choose>
-																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-																					</c:when>
-																					<c:otherwise>
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-																					</c:otherwise>
-																				</c:choose>
-																			</c:otherwise>
-																		</c:choose>
-																	</c:otherwise>
-																</c:choose>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
-
-								<td>${workClientAttachment.createBy.name}</td>
-								<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-											<%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
-											<%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-											<%--													</c:if>--%>
-									</div>
-								</td>
-							</tr>
-						</c:forEach>
+
+
+
+							<%-- 引用附件列表Tag --%>
+						<!-- attachments" 附件列表数据（必填） -->
+						<!-- showSerialNo="false" 是否显示序号列（默认false） -->
+						<!-- uploadMode 上传模式（默认2-阿里云） -->
+						<!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+						<table:fileShowDisplay
+								attachments="${projectRecords.workAttachments}"
+								uploadMode="${projectRecords.uploadMode}"
+								deleteParamsSuffix="_attachment"
+								deleteDomPrefix="addFile_attachment"
+								enableDelete="false"
+						/>
+
+
 						</tbody>
 					</table>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalForm.jsp

@@ -1166,140 +1166,20 @@
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
-                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-                            <tr>
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${projectRecords.uploadMode == 2}">
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${workReimbursement.uploadMode == 2}">
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
-
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box" >
-                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                            <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
-                                            <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-                                            <%--													</c:if>--%>
-                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
+
+                            <%-- 引用附件列表Tag --%>
+                            <!-- attachments" 附件列表数据（必填） -->
+                            <!-- showSerialNo="false" 是否显示序号列（默认false） -->
+                            <!-- uploadMode 上传模式（默认2-阿里云） -->
+                            <!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+                            <table:fileShowDisplay
+                                attachments="${projectRecords.workAttachments}"
+                                uploadMode="${projectRecords.uploadMode}"
+                                deleteParamsSuffix="_attachment"
+                                deleteDomPrefix="addFile_attachment"
+                                deleteBtnShowRule="createUser"
+                            />
+
                         </tbody>
                     </table>
                 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalModify.jsp

@@ -544,140 +544,22 @@
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
-                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-                            <tr>
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${projectRecords.uploadMode == 2}">
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${workReimbursement.uploadMode == 2}">
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
 
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box" >
-                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                            <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
-                                            <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-                                            <%--													</c:if>--%>
-                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
+
+
+                            <%-- 引用附件列表Tag --%>
+                        <!-- attachments" 附件列表数据（必填） -->
+                        <!-- showSerialNo="false" 是否显示序号列（默认false） -->
+                        <!-- uploadMode 上传模式（默认2-阿里云） -->
+                        <!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+                        <table:fileShowDisplay
+                                attachments="${projectRecords.workAttachments}"
+                                uploadMode="${projectRecords.uploadMode}"
+                                deleteParamsSuffix="_attachment"
+                                deleteDomPrefix="addFile_attachment"
+                                deleteBtnShowRule="createUser"
+                        />
+
                         </tbody>
                     </table>
                 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsApprovalView.jsp

@@ -1084,151 +1084,22 @@
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
-                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-                            <tr>
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${projectRecords.uploadMode == 2}">
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${workReimbursement.uploadMode == 2}">
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
 
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box" >
-                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                        <c:if test="${not empty projectRecords.signatureContractId}">
-                                            <c:choose>
-                                                <c:when test="${projectRecords.approvalSignatureUrlFlag == 1}">
-                                                    <a href="${projectRecords.signatureUrl}" class="op-btn  op-btn-download layui-bg-orange">审定单签章下载</a>
-                                                </c:when>
-                                                <c:otherwise>
-                                                    <a href="javascript:location.href='${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId='+'${projectRecords.signatureContractId}'" class="op-btn  op-btn-download layui-bg-orange">审定单签章下载</a>
-                                                </c:otherwise>
-                                            </c:choose>
-                                        </c:if>
 
-                                            <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
-                                            <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-                                            <%--													</c:if>--%>
+                            <%-- 引用附件列表Tag --%>
+                        <!-- attachments" 附件列表数据（必填） -->
+                        <!-- showSerialNo="false" 是否显示序号列（默认false） -->
+                        <!-- uploadMode 上传模式（默认2-阿里云） -->
+                        <!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+                        <table:fileShowDisplay
+                                attachments="${projectRecords.workAttachments}"
+                                uploadMode="${projectRecords.uploadMode}"
+                                deleteParamsSuffix="_attachment"
+                                deleteDomPrefix="addFile_attachment"
+                                enableDelete="false"
+                        />
+
 
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
                         </tbody>
                     </table>
                 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsInternalAuditReportSignatureForm.jsp

@@ -1135,140 +1135,21 @@
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
-                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-                            <tr>
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${projectRecords.uploadMode == 2}">
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${workReimbursement.uploadMode == 2}">
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
-
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box" >
-                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                            <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
-                                            <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-                                            <%--													</c:if>--%>
-                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
+
+
+                            <%-- 引用附件列表Tag --%>
+                        <!-- attachments" 附件列表数据（必填） -->
+                        <!-- showSerialNo="false" 是否显示序号列（默认false） -->
+                        <!-- uploadMode 上传模式（默认2-阿里云） -->
+                        <!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+                        <table:fileShowDisplay
+                                attachments="${projectRecords.workAttachments}"
+                                uploadMode="${projectRecords.uploadMode}"
+                                deleteParamsSuffix="_attachment"
+                                deleteDomPrefix="addFile_attachment"
+                                deleteBtnShowRule="createUser"
+                        />
+
                         </tbody>
                     </table>
                 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportInternalAuditSignatureAudit.jsp

@@ -413,139 +413,23 @@
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
-						<c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-							<tr>
-									<%-- <td>${status.index + 1}</td>--%>
-								<c:choose>
-									<c:when test="${projectRecords.uploadMode == 2}">
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-												<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-														<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-															</c:when>
-															<c:otherwise>
-																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-												<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-														<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${workReimbursement.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-																		<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-																	</c:when>
-																	<c:otherwise>
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																				<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-																			</c:when>
-																			<c:otherwise>
-																				<c:choose>
-																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-																					</c:when>
-																					<c:otherwise>
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-																					</c:otherwise>
-																				</c:choose>
-																			</c:otherwise>
-																		</c:choose>
-																	</c:otherwise>
-																</c:choose>
-															</c:when>
-															<c:otherwise>
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-																		<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-																	</c:when>
-																	<c:otherwise>
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																				<td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-																			</c:when>
-																			<c:otherwise>
-																				<c:choose>
-																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-																					</c:when>
-																					<c:otherwise>
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-																					</c:otherwise>
-																				</c:choose>
-																			</c:otherwise>
-																		</c:choose>
-																	</c:otherwise>
-																</c:choose>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
 
-								<td>${workClientAttachment.createBy.name}</td>
-								<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-											<%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
-											<%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-											<%--													</c:if>--%>
-									</div>
-								</td>
-							</tr>
-						</c:forEach>
+
+
+							<%-- 引用附件列表Tag --%>
+						<!-- attachments" 附件列表数据（必填） -->
+						<!-- showSerialNo="false" 是否显示序号列（默认false） -->
+						<!-- uploadMode 上传模式（默认2-阿里云） -->
+						<!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+						<table:fileShowDisplay
+								attachments="${projectRecords.workAttachments}"
+								uploadMode="${projectRecords.uploadMode}"
+								deleteParamsSuffix="_attachment"
+								deleteDomPrefix="addFile_attachment"
+								enableDelete="false"
+						/>
+
+
 						</tbody>
 					</table>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportInternalAuditSignatureModify.jsp

@@ -468,140 +468,22 @@
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
-                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-                            <tr>
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${projectRecords.uploadMode == 2}">
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${workReimbursement.uploadMode == 2}">
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
 
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box" >
-                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                            <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
-                                            <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-                                            <%--													</c:if>--%>
-                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
+
+                            <%-- 引用附件列表Tag --%>
+                        <!-- attachments" 附件列表数据（必填） -->
+                        <!-- showSerialNo="false" 是否显示序号列（默认false） -->
+                        <!-- uploadMode 上传模式（默认2-阿里云） -->
+                        <!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+                        <table:fileShowDisplay
+                                attachments="${projectRecords.workAttachments}"
+                                uploadMode="${projectRecords.uploadMode}"
+                                deleteParamsSuffix="_attachment"
+                                deleteDomPrefix="addFile_attachment"
+                                deleteBtnShowRule="createUser"
+                        />
+
+
                         </tbody>
                     </table>
                 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportInternalAuditSignatureSzzkAudit.jsp

@@ -466,139 +466,21 @@
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
-						<c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-							<tr>
-									<%-- <td>${status.index + 1}</td>--%>
-								<c:choose>
-									<c:when test="${projectRecords.uploadMode == 2}">
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-												<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-														<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-															</c:when>
-															<c:otherwise>
-																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-												<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-														<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${workReimbursement.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-																		<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-																	</c:when>
-																	<c:otherwise>
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																				<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-																			</c:when>
-																			<c:otherwise>
-																				<c:choose>
-																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-																					</c:when>
-																					<c:otherwise>
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-																					</c:otherwise>
-																				</c:choose>
-																			</c:otherwise>
-																		</c:choose>
-																	</c:otherwise>
-																</c:choose>
-															</c:when>
-															<c:otherwise>
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-																		<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-																	</c:when>
-																	<c:otherwise>
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																				<td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-																			</c:when>
-																			<c:otherwise>
-																				<c:choose>
-																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-																					</c:when>
-																					<c:otherwise>
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-																					</c:otherwise>
-																				</c:choose>
-																			</c:otherwise>
-																		</c:choose>
-																	</c:otherwise>
-																</c:choose>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
 
-								<td>${workClientAttachment.createBy.name}</td>
-								<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-										<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
-											<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-										</c:if>
-									</div>
-								</td>
-							</tr>
-						</c:forEach>
+
+							<%-- 引用附件列表Tag --%>
+						<!-- attachments" 附件列表数据（必填） -->
+						<!-- showSerialNo="false" 是否显示序号列（默认false） -->
+						<!-- uploadMode 上传模式（默认2-阿里云） -->
+						<!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+						<table:fileShowDisplay
+								attachments="${projectRecords.workAttachments}"
+								uploadMode="${projectRecords.uploadMode}"
+								deleteParamsSuffix="_attachment"
+								deleteDomPrefix="addFile_attachment"
+								deleteBtnShowRule="createUser"
+						/>
+
 						</tbody>
 					</table>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportInternalAuditSignatureView.jsp

@@ -1087,153 +1087,21 @@
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
-                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-                            <tr>
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${projectRecords.uploadMode == 2}">
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${workReimbursement.uploadMode == 2}">
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
 
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box" >
-                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                        <c:if test="${status.index == 0}">
-                                            <c:if test="${not empty projectRecords.reportInternalAuditSignatureContractId}">
 
-                                                <c:choose>
-                                                    <c:when test="${projectRecords.reportInternalAuditSignatureUrlFlag == 1}">
-                                                        <a href="${projectRecords.reportInternalAuditSignatureUrl}" class="op-btn  op-btn-download layui-bg-orange">内审报告签章下载</a>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <a href="javascript:location.href='${ctx}/ruralProject/signatureCallBack/downLoadReportAttach?contractId='+'${projectRecords.reportInternalAuditSignatureContractId}'" class="op-btn  op-btn-download layui-bg-orange">报告签章下载</a>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:if>
-                                        </c:if>
+                            <%-- 引用附件列表Tag --%>
+                        <!-- attachments" 附件列表数据（必填） -->
+                        <!-- showSerialNo="false" 是否显示序号列（默认false） -->
+                        <!-- uploadMode 上传模式（默认2-阿里云） -->
+                        <!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+                        <table:fileShowDisplay
+                                attachments="${projectRecords.workAttachments}"
+                                uploadMode="${projectRecords.uploadMode}"
+                                deleteParamsSuffix="_attachment"
+                                deleteDomPrefix="addFile_attachment"
+                                enableDelete="false"
+                        />
 
-                                            <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
-                                            <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-                                            <%--													</c:if>--%>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
                         </tbody>
                     </table>
                 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureAudit.jsp

@@ -413,139 +413,22 @@
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
-						<c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-							<tr>
-									<%-- <td>${status.index + 1}</td>--%>
-								<c:choose>
-									<c:when test="${projectRecords.uploadMode == 2}">
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-												<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-														<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-															</c:when>
-															<c:otherwise>
-																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-												<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-														<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${workReimbursement.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-																		<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-																	</c:when>
-																	<c:otherwise>
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																				<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-																			</c:when>
-																			<c:otherwise>
-																				<c:choose>
-																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-																					</c:when>
-																					<c:otherwise>
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-																					</c:otherwise>
-																				</c:choose>
-																			</c:otherwise>
-																		</c:choose>
-																	</c:otherwise>
-																</c:choose>
-															</c:when>
-															<c:otherwise>
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-																		<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-																	</c:when>
-																	<c:otherwise>
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																				<td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-																			</c:when>
-																			<c:otherwise>
-																				<c:choose>
-																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-																					</c:when>
-																					<c:otherwise>
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-																					</c:otherwise>
-																				</c:choose>
-																			</c:otherwise>
-																		</c:choose>
-																	</c:otherwise>
-																</c:choose>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
 
-								<td>${workClientAttachment.createBy.name}</td>
-								<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-											<%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
-											<%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-											<%--													</c:if>--%>
-									</div>
-								</td>
-							</tr>
-						</c:forEach>
+
+							<%-- 引用附件列表Tag --%>
+						<!-- attachments" 附件列表数据（必填） -->
+						<!-- showSerialNo="false" 是否显示序号列（默认false） -->
+						<!-- uploadMode 上传模式（默认2-阿里云） -->
+						<!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+						<table:fileShowDisplay
+								attachments="${projectRecords.workAttachments}"
+								uploadMode="${projectRecords.uploadMode}"
+								deleteParamsSuffix="_attachment"
+								deleteDomPrefix="addFile_attachment"
+								enableDelete="false"
+						/>
+
+
 						</tbody>
 					</table>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureForm.jsp

@@ -1135,140 +1135,22 @@
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
-                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-                            <tr>
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${projectRecords.uploadMode == 2}">
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${workReimbursement.uploadMode == 2}">
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
-
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box" >
-                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                            <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
-                                            <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-                                            <%--													</c:if>--%>
-                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
+
+
+                            <%-- 引用附件列表Tag --%>
+                        <!-- attachments" 附件列表数据（必填） -->
+                        <!-- showSerialNo="false" 是否显示序号列（默认false） -->
+                        <!-- uploadMode 上传模式（默认2-阿里云） -->
+                        <!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+                        <table:fileShowDisplay
+                                attachments="${projectRecords.workAttachments}"
+                                uploadMode="${projectRecords.uploadMode}"
+                                deleteParamsSuffix="_attachment"
+                                deleteDomPrefix="addFile_attachment"
+                                deleteBtnShowRule="createUser"
+                        />
+
+
                         </tbody>
                     </table>
                 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureModify.jsp

@@ -468,140 +468,22 @@
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
-                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-                            <tr>
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${projectRecords.uploadMode == 2}">
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${workReimbursement.uploadMode == 2}">
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
 
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box" >
-                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                            <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
-                                            <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-                                            <%--													</c:if>--%>
-                                        <a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
+
+                            <%-- 引用附件列表Tag --%>
+                        <!-- attachments" 附件列表数据（必填） -->
+                        <!-- showSerialNo="false" 是否显示序号列（默认false） -->
+                        <!-- uploadMode 上传模式（默认2-阿里云） -->
+                        <!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+                        <table:fileShowDisplay
+                                attachments="${projectRecords.workAttachments}"
+                                uploadMode="${projectRecords.uploadMode}"
+                                deleteParamsSuffix="_attachment"
+                                deleteDomPrefix="addFile_attachment"
+                                deleteBtnShowRule="createUser"
+                        />
+
+
                         </tbody>
                     </table>
                 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureSzzkAudit.jsp

@@ -466,139 +466,21 @@
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
-						<c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-							<tr>
-									<%-- <td>${status.index + 1}</td>--%>
-								<c:choose>
-									<c:when test="${projectRecords.uploadMode == 2}">
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-												<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-														<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-															</c:when>
-															<c:otherwise>
-																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-												<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-														<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${workReimbursement.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-																		<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-																	</c:when>
-																	<c:otherwise>
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																				<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-																			</c:when>
-																			<c:otherwise>
-																				<c:choose>
-																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-																					</c:when>
-																					<c:otherwise>
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-																					</c:otherwise>
-																				</c:choose>
-																			</c:otherwise>
-																		</c:choose>
-																	</c:otherwise>
-																</c:choose>
-															</c:when>
-															<c:otherwise>
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-																		<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-																	</c:when>
-																	<c:otherwise>
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-																				<td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-																			</c:when>
-																			<c:otherwise>
-																				<c:choose>
-																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-																					</c:when>
-																					<c:otherwise>
-																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-																					</c:otherwise>
-																				</c:choose>
-																			</c:otherwise>
-																		</c:choose>
-																	</c:otherwise>
-																</c:choose>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
 
-								<td>${workClientAttachment.createBy.name}</td>
-								<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-										<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
-											<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
-										</c:if>
-									</div>
-								</td>
-							</tr>
-						</c:forEach>
+
+							<%-- 引用附件列表Tag --%>
+						<!-- attachments" 附件列表数据（必填） -->
+						<!-- showSerialNo="false" 是否显示序号列（默认false） -->
+						<!-- uploadMode 上传模式（默认2-阿里云） -->
+						<!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+						<table:fileShowDisplay
+								attachments="${projectRecords.workAttachments}"
+								uploadMode="${projectRecords.uploadMode}"
+								deleteParamsSuffix="_attachment"
+								deleteDomPrefix="addFile_attachment"
+								deleteBtnShowRule="createUser"
+						/>
+
 						</tbody>
 					</table>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/electronicSeal/ruralProjectRecordsReportSignatureView.jsp

@@ -1087,153 +1087,22 @@
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
-                        <c:forEach items="${projectRecords.workAttachments}" var = "workClientAttachment" varStatus="status">
-                            <tr>
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${projectRecords.uploadMode == 2}">
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${workReimbursement.uploadMode == 2}">
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
-
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box" >
-                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                        <c:if test="${status.index == 0}">
-                                            <c:if test="${not empty projectRecords.reportSignatureContractId}">
-
-                                                <c:choose>
-                                                    <c:when test="${projectRecords.reportSignatureUrlFlag == 1}">
-                                                        <a href="${projectRecords.reportSignatureUrl}" class="op-btn  op-btn-download layui-bg-orange">报告签章下载</a>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <a href="javascript:location.href='${ctx}/ruralProject/signatureCallBack/downLoadReportAttach?contractId='+'${projectRecords.reportSignatureContractId}'" class="op-btn  op-btn-download layui-bg-orange">报告签章下载</a>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:if>
-                                        </c:if>
-
-                                            <%--													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">--%>
-                                            <%--														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>--%>
-                                            <%--													</c:if>--%>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
+
+
+                            <%-- 引用附件列表Tag --%>
+                        <!-- attachments" 附件列表数据（必填） -->
+                        <!-- showSerialNo="false" 是否显示序号列（默认false） -->
+                        <!-- uploadMode 上传模式（默认2-阿里云） -->
+                        <!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+                        <table:fileShowDisplay
+                                attachments="${projectRecords.workAttachments}"
+                                uploadMode="${projectRecords.uploadMode}"
+                                deleteParamsSuffix="_attachment"
+                                deleteDomPrefix="addFile_attachment"
+                                enableDelete="false"
+                        />
+
+
                         </tbody>
                     </table>
                 </div>

src/main/webapp/webpage/modules/signature/dailyOfficeWorkSignature/DailyOfficeWorkSignatureForm.jsp

@@ -268,165 +268,16 @@
                         </tr>
                         </thead>
                         <tbody id="file_attachment">
-                        <c:forEach items="${dailyOfficeWork.workAttachments}" var="workClientAttachment"
-                                   varStatus="status">
-                            <tr>
-                                    <%-- <td>${status.index + 1}</td>--%>
-                                <c:choose>
-                                    <c:when test="${dailyOfficeWork.uploadMode == 2}">
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:when>
-                                    <c:otherwise>
-                                        <c:choose>
-                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                             or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                             or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                             or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                             or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                            </c:when>
-                                            <c:otherwise>
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <td><a class="attention-info" href="javascript:void(0)"
-                                                               onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a>
-                                                        </td>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <c:choose>
-                                                            <c:when test="${dailyOfficeWork.uploadMode == 2}">
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:when>
-                                                            <c:otherwise>
-                                                                <c:choose>
-                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
-                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
-                                                                    </c:when>
-                                                                    <c:otherwise>
-                                                                        <c:choose>
-                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                                <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
-                                                                            </c:when>
-                                                                            <c:otherwise>
-                                                                                <c:choose>
-                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
-                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:when>
-                                                                                    <c:otherwise>
-                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
-                                                                                    </c:otherwise>
-                                                                                </c:choose>
-                                                                            </c:otherwise>
-                                                                        </c:choose>
-                                                                    </c:otherwise>
-                                                                </c:choose>
-                                                            </c:otherwise>
-                                                        </c:choose>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:otherwise>
-                                        </c:choose>
-                                    </c:otherwise>
-                                </c:choose>
-
-
-
-                                <td>${workClientAttachment.createBy.name}</td>
-                                <td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box">
-
-                                            <%--附件下载删除--%>
-                                        <c:choose>
-                                            <c:when test="${dailyOfficeWork.uploadMode == 2}">
-                                                <c:choose>
-                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                        <a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                                    </c:when>
-                                                    <c:otherwise>
-                                                        <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                                    </c:otherwise>
-                                                </c:choose>
-                                            </c:when>
-                                            <c:otherwise>
-                                                <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-                                            </c:otherwise>
-                                        </c:choose>
-                                        <c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
-                                            <a href="javascript:void(0)"
-                                               onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')"
-                                               class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
-                                        </c:if>
-                                        <c:if test="${workClientAttachment.collectFlag != 1}">
-                                            <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
-                                        </c:if>
-                                    </div>
-                                </td>
-                            </tr>
-                        </c:forEach>
+                            <%-- 引用附件列表Tag --%>
+                            <!-- attachments" 附件列表数据（必填） -->
+                            <!-- showSerialNo="false" 是否显示序号列（默认false） -->
+                            <!-- uploadMode 上传模式（默认2-阿里云） -->
+                            <!-- deleteParamsSuffix="_attachment" 删除参数后缀（防冲突） -->
+                            <table:fileShowDisplay
+                                attachments="${dailyOfficeWork.workAttachments}"
+                                uploadMode="${dailyOfficeWork.uploadMode}"
+                                deleteParamsSuffix="addFile"
+                            />
                         </tbody>
                     </table>
                 </div>

src/main/webapp/webpage/modules/workstaff/workStaffBasicDetailForm.jsp

@@ -49,6 +49,19 @@
                         layer.msg("请上传身份证国徽面图片",{icon:2})
                         return false;
                     }
+                    // 查找所有delFlag为0的有效数据行
+                    var validRows = $("#educationList").find("tr").filter(function() {
+                        // 在当前行中查找delFlag隐藏字段，检查其值是否为0
+                        return $(this).find('input[name$=".delFlag"]').val() === "0";
+                    });
+
+                    console.log("有效数据行数量: " + validRows.length);
+
+                    // 如果没有有效数据行
+                    if(validRows.length === 0){
+                        top.layer.msg("请填写学历信息", {icon: 0});
+                        return false;
+                    }
 
                     var subbmitFlag = $("#subbmitFlag").val();
                     subbmitFlag ++;

src/main/webapp/webpage/modules/workstaff/workStaffBasicDetailModify.jsp

@@ -52,6 +52,20 @@
                       return false;
                   }
 
+                  // 查找所有delFlag为0的有效数据行
+                  var validRows = $("#educationList").find("tr").filter(function() {
+                      // 在当前行中查找delFlag隐藏字段，检查其值是否为0
+                      return $(this).find('input[name$=".delFlag"]').val() === "0";
+                  });
+
+                  console.log("有效数据行数量: " + validRows.length);
+
+                    // 如果没有有效数据行
+                  if(validRows.length === 0){
+                      top.layer.msg("请填写学历信息", {icon: 0});
+                      return false;
+                  }
+
                   var subbmitFlag = $("#subbmitFlag").val();
                   subbmitFlag ++;
                   $("#subbmitFlag").val(subbmitFlag)

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -312,7 +312,6 @@
                 checkMobile();
 
             });
-            certificateList();
 
             var certificateList = JSON.parse('${fns:toJson(workStaffBasicInfo.certificateList)}');