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

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

@@ -297,20 +297,6 @@ public class RuralProjectRecordsOwnCaseBaseController extends BaseController {
 
         if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("view")) {
             return "modules/projectcontentinfo/projectReportRecordCaseBaseView";
-        } else if (StringUtils.isNotBlank(projectReportRecord.getView()) && projectReportRecord.getView().equals("modiftApply")) {
-            ProcessInstance processInstance = actTaskService.getProcIns(projectReportRecord.getProcessInstanceId());
-            if (processInstance != null) {
-                Task taskInfok = actTaskService.getCurrentTaskInfo(processInstance);
-                Act act = new Act();
-                act.setTaskId(taskInfok.getId());
-                act.setTaskName(taskInfok.getName());
-                act.setProcDefId(taskInfok.getProcessDefinitionId());
-                act.setTaskDefKey(taskInfok.getTaskDefinitionKey());
-                act.setProcInsId(taskInfok.getProcessInstanceId());
-                act.setTask(taskInfok);
-                projectReportRecord.setAct(act);
-            }
-            return "modules/projectcontentinfo/projectReportRecordModiftApply";
         }
         return "modules/projectcontentinfo/projectReportRecordCaseBaseForm";
     }

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

@@ -1,55 +1,47 @@
 <%@ tag pageEncoding="UTF-8"%>
-<%@ attribute name="onChangeFunc" required="true" type="java.lang.String" description="文件选择变化时的处理函数" %>
-<%@ attribute name="fileList" required="true" type="java.util.List" description="文件列表数据" %>
-<%@ attribute name="projectId" required="true" type="java.lang.String" description="项目ID" %>
-<%@ attribute name="uploadMode" required="true" type="java.lang.String" description="上传模式" %>
+<%-- 通用文件展示组件：支持动态渲染和多场景适配 --%>
+
+<%-- 核心参数定义 --%>
 <%@ attribute name="moduleId" required="true" type="java.lang.String" description="模块唯一标识" %>
 <%@ attribute name="title" required="true" type="java.lang.String" description="模块标题" %>
-<%@ attribute name="showType" required="false" type="java.lang.Boolean" description="展示同步按钮的判断条件" %>
-<%-- 不使用default属性 --%>
-<%@ attribute name="showEditBtn" required="false" type="java.lang.Boolean" description="是否显示编辑按钮" %>
+<%@ attribute name="fileDataList" required="true" type="java.util.List" description="文件列表数据" %>
+<%@ attribute name="projectId" required="true" type="java.lang.String" description="项目ID" %>
+<%@ attribute name="uploadMode" required="true" type="java.lang.String" description="上传模式（1-正式/2-临时）" %>
+<%@ attribute name="onChangeFunc" required="true" type="java.lang.String" description="文件选择变化处理函数" %>
+<%@ attribute name="ctx" required="true" type="java.lang.String" description="应用上下文路径" %>
 
-<!-- 导入必要的标签库 -->
+<%-- 控制参数（可选） --%>
+<%@ attribute name="showEditBtn" required="false" type="java.lang.Boolean" description="是否显示编辑按钮，默认false" %>
+<%@ attribute name="showSyncStatus" required="false" type="java.lang.Boolean" description="是否显示同步状态列，默认true" %>
+
+<%-- 标签库导入 --%>
 <%@ 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" %>
 
-<%-- 定义默认值变量 --%>
-<c:choose>
-    <c:when test="${not empty showEditBtn}">
-        <%-- 传递了参数则使用参数值 --%>
-        <c:set var="showEditBtnValue" value="${showEditBtn}"/>
-    </c:when>
-    <c:otherwise>
-        <%-- 未传递参数时默认不显示编辑按钮 --%>
-        <c:set var="showEditBtnValue" value="false"/>
-    </c:otherwise>
-</c:choose>
-<%-- 定义默认值变量 --%>
-<c:choose>
-    <c:when test="${not empty showType}">
-        <c:set var="showTypeBtnValue" value="${showType}" />
-    </c:when>
-    <c:otherwise>
-        <%-- 如果未传入showEditBtn参数，默认显示编辑按钮 --%>
-        <c:set var="showTypeBtnValue" value="false" />
-    </c:otherwise>
-</c:choose>
+<%-- 可选参数默认值处理 --%>
+<c:set var="showEditBtnValue" value="${not empty showEditBtn ? showEditBtn : false}"/>
+<c:set var="showSyncStatusValue" value="${not empty showSyncStatus ? showSyncStatus : true}"/>
 
 <div class="form-group layui-row">
-    <div class="form-group-label"><h2>${title}</h2></div>
+    <div class="form-group-label"><h2>${title}1</h2></div>
+
+    <%-- 上传进度条 --%>
     <div id="addFile_${moduleId}" style="display: none" class="upload-progress">
-        <span id="fileName_${moduleId}" ></span>
-        <span id="_${moduleId}" ></span>
-        <b><span id="baifenbi_${moduleId}" ></span></b>
+        <span id="fileName_${moduleId}"></span>
+        <span id="_${moduleId}"></span>
+        <b><span id="baifenbi_${moduleId}"></span></b>
         <div class="progress">
-            <div id="jindutiao_${moduleId}" class="progress-bar" style="width: 0%" aria-valuenow="0">
-            </div>
+            <div id="jindutiao_${moduleId}" class="progress-bar" style="width: 0%" aria-valuenow="0"></div>
         </div>
     </div>
+
+    <%-- 文件选择输入框 --%>
     <input id="${moduleId}_file" type="file" name="${moduleId}_file" multiple="multiple" style="display: none;"
            onChange="if(this.value)${onChangeFunc}(this.value);"/>
     <span id="${moduleId}_title"></span>
+
+    <%-- 文件列表表格 --%>
     <div class="layui-item layui-col-xs12" style="padding:0 16px;">
         <table id="upTable_${moduleId}" class="table table-bordered table-condensed tree_table">
             <thead>
@@ -59,69 +51,117 @@
                 <th width="20%">文件类型</th>
                 <th width="160px">上传时间</th>
                 <th width="120px">文件大小(M)</th>
-                <th width="170px">操作</th>
+                <c:if test="${showSyncStatusValue}">
+                    <th width="100px">同步状态</th>
+                </c:if>
+                <th width="${showSyncStatusValue ? '100px' : '170px'}">操作</th>
             </tr>
             </thead>
             <tbody id="file_${moduleId}">
-            <c:forEach items="${fileList}" var = "filecaseBase" varStatus="status">
+            <%-- 遍历文件列表数据 --%>
+            <c:forEach items="${fileDataList}" var="filecaseBase" varStatus="status">
                 <tr id="file_${moduleId}_${filecaseBase.id}_tr" onclick="listTr(this)">
+                        <%-- 隐藏字段 --%>
                     <td style="display:none">${filecaseBase.id}</td>
                     <td style="display:none">${filecaseBase.mustFlag}</td>
+
+                        <%-- 文件要求列 --%>
                     <c:choose>
                         <c:when test="${filecaseBase.mustFlag == 1}">
-                            <td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${filecaseBase.attachName}<input type="hidden" value="${filecaseBase.attachName}"/></td>
+                            <td class="tabMove" style="text-align: left;">
+                                <span class='default_open ' style="padding-right: 15px; "></span>
+                                <span style="color: red">* </span>${filecaseBase.attachName}
+                                <input type="hidden" value="${filecaseBase.attachName}"/>
+                            </td>
                         </c:when>
                         <c:otherwise>
-                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${filecaseBase.attachName}<input type="hidden" value="${filecaseBase.attachName}"/></td>
+                            <td class="tabMove" style="text-align: left;">
+                                <span class='default_open' style="padding-right: 15px; "></span>${filecaseBase.attachName}
+                                <input type="hidden" value="${filecaseBase.attachName}"/>
+                            </td>
                         </c:otherwise>
                     </c:choose>
+
+                        <%-- 文件描述列 --%>
                     <td>
-                        <div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${filecaseBase.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${filecaseBase.attachTypes}</div>
+                        <div style="white-space:normal; word-break:break-all;overflow:hidden;">
+                            <span style="font-weight: bold">文件格式及大小：</span>${filecaseBase.attachLength}M;
+                        </div>
+                        <div style="white-space:normal; word-break:break-all;overflow:hidden;">${filecaseBase.attachTypes}</div>
                     </td>
+
+                        <%-- 占位列 --%>
                     <td></td>
                     <td></td>
                     <td></td>
+                    <c:if test="${showSyncStatusValue}"><td></td></c:if>
+
+                        <%-- 操作列 --%>
                     <td class="op-td">
                         <div class="op-btn-box">
-                                <%-- 临时调试输出，确认变量值 --%>
-                                <%-- <span style="color:red">调试：showEditBtn=${showEditBtn}, showEditBtnValue=${showEditBtnValue}</span> --%>
-
-                                <%-- 确保使用的是showEditBtnValue变量 --%>
-                            <c:if test="${showEditBtnValue == true}">
-                                <a href="javascript:void(0)" onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${filecaseBase.id}&projectId=${projectId}&uploadMode=${uploadMode}','70%','80%',false,'inputForm','upTable_${moduleId}')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+                            <c:if test="${showEditBtnValue}">
+                                <a href="javascript:void(0)"
+                                   onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${filecaseBase.id}&projectId=${projectId}&uploadMode=${uploadMode}','70%','80%',false,'inputForm','upTable_${moduleId}')"
+                                   class="op-btn op-btn-edit" >
+                                    <i class="fa fa-edit"></i> 编辑
+                                </a>
                             </c:if>
                         </div>
                     </td>
+
                     <td style="display:none">${filecaseBase.fileFlag}</td>
                 </tr>
-                <c:forEach items="${filecaseBase.workAttachments}" var = "workClientAttachment" varStatus="status">
-                    <tr id="addFile_${moduleId}_${workClientAttachment.id}_tr" class="addFile_${moduleId}_${filecaseBase.id}_tr">
+
+                <%-- 子文件行 --%>
+                <c:forEach items="${filecaseBase.workAttachments}" var="workClientAttachment">
+                    <tr class="addFile_${moduleId}_${filecaseBase.id}_tr">
                         <td></td>
+
+                            <%-- 文件预览列 --%>
                         <c:choose>
                             <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>
+                                                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}">
+                                        </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>
+                                                <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(filecaseBase.attachName,'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 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>
+                                                        <td>
+                                                            <a class="attention-info" href="javascript:void(0)"
+                                                               onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">
+                                                                    ${workClientAttachment.attachmentName}
+                                                            </a>
+                                                        </td>
                                                     </c:otherwise>
                                                 </c:choose>
                                             </c:otherwise>
@@ -132,27 +172,46 @@
                             <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}"></td>
+                                                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}">
+                                        </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.url}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                <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="${fn:containsIgnoreCase(filecaseBase.attachName,'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}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                    <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>
+                                                        <td>
+                                                            <a class="attention-info" href="javascript:void(0)"
+                                                               onclick="openPreview('${workClientAttachment.url}',2)">
+                                                                    ${workClientAttachment.attachmentName}
+                                                            </a>
+                                                        </td>
                                                     </c:otherwise>
                                                 </c:choose>
                                             </c:otherwise>
@@ -161,30 +220,52 @@
                                 </c:choose>
                             </c:otherwise>
                         </c:choose>
-                        <td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
 
+                            <%-- 文件描述 --%>
+                        <td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;"
+                            onclick="readOpenInfo('${workClientAttachment.description}')">
+                                ${workClientAttachment.description}
+                        </td>
 
+                            <%-- 上传时间 --%>
                         <td class="op-td" style="text-align:center;">
                             <fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
                         </td>
+
+                            <%-- 文件大小 --%>
                         <td class="op-td" style="text-align:center;">
                                 ${workClientAttachment.fileSize}
                         </td>
+
+                            <%-- 同步状态列 --%>
+                        <c:if test="${showSyncStatusValue}">
+                            <td class="op-td" style="text-align:center; color:${workClientAttachment.syncDifySync == '1' ? 'green' : 'orange'};">
+                                    ${workClientAttachment.syncDifySync == '1' ? '已同步' : '未同步'}
+                            </td>
+                        </c:if>
+
+                            <%-- 下载按钮 --%>
                         <td class="op-td">
-                            <div class="op-btn-box" >
+                            <div class="op-btn-box">
                                 <c:choose>
                                     <c:when test="${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>
+                                                <!-- 前端只需传递文件标识给后端，无需处理文件名 -->
+                                                <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:when>
                                             <c:otherwise>
-                                                <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                <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>
+                                        <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>
                             </div>
@@ -196,118 +277,131 @@
         </table>
     </div>
 </div>
-<script type="text/template" id="caseBaseTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="caseBaseTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
 
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-                            <c:if test="${showEditBtnValue}">
-                                <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_caseBase')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-                            </c:if>
-						</div>
-					</td>
-                </tr>//-->
+<%-- 动态渲染模板（基于moduleId确保唯一性） --%>
+<script type="text/template" id="${moduleId}Tpl">//<!--
+    <tr id="${moduleId}List{{idx}}">
+        <td class="hide">
+            <input id="${moduleId}Tpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
+        </td>
+        <td class="hide">0</td>
+        <td style="text-align:center;">{{row.attachName}}</td>
+        <td style="text-align:center;">{{row.attachLength}}</td>
+        <td style="text-align:center;">{{row.attachTypes}}</td>
+        <td style="text-align:center;"></td>
+        <c:if test="${showSyncStatusValue}">
+            <td style="text-align:center;">未同步</td>
+        </c:if>
+        <td class="op-td">
+            <div class="op-btn-box">
+                <c:if test="${showEditBtnValue}">
+                    <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${projectId}','70%','80%',false,'inputForm','upTable_${moduleId}')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
+                </c:if>
+            </div>
+        </td>
+    </tr>//-->
 </script>
 
 <script>
-    function openBill2(title,url,width,height,target,formId,tableId){
-        var rows = $(this).parent().prevAll().length + 1;
+    <%-- 打开编辑窗口 --%>
+    function openBill2(title, url, width, height, target, formId, tableId) {
         var frameIndex = parent.layer.getFrameIndex(window.name);
-        var urls = url+"&index="+frameIndex;
-        if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){//如果是移动端，就使用自适应大小弹窗
-            width='auto';
-            height='auto';
-        }else{//如果是PC端，根据用户设置的width和height显示。
-
+        var urls = url + "&index=" + frameIndex;
+        if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {
+            width = 'auto';
+            height = 'auto';
         }
         top.layer.open({
             type: 2,
             area: [width, height],
             title: title,
-            skin:"two-btns",
-            maxmin: false, //开启最大化最小化按钮
-            content: urls ,
-            btn: ['确定','关闭'],
-            yes: function(index, layero){
+            skin: "two-btns",
+            maxmin: false,
+            content: urls,
+            btn: ['确定', '关闭'],
+            yes: function (index, layero) {
                 var body = top.layer.getChildFrame('body', index);
-                var iframeWin = layero.find('iframe')[0]; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+                var iframeWin = layero.find('iframe')[0];
                 var inputForm = body.find('#inputForm');
-                var top_iframe;
-                if(target){
-                    top_iframe = target;//如果指定了iframe，则在改frame中跳转
-                }else{
-                    top_iframe = top.getActiveTab().attr("name");//获取当前active的tab的iframe
-                }
-                inputForm.attr("target",top_iframe);//表单提交成功后，从服务器返回的url在当前tab中展示
-                inputForm.attr("action","${ctx}/projectAccessory/projectAccessory/saveWorkAttachment");//表单提交成功后，从服务器返回的url在当前tab中展示
+                var top_iframe = target ? target : top.getActiveTab().attr("name");
+                inputForm.attr("target", top_iframe);
+                inputForm.attr("action", "${ctx}/projectAccessory/projectAccessory/saveWorkAttachment");
                 var $document = iframeWin.contentWindow.document;
-
-                formSubmit2($document,formId,index,tableId);
-
-            },
-            cancel: function(index){
+                formSubmit2($document, formId, index, tableId);
             }
         });
     }
-    function formSubmit2($document,inputForm,index,tableId){
 
-        var validateForm = $($document.getElementById(inputForm)).validate({
-            submitHandler: function(form){
+    <%-- 表单提交处理 --%>
+    function formSubmit2($document, inputFormId, index, tableId) {
+        var validateForm = $($document.getElementById(inputFormId)).validate({
+            submitHandler: function (form) {
                 loading('正在提交，请稍等...');
                 form.submit();
             },
             errorContainer: "#messageBox",
-            errorPlacement: function(error, element) {
-                $($document.getElementById("#messageBox")).text("输入有误，请先更正。");
-                if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
+            errorPlacement: function (error, element) {
+                $($document.getElementById("messageBox")).text("输入有误，请先更正。");
+                if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
                     error.appendTo(element.parent().parent());
                 } else {
                     error.insertAfter(element);
                 }
             }
         });
-        if(validateForm.form()){
-            var action = $document.getElementById(inputForm).action;
-            var handleInfo = $($document.getElementById(inputForm)).serialize();
+        if (validateForm.form()) {
+            var action = $document.getElementById(inputFormId).action;
+            var handleInfo = $($document.getElementById(inputFormId)).serialize();
             $.ajax({
-                type : "POST",
-                url : action,
-                data : handleInfo,
-                //请求成功
-                success:function(data) {
-                    var d = data;
-                    //输出提示信息
-                    if(d.str.length>0){
-                        parent.layer.msg(d.str,{icon:1});
-                    }
-                    if(${showTypeBtnValue}){
-                        //将数据临时挂载在父级页面
-                        parent.tempSyncIds = [...confirmIdList]
-                        location.reload();
-                    }else{
-                        $("#"+tableId).load(location.href + " #"+tableId);
+                type: "POST",
+                url: action,
+                data: handleInfo,
+                success: function (data) {
+                    if (data.str && data.str.length > 0) {
+                        parent.layer.msg(data.str, {icon: 1});
                     }
-                    //关闭当前页
-                    top.layer.close(index)
+                    // 刷新表格
+                    $("#" + tableId).load(location.href + " #" + tableId);
+                    top.layer.close(index);
                 }
             });
         }
     }
+
+    <%-- 动态添加行示例方法（需结合具体模板引擎使用） --%>
+    function add${moduleId}Row(data, index) {
+        var tpl = document.getElementById('${moduleId}Tpl').innerHTML;
+        // 此处示例使用简单字符串替换，实际项目中建议使用模板引擎
+        var html = tpl.replace(/{{idx}}/g, index)
+            .replace(/{{row\.id}}/g, data.id)
+            .replace(/{{row\.attachName}}/g, data.attachName)
+            .replace(/{{row\.attachLength}}/g, data.attachLength)
+            .replace(/{{row\.attachTypes}}/g, data.attachTypes);
+        $("#file_${moduleId}").append(html);
+    }
+
+    function downloadFile(originalUrl, fileName) {
+        try {
+            // 1. 清理并标准化文件名（核心修复点）
+            const safeFileName = fileName
+                .replace(/[\/:*?"<>|]/g, '_')  // 移除系统不允许的特殊字符
+                .replace(/\s+/g, ' ').trim();  // 标准化空格
+
+            // 2. 阿里云兼容的编码方式（仅一次编码）
+            const encodedFileName = encodeURIComponent(safeFileName);
+
+            // 3. 拼接阿里云强制下载参数（固定格式）
+            const param = `response-content-disposition=attachment;filename="${encodedFileName}";filename*=UTF-8''${encodedFileName}`;
+
+            // 4. 正确拼接参数（不破坏原有URL结构）
+            const separator = originalUrl.includes('?') ? '&' : '?';
+            const finalUrl = originalUrl + separator + param;
+
+            // 5. 保持原有下载方式不变
+            window.location.href = finalUrl;
+        } catch (e) {
+            // 出错时降级为原始链接（保持原有容错）
+            window.location.href = originalUrl;
+        }
+    }
 </script>

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

@@ -15,7 +15,7 @@
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
 <div class="form-group layui-row">
-    <div class="form-group-label"><h2>${title}</h2></div>
+    <div class="form-group-label"><h2>${title}2</h2></div>
     <div class="layui-item nav-btns">
         <%--<a id="${moduleId}_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
     </div>
@@ -168,7 +168,10 @@
                                         <c:when test="${projectReportRecord.uploadMode == 2}">
                                             <c:choose>
                                                 <c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-                                                    <a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                    <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:when>
                                                 <c:otherwise>
                                                     <a href="${fileOther.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -190,4 +193,31 @@
             </tbody>
         </table>
     </div>
-</div>
+</div>
+
+<script>
+    function downloadFile(originalUrl, fileName) {
+        try {
+            // 1. 清理并标准化文件名（核心修复点）
+            const safeFileName = fileName
+                .replace(/[\/:*?"<>|]/g, '_')  // 移除系统不允许的特殊字符
+                .replace(/\s+/g, ' ').trim();  // 标准化空格
+
+            // 2. 阿里云兼容的编码方式（仅一次编码）
+            const encodedFileName = encodeURIComponent(safeFileName);
+
+            // 3. 拼接阿里云强制下载参数（固定格式）
+            const param = `response-content-disposition=attachment;filename="${encodedFileName}";filename*=UTF-8''${encodedFileName}`;
+
+            // 4. 正确拼接参数（不破坏原有URL结构）
+            const separator = originalUrl.includes('?') ? '&' : '?';
+            const finalUrl = originalUrl + separator + param;
+
+            // 5. 保持原有下载方式不变
+            window.location.href = finalUrl;
+        } catch (e) {
+            // 出错时降级为原始链接（保持原有容错）
+            window.location.href = originalUrl;
+        }
+    }
+</script>

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

@@ -45,7 +45,7 @@
 </c:choose>
 
 <div class="form-group layui-row">
-    <div class="form-group-label"><h2>${title}</h2></div>
+    <div class="form-group-label"><h2>${title}1</h2></div>
 
     <c:if test="${showAddButtonValue}">
         <div class="layui-item nav-btns">
@@ -197,7 +197,10 @@
                                     <c:when test="${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>
+                                                <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:when>
                                             <c:otherwise>
                                                 <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -542,4 +545,28 @@
         });
         return false;
     }
+    function downloadFile(originalUrl, fileName) {
+        try {
+            // 1. 清理并标准化文件名（核心修复点）
+            const safeFileName = fileName
+                .replace(/[\/:*?"<>|]/g, '_')  // 移除系统不允许的特殊字符
+                .replace(/\s+/g, ' ').trim();  // 标准化空格
+
+            // 2. 阿里云兼容的编码方式（仅一次编码）
+            const encodedFileName = encodeURIComponent(safeFileName);
+
+            // 3. 拼接阿里云强制下载参数（固定格式）
+            const param = `response-content-disposition=attachment;filename="${encodedFileName}";filename*=UTF-8''${encodedFileName}`;
+
+            // 4. 正确拼接参数（不破坏原有URL结构）
+            const separator = originalUrl.includes('?') ? '&' : '?';
+            const finalUrl = originalUrl + separator + param;
+
+            // 5. 保持原有下载方式不变
+            window.location.href = finalUrl;
+        } catch (e) {
+            // 出错时降级为原始链接（保持原有容错）
+            window.location.href = originalUrl;
+        }
+    }
 </script>

src/main/webapp/static/common/js/common.js

@@ -156,7 +156,37 @@ function openPreview(url,flag){
     if(flag ===1 ){
         url = 'https://view.xdocin.com/view?src='+encodeURIComponent(url);
     }else if(flag === 2){
-        url = 'https://view.xdocin.com/view?src='+encodeURIComponent(url);
+        if (url.indexOf(".xml") !== -1) {
+            url = 'https://view.xdocin.com/view?src=' + encodeURIComponent(url);
+        } else {
+            try {
+                // 解析URL并获取路径部分（增加错误捕获）
+                const urlObj = new URL(url);
+                const pathname = urlObj.pathname.toLowerCase();
+
+                // 定义Office文件扩展名
+                const officeExtensions = [
+                    '.doc', '.docx',
+                    '.xls', '.xlsx',
+                    '.ppt', '.pptx',
+                    '.mdb', '.accdb',
+                    '.msg', '.ost', '.pst'
+                ];
+
+                // 判断是否为Office文件
+                const isOffice = officeExtensions.some(ext => pathname.endsWith(ext));
+                // 赋值给url而非return，保证后续代码执行
+                if (isOffice) {
+                    url = 'https://view.officeapps.live.com/op/view.aspx?src=' + encodeURIComponent(url);
+                } else {
+                    url = 'https://view.xdocin.com/view?src=' + encodeURIComponent(url);
+                }
+            } catch (e) {
+                console.error('URL解析失败:', e);
+                // 解析失败时降级处理
+                url = 'https://view.xdocin.com/view?src=' + encodeURIComponent(url);
+            }
+        }
     }else if(flag === 3){
         url = 'https://view.xdocin.com/view?src='+encodeURIComponent(url);
     }else if(flag === 4){

src/main/webapp/webpage/include/head.jsp

@@ -70,7 +70,7 @@
 <script src="${ctxStatic}/common/mustache.min.js" type="text/javascript"></script>
 <script src="${ctxStatic}/common/content.js" type="text/javascript"></script>
 <link href="${ctxStatic}/common/css/login.css" type="text/css" rel="stylesheet" />
-<script src="${ctxStatic}/common/js/common.js?2" type="text/javascript"></script>
+<script src="${ctxStatic}/common/js/common.js?3" type="text/javascript"></script>
 <script src="${ctxStatic}/utilJs/custom.js?1" type="text/javascript"></script>
 <script type="text/javascript">var ctx = '${ctx}', ctxStatic='${ctxStatic}',ctxp='${ctxp}';</script>
 

src/main/webapp/webpage/modules/projectPaperFiling/projectPaperFilingAudit.jsp

@@ -1285,476 +1285,39 @@
 					</c:if>
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>成果文件</h2></div>
-						<div id="addFile_attachment" style="display: none" class="upload-progress">
-							<span id="fileName_attachment" ></span>
-							<span id="_attachment" ></span>
-							<b><span id="baifenbi_attachment" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-						<span id="attachment_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="30%">文件类型</th>
-									<th >文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_attachment">
-								<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-									<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
-										<c:choose>
-											<c:when test="${fileAttachment.mustFlag == 1}">
-												<td class="tabMove" style="text-align:left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
-														<td class="tabMove"  style="text-align:left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<%--											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-													<%--<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
 
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.temporaryUrl}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.url}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td>${fileAttachment.fileSize}</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
 
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																		<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileAttachment.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('${fileAttachment.temporaryUrl}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileAttachment.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileAttachment.url}','${fileAttachment.createBy.id}','${fileAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
+					<!-- 成果文件模块引用 -->
+					<table:otherFileDisplay
+							title="成果文件"
+							onChangeFunc="insertTitle"
+							fileList="${projectcontentinfo.fileAttachmentList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
 
+					<!-- 依据性文件模块引用 -->
+					<table:otherFileDisplay
+							title="依据性文件"
+							onChangeFunc="gistdataInsertTitle"
+							fileList="${projectcontentinfo.fileGistdataList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
 
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>依据性文件</h2></div>
-						<div id="addFile_gistdata" style="display: none" class="upload-progress">
-							<span id="fileName_gistdata" ></span>
-							<span id="_gistdata" ></span>
-							<b><span id="baifenbi_gistdata" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-						<span id="gistdata_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="gistdata_upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="30%">文件类型</th>
-									<th >文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_gistdata">
-								<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-									<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td class="tabMove"  style="text-align:left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="tabMove"  style="text-align:left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<%--											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-													<%--<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
 
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--												<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td>${fileGistdata.fileSize}</td>
-										<td class="op-td"  style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileGistdata.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('${fileGistdata.temporaryUrl}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileGistdata.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileGistdata.url}','${fileGistdata.createBy.id}','${fileGistdata.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>其他文件</h2></div>
-						<div id="addFile_other" style="display: none" class="upload-progress">
-							<span id="fileName_other" ></span>
-							<span id="_other" ></span>
-							<b><span id="baifenbi_other" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-						<span id="other_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable_other" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="30%">文件类型</th>
-									<th >文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_other">
-								<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-									<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileOther.mustFlag == 1}">
-												<td class="tabMove"  style="text-align:left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-														<td class="tabMove"  style="text-align:left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-													<%--<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
+					<!-- 其他文件模块引用 -->
+					<table:otherFileDisplay
+							title="其他文件"
+							onChangeFunc="otherInsertTitle"
+							fileList="${projectcontentinfo.fileOtherList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
 
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--													<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td>${fileOther.fileSize}</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileOther.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('${fileOther.temporaryUrl}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileOther.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileOther.url}','${fileOther.createBy.id}','${fileOther.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
 				</div>
 			</div>
 

src/main/webapp/webpage/modules/projectcontentinfo/projectCaseBaseSupplementAudit.jsp

@@ -1371,15 +1371,18 @@
 					</div>
 
 					<!-- 案例文件模块 -->
+						<%-- showEditBtn="false" 不显示编辑按钮 --%>
+						<%-- showSyncStatus="true" 显示同步状态按钮 --%>
 					<table:fileDisplay
+							moduleId="caseBase"
 							title="案例文件"
 							onChangeFunc="caseBaseInsertTitle"
-							fileList="${projectReportRecord.fileCaseBaseList}"
+							fileDataList="${projectReportRecord.fileCaseBaseList}"
 							projectId="${project.id}"
 							uploadMode="${projectReportRecord.uploadMode}"
-							showType="${true}"
-							showEditBtn="${true}"
-							moduleId="caseBase"/>
+							showEditBtn="true"
+							showSyncStatus="false"
+							ctx="${ctx}"/>
 
 					<div class="form-group-label">
 						<div style="float: right"> <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogre('个人模板列表', '${ctx}/auditTemplate/auditTemplate/templateList?identification=${identification}&name=${identificationName}','80%', '70%','','关闭')" class="nav-btn layui-btn layui-btn-sm" ><i class="fa fa-file-excel-o"></i> 审核意见模板列表</a></div>

src/main/webapp/webpage/modules/projectcontentinfo/projectCaseBaseSupplementForm.jsp

@@ -1275,732 +1275,51 @@
 				<div class="form-group layui-row first" id="AccessoryView">
 
 
+						<%-- showEditBtn="false" 显示编辑按钮 --%>
+						<%-- showSyncStatus="true" 显示同步按钮 --%>
+					<table:fileDisplay
+							moduleId="caseBase"
+							title="案例文件"
+							onChangeFunc="caseBaseInsertTitle"
+							fileDataList="${projectReportRecord.fileCaseBaseList}"
+							projectId="${project.id}"
+							uploadMode="${projectReportRecord.uploadMode}"
+							showEditBtn="true"
+							showSyncStatus="false"
+							ctx="${ctx}"/>
+
+
+							<!-- 成果文件模块引用 -->
+							<table:otherFileDisplay
+									title="成果文件"
+									onChangeFunc="insertTitle"
+									fileList="${projectReportRecord.fileAttachmentList}"
+									uploadMode="${projectReportRecord.uploadMode}"
+									moduleId="other"
+									projectContentInfo="${projectReportRecord}"
+									projectReportRecord="${projectReportRecord}"/>
+
+							<!-- 依据性文件模块引用 -->
+							<table:otherFileDisplay
+									title="依据性文件"
+									onChangeFunc="gistdataInsertTitle"
+									fileList="${projectReportRecord.fileGistdataList}"
+									uploadMode="${projectReportRecord.uploadMode}"
+									moduleId="other"
+									projectContentInfo="${projectReportRecord}"
+									projectReportRecord="${projectReportRecord}"/>
+
+
+							<!-- 其他文件模块引用 -->
+							<table:otherFileDisplay
+									title="其他文件"
+									onChangeFunc="otherInsertTitle"
+									fileList="${projectReportRecord.fileOtherList}"
+									uploadMode="${projectReportRecord.uploadMode}"
+									moduleId="other"
+									projectContentInfo="${projectReportRecord}"
+									projectReportRecord="${projectReportRecord}"/>
 
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>案例文件</h2></div>
-						<div id="addFile_caseBase" style="display: none" class="upload-progress">
-							<span id="fileName_caseBase" ></span>
-							<span id="_caseBase" ></span>
-							<b><span id="baifenbi_caseBase" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_caseBase" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="caseBase_file" type="file" name="caseBase_file" multiple="multiple" style="display: none;" onChange="if(this.value)caseBaseInsertTitle(this.value);"/>
-						<span id="caseBase_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable_caseBase" class="table table-bordered table-condensed tree_table">
-								<thead>
-								<tr>
-										<%-- <th>序号</th>--%>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_caseBase">
-								<c:forEach items="${projectReportRecord.fileCaseBaseList}" var = "filecaseBase" varStatus="status">
-									<tr id="file_caseBase_${filecaseBase.id}_tr" onclick="listTr(this)">
-											<%-- <td>${status.index + 1}</td>--%>
-										<td style="display:none">${filecaseBase.id}</td>
-										<td style="display:none">${filecaseBase.mustFlag}</td>
-										<c:choose>
-											<c:when test="${filecaseBase.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${filecaseBase.attachName}<input type="hidden" value="${filecaseBase.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${filecaseBase.attachName}<input type="hidden" value="${filecaseBase.attachName}"/></td>
-											</c:otherwise>
-										</c:choose>
-										<td>
-												<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${filecaseBase.attachName}</div></div>--%>
-											<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${filecaseBase.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${filecaseBase.attachTypes}</div>
-										</td>
-										<td></td>
-										<td></td>
-										<td></td>
-										<td class="op-td">
-											<div class="op-btn-box" >
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${filecaseBase.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_caseBase')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-											</div>
-										</td>
-										<td style="display:none">${filecaseBase.fileFlag}</td>
-
-									</tr>
-									<c:forEach items="${filecaseBase.workAttachments}" var = "workClientAttachment" varStatus="status">
-										<tr class="addFile_caseBase_${filecaseBase.id}_tr">
-											<td></td>
-											<c:choose>
-												<c:when test="${projectReportRecord.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(filecaseBase.attachName,'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}"></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.url}',1)">${workClientAttachment.attachmentName}</a></td>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(filecaseBase.attachName,'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>
-											<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-											<td class="op-td" style="text-align:center;">
-												<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-											</td>
-											<td class="op-td" style="text-align:center;">
-													${workClientAttachment.fileSize}
-											</td>
-											<td class="op-td">
-												<div class="op-btn-box" >
-														<%--附件下载删除--%>
-													<c:choose>
-														<c:when test="${projectReportRecord.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>
-												</div>
-											</td>
-										</tr>
-									</c:forEach>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<script type="text/template" id="caseBaseTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="caseBaseTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_caseBase')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-					</script>
-
-
-
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>成果文件</h2></div>
-						<div class="layui-item nav-btns">
-						</div>
-						<div id="addFile_attachment" style="display: none" class="upload-progress">
-							<span id="fileName_attachment" ></span>
-							<span id="_attachment" ></span>
-							<b><span id="baifenbi_attachment" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-						<span id="attachment_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_attachment">
-								<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-									<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
-										<c:choose>
-											<c:when test="${fileAttachment.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<%--															<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.temporaryUrl}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)"  onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.url}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<c:choose>
-											<c:when test="${fileAttachment.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileAttachment.description}')">${fileAttachment.description}</td>
-											</c:otherwise>
-										</c:choose>
-
-
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileAttachment.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td" style="text-align:center;">
-												${fileAttachment.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
-
-													</c:when>
-													<c:otherwise>
-
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																		<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileAttachment.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('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>依据性文件</h2></div>
-						<div class="layui-item nav-btns">
-								<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						</div>
-						<div id="addFile_gistdata" style="display: none" class="upload-progress">
-							<span id="fileName_gistdata" ></span>
-							<span id="_gistdata" ></span>
-							<b><span id="baifenbi_gistdata" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-						<span id="gistdata_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="gistdata_upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_gistdata">
-								<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-									<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<%--																	<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--												<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-
-										<c:choose>
-											<c:when test="${fileGistdata.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileGistdata.description}')">${fileGistdata.description}</td>
-											</c:otherwise>
-										</c:choose>
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileGistdata.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td"  style="text-align:center;">
-												${fileGistdata.fileSize}
-										</td>
-										<td class="op-td"  style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-
-													</c:when>
-													<c:otherwise>
-
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileGistdata.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('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>其他文件</h2></div>
-						<div class="layui-item nav-btns">
-								<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						</div>
-						<div id="addFile_other" style="display: none" class="upload-progress">
-							<span id="fileName_other" ></span>
-							<span id="_other" ></span>
-							<b><span id="baifenbi_other" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-						<span id="other_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable_other" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_other">
-								<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-									<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileOther.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<%--																	<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<!--													<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>-->
-												</c:otherwise>
-											</c:choose>
-										</td>
-
-
-										<c:choose>
-											<c:when test="${fileGistdata.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileOther.description}')">${fileOther.description}</td>
-											</c:otherwise>
-										</c:choose>
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileOther.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td" style="text-align:center;">
-												${fileOther.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileOther.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('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
 
 				</div>
 			</div>

src/main/webapp/webpage/modules/projectcontentinfo/projectCaseBaseSupplementModify.jsp

@@ -1472,14 +1472,18 @@
 					</div>
 
 					<!-- 案例文件模块 -->
+						<%-- showEditBtn="false" 不显示编辑按钮 --%>
+						<%-- showSyncStatus="true" 显示同步状态按钮 --%>
 					<table:fileDisplay
+							moduleId="caseBase"
 							title="案例文件"
 							onChangeFunc="caseBaseInsertTitle"
-							fileList="${projectReportRecord.fileCaseBaseList}"
+							fileDataList="${projectReportRecord.fileCaseBaseList}"
 							projectId="${project.id}"
 							uploadMode="${projectReportRecord.uploadMode}"
-							showType="false"
-							moduleId="caseBase"/>
+							showEditBtn="true"
+							showSyncStatus="false"
+							ctx="${ctx}"/>
 
 				</div>
 

src/main/webapp/webpage/modules/projectcontentinfo/projectCaseBaseSupplementView.jsp

@@ -1371,13 +1371,18 @@
 					</div>
 
 					<!-- 案例文件模块 -->
+						<%-- showEditBtn="false" 不显示编辑按钮 --%>
+						<%-- showSyncStatus="true" 显示同步状态按钮 --%>
 					<table:fileDisplay
+							moduleId="caseBase"
 							title="案例文件"
 							onChangeFunc="caseBaseInsertTitle"
-							fileList="${projectReportRecord.fileCaseBaseList}"
+							fileDataList="${projectReportRecord.fileCaseBaseList}"
 							projectId="${project.id}"
 							uploadMode="${projectReportRecord.uploadMode}"
-							moduleId="caseBase"/>
+							showEditBtn="false"
+							showSyncStatus="true"
+							ctx="${ctx}"/>
 
 
 				</div>

src/main/webapp/webpage/modules/projectcontentinfo/projectCaseBaseSupplementpendingForm.jsp

@@ -1386,543 +1386,40 @@
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">
 
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>成果文件</h2></div>
-						<div class="layui-item nav-btns">
-						</div>
-						<div id="addFile_attachment" style="display: none" class="upload-progress">
-							<span id="fileName_attachment" ></span>
-							<span id="_attachment" ></span>
-							<b><span id="baifenbi_attachment" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-						<span id="attachment_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_attachment">
-								<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-									<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
-										<c:choose>
-											<c:when test="${fileAttachment.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<%--															<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.temporaryUrl}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)"  onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.url}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<c:choose>
-											<c:when test="${fileAttachment.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileAttachment.description}')">${fileAttachment.description}</td>
-											</c:otherwise>
-										</c:choose>
-
 
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileAttachment.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td" style="text-align:center;">
-												${fileAttachment.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
 
-													</c:when>
-													<c:otherwise>
-
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																		<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileAttachment.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('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>依据性文件</h2></div>
-						<div class="layui-item nav-btns">
-								<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						</div>
-						<div id="addFile_gistdata" style="display: none" class="upload-progress">
-							<span id="fileName_gistdata" ></span>
-							<span id="_gistdata" ></span>
-							<b><span id="baifenbi_gistdata" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-						<span id="gistdata_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="gistdata_upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_gistdata">
-								<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-									<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<%--																	<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--												<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-
-										<c:choose>
-											<c:when test="${fileGistdata.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileGistdata.description}')">${fileGistdata.description}</td>
-											</c:otherwise>
-										</c:choose>
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileGistdata.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td"  style="text-align:center;">
-												${fileGistdata.fileSize}
-										</td>
-										<td class="op-td"  style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-
-													</c:when>
-													<c:otherwise>
-
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileGistdata.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('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>其他文件</h2></div>
-						<div class="layui-item nav-btns">
-								<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						</div>
-						<div id="addFile_other" style="display: none" class="upload-progress">
-							<span id="fileName_other" ></span>
-							<span id="_other" ></span>
-							<b><span id="baifenbi_other" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-						<span id="other_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable_other" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_other">
-								<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-									<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileOther.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<%--																	<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<!--													<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>-->
-												</c:otherwise>
-											</c:choose>
-										</td>
-
-
-										<c:choose>
-											<c:when test="${fileGistdata.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileOther.description}')">${fileOther.description}</td>
-											</c:otherwise>
-										</c:choose>
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileOther.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td" style="text-align:center;">
-												${fileOther.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileOther.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('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
+					<!-- 成果文件模块引用 -->
+					<table:otherFileDisplay
+							title="成果文件"
+							onChangeFunc="insertTitle"
+							fileList="${projectReportRecord.fileAttachmentList}"
+							uploadMode="${projectReportRecord.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectReportRecord}"
+							projectReportRecord="${projectReportRecord}"/>
+
+					<!-- 依据性文件模块引用 -->
+					<table:otherFileDisplay
+							title="依据性文件"
+							onChangeFunc="gistdataInsertTitle"
+							fileList="${projectReportRecord.fileGistdataList}"
+							uploadMode="${projectReportRecord.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectReportRecord}"
+							projectReportRecord="${projectReportRecord}"/>
+
+
+					<!-- 其他文件模块引用 -->
+					<table:otherFileDisplay
+							title="其他文件"
+							onChangeFunc="otherInsertTitle"
+							fileList="${projectReportRecord.fileOtherList}"
+							uploadMode="${projectReportRecord.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectReportRecord}"
+							projectReportRecord="${projectReportRecord}"/>
+
+					
 
 				</div>
 
@@ -1979,192 +1476,22 @@
 						</div>
 
 					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>案例文件</h2></div>
-						<div id="addFile_caseBase" style="display: none" class="upload-progress">
-							<span id="fileName_caseBase" ></span>
-							<span id="_caseBase" ></span>
-							<b><span id="baifenbi_caseBase" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_caseBase" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="caseBase_file" type="file" name="caseBase_file" multiple="multiple" style="display: none;" onChange="if(this.value)caseBaseInsertTitle(this.value);"/>
-						<span id="caseBase_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable_caseBase" class="table table-bordered table-condensed tree_table">
-								<thead>
-								<tr>
-										<%-- <th>序号</th>--%>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="170px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_caseBase">
-								<c:forEach items="${projectReportRecord.fileCaseBaseList}" var = "filecaseBase" varStatus="status">
-									<tr id="file_caseBase_${filecaseBase.id}_tr" onclick="listTr(this)">
-											<%-- <td>${status.index + 1}</td>--%>
-										<td style="display:none">${filecaseBase.id}</td>
-										<td style="display:none">${filecaseBase.mustFlag}</td>
-										<c:choose>
-											<c:when test="${filecaseBase.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${filecaseBase.attachName}<input type="hidden" value="${filecaseBase.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${filecaseBase.attachName}<input type="hidden" value="${filecaseBase.attachName}"/></td>
-											</c:otherwise>
-										</c:choose>
-										<td>
-												<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${filecaseBase.attachName}</div></div>--%>
-											<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${filecaseBase.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${filecaseBase.attachTypes}</div>
-										</td>
-										<td></td>
-										<td></td>
-										<td></td>
-										<td class="op-td">
-											<div class="op-btn-box" >
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${filecaseBase.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_caseBase')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-											</div>
-										</td>
-										<td style="display:none">${filecaseBase.fileFlag}</td>
 
-									</tr>
-									<c:forEach items="${filecaseBase.workAttachments}" var = "workClientAttachment" varStatus="status">
-										<tr id="addFile_caseBase_${workClientAttachment.id}_tr" class="addFile_caseBase_${filecaseBase.id}_tr">
-											<td></td>
-											<c:choose>
-												<c:when test="${projectReportRecord.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(filecaseBase.attachName,'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}"></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.url}',1)">${workClientAttachment.attachmentName}</a></td>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(filecaseBase.attachName,'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>
-											<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-											<td class="op-td" style="text-align:center;">
-												<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-											</td>
-											<td class="op-td" style="text-align:center;">
-													${workClientAttachment.fileSize}
-											</td>
-											<td class="op-td">
-												<div class="op-btn-box" >
-														<%--附件下载删除--%>
-													<c:choose>
-														<c:when test="${projectReportRecord.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>
-
-												</div>
-											</td>
-										</tr>
-									</c:forEach>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<script type="text/template" id="caseBaseTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="caseBaseTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_caseBase')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-					</script>
+
+					<!-- 案例文件模块 -->
+						<%-- showEditBtn="false" 不显示编辑按钮 --%>
+						<%-- showSyncStatus="true" 显示同步状态按钮 --%>
+					<table:fileDisplay
+							moduleId="caseBase"
+							title="案例文件"
+							onChangeFunc="caseBaseInsertTitle"
+							fileDataList="${projectReportRecord.fileCaseBaseList}"
+							projectId="${project.id}"
+							uploadMode="${projectReportRecord.uploadMode}"
+							showEditBtn="false"
+							showSyncStatus="true"
+							ctx="${ctx}"/>
+
 
 				</div>
 

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordAudit.jsp

@@ -1184,543 +1184,42 @@
 					</c:if>
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>成果文件</h2></div>
-						<div class="layui-item nav-btns">
-						</div>
-						<div id="addFile_attachment" style="display: none" class="upload-progress">
-							<span id="fileName_attachment" ></span>
-							<span id="_attachment" ></span>
-							<b><span id="baifenbi_attachment" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-						<span id="attachment_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_attachment">
-								<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-									<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
-										<c:choose>
-											<c:when test="${fileAttachment.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<%--															<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.temporaryUrl}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)"  onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.url}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<c:choose>
-											<c:when test="${fileAttachment.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileAttachment.description}')">${fileAttachment.description}</td>
-											</c:otherwise>
-										</c:choose>
 
 
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileAttachment.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td" style="text-align:center;">
-												${fileAttachment.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
 
-													</c:when>
-													<c:otherwise>
-
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																		<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileAttachment.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('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>依据性文件</h2></div>
-						<div class="layui-item nav-btns">
-								<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						</div>
-						<div id="addFile_gistdata" style="display: none" class="upload-progress">
-							<span id="fileName_gistdata" ></span>
-							<span id="_gistdata" ></span>
-							<b><span id="baifenbi_gistdata" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-						<span id="gistdata_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="gistdata_upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_gistdata">
-								<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-									<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<%--																	<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--												<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
 
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="op-td"></td>
-													</c:when>
-													<c:otherwise>
-														<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileGistdata.description}')">${fileGistdata.description}</td>
-													</c:otherwise>
-												</c:choose>
-												<td class="op-td" style="text-align:center;">
-													<c:choose>
-														<c:when test="${fileGistdata.flag == 0}">
-															<div></div>
-														</c:when>
-														<c:otherwise>
-															<fmt:formatDate value="${fileGistdata.createDate}" type="date"/>
-														</c:otherwise>
-													</c:choose>
-												</td>
-										<td class="op-td"  style="text-align:center;">
-												${fileGistdata.fileSize}
-										</td>
-										<td class="op-td"  style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
+					<!-- 成果文件模块引用 -->
+					<table:otherFileDisplay
+							title="成果文件"
+							onChangeFunc="insertTitle"
+							fileList="${projectReportRecord.fileAttachmentList}"
+							uploadMode="${projectReportRecord.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectReportRecord}"
+							projectReportRecord="${projectReportRecord}"/>
 
-													</c:when>
-													<c:otherwise>
+					<!-- 依据性文件模块引用 -->
+					<table:otherFileDisplay
+							title="依据性文件"
+							onChangeFunc="gistdataInsertTitle"
+							fileList="${projectReportRecord.fileGistdataList}"
+							uploadMode="${projectReportRecord.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectReportRecord}"
+							projectReportRecord="${projectReportRecord}"/>
 
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileGistdata.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('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>其他文件</h2></div>
-						<div class="layui-item nav-btns">
-								<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						</div>
-						<div id="addFile_other" style="display: none" class="upload-progress">
-							<span id="fileName_other" ></span>
-							<span id="_other" ></span>
-							<b><span id="baifenbi_other" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-						<span id="other_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable_other" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_other">
-								<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-									<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileOther.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<%--																	<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<!--													<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>-->
-												</c:otherwise>
-											</c:choose>
-										</td>
 
+					<!-- 其他文件模块引用 -->
+					<table:otherFileDisplay
+							title="其他文件"
+							onChangeFunc="otherInsertTitle"
+							fileList="${projectReportRecord.fileOtherList}"
+							uploadMode="${projectReportRecord.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectReportRecord}"
+							projectReportRecord="${projectReportRecord}"/>
 
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="op-td"></td>
-													</c:when>
-													<c:otherwise>
-														<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileOther.description}')">${fileOther.description}</td>
-													</c:otherwise>
-												</c:choose>
-												<td class="op-td" style="text-align:center;">
-													<c:choose>
-														<c:when test="${fileOther.flag == 0}">
-															<div></div>
-														</c:when>
-														<c:otherwise>
-															<fmt:formatDate value="${fileOther.createDate}" type="date"/>
-														</c:otherwise>
-													</c:choose>
-												</td>
-										<td class="op-td" style="text-align:center;">
-												${fileOther.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
 
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileOther.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('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
 				</div>
 			</div>
 

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordCaseBaseForm.jsp

@@ -346,13 +346,18 @@
 
 
 			<!-- 案例文件模块 -->
+			<%-- showEditBtn="false" 显示编辑按钮 --%>
+			<%-- showSyncStatus="true" 显示同步按钮 --%>
 			<table:fileDisplay
+					moduleId="caseBase"
 					title="案例文件"
 					onChangeFunc="caseBaseInsertTitle"
-					fileList="${projectReportRecord.fileCaseBaseList}"
+					fileDataList="${projectReportRecord.fileCaseBaseList}"
 					projectId="${projectRecords.id}"
 					uploadMode="${projectReportRecord.uploadMode}"
-					moduleId="caseBase"/>
+					showEditBtn="true"
+					showSyncStatus="false"
+					ctx="${ctx}"/>
 
 
 			<div class="form-group layui-row page-end"></div>

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordCaseBaseSycnForm.jsp

@@ -310,192 +310,21 @@
 				</div>
 
 			</div>
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>案例文件</h2></div>
-				<div id="addFile_caseBase" style="display: none" class="upload-progress">
-					<span id="fileName_caseBase" ></span>
-					<span id="_caseBase" ></span>
-					<b><span id="baifenbi_caseBase" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_caseBase" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="caseBase_file" type="file" name="caseBase_file" multiple="multiple" style="display: none;" onChange="if(this.value)caseBaseInsertTitle(this.value);"/>
-				<span id="caseBase_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_caseBase" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-								<%-- <th>序号</th>--%>
-							<th width="20%">文件要求</th>
-							<th width="35%">文件描述/文件</th>
-							<th width="20%">文件类型</th>
-							<th width="160px">上传时间</th>
-							<th width="120px">文件大小(M)</th>
-							<th width="200px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_caseBase">
-						<c:forEach items="${projectReportRecord.fileCaseBaseList}" var = "filecaseBase" varStatus="status">
-							<tr id="file_caseBase_${filecaseBase.id}_tr" onclick="listTr(this)">
-									<%-- <td>${status.index + 1}</td>--%>
-								<td style="display:none">${filecaseBase.id}</td>
-								<td style="display:none">${filecaseBase.mustFlag}</td>
-								<c:choose>
-									<c:when test="${filecaseBase.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${filecaseBase.attachName}<input type="hidden" value="${filecaseBase.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${filecaseBase.attachName}<input type="hidden" value="${filecaseBase.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-								<td>
-										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${filecaseBase.attachName}</div></div>--%>
-									<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${filecaseBase.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${filecaseBase.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${filecaseBase.id}&projectId=${projectRecords.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_caseBase')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${filecaseBase.fileFlag}</td>
-
-							</tr>
-							<c:forEach items="${filecaseBase.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr id="addFile_caseBase_${workClientAttachment.id}_tr" class="addFile_caseBase_${filecaseBase.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${projectReportRecord.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(filecaseBase.attachName,'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}"></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.url}',1)">${workClientAttachment.attachmentName}</a></td>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(filecaseBase.attachName,'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>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td class="op-td" style="text-align:center;">
-											${workClientAttachment.fileSize}
-									</td>
-									<td class="op-td">
-										<div class="op-btn-box" >
-												<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${projectReportRecord.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;下载1</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>
-
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="caseBaseTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="caseBaseTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_caseBase')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
+
+
+			<%-- showEditBtn="false" 显示编辑按钮 --%>
+			<%-- showSyncStatus="true" 显示同步按钮 --%>
+			<table:fileDisplay
+					moduleId="caseBase"
+					title="案例文件"
+					onChangeFunc="caseBaseInsertTitle"
+					fileDataList="${projectReportRecord.fileCaseBaseList}"
+					projectId="${projectRecords.id}"
+					uploadMode="${projectReportRecord.uploadMode}"
+					showEditBtn="true"
+					showSyncStatus="false"
+					ctx="${ctx}"/>
+			
 
 
 			<div class="form-group layui-row page-end"></div>

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordCaseBaseView.jsp

@@ -363,214 +363,24 @@
 			</div>
 
 
+			<!-- 案例文件模块 -->
+			<%-- showEditBtn="false" 显示编辑按钮 --%>
+			<%-- showSyncStatus="true" 显示同步按钮 --%>
+			<table:fileDisplay
+					moduleId="caseBase"
+					title="案例文件"
+					onChangeFunc="caseBaseInsertTitle"
+					fileDataList="${projectReportRecord.fileCaseBaseList}"
+					projectId="${projectRecords.id}"
+					uploadMode="${projectReportRecord.uploadMode}"
+					showEditBtn="false"
+					showSyncStatus="true"
+					ctx="${ctx}"/>
 
 
 
 
 
-
-
-
-
-
-
-
-
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>案例文件</h2></div>
-				<div id="addFile_caseBase" style="display: none" class="upload-progress">
-					<span id="fileName_caseBase" ></span>
-					<span id="_caseBase" ></span>
-					<b><span id="baifenbi_caseBase" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_caseBase" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="caseBase_file" type="file" name="caseBase_file" multiple="multiple" style="display: none;" onChange="if(this.value)caseBaseInsertTitle(this.value);"/>
-				<span id="caseBase_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_caseBase" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-								<%-- <th>序号</th>--%>
-							<th width="20%">文件要求</th>
-							<th width="35%">文件描述/文件</th>
-							<th width="20%">文件类型</th>
-							<th width="160px">上传时间</th>
-							<th width="120px">文件大小(M)</th>
-							<th width="100px">同步状态</th>
-							<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_caseBase">
-						<c:forEach items="${projectReportRecord.fileCaseBaseList}" var = "filecaseBase" varStatus="status">
-							<tr id="file_caseBase_${filecaseBase.id}_tr" onclick="listTr(this)">
-									<%-- <td>${status.index + 1}</td>--%>
-								<td style="display:none">${filecaseBase.id}</td>
-								<td style="display:none">${filecaseBase.mustFlag}</td>
-								<c:choose>
-									<c:when test="${filecaseBase.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${filecaseBase.attachName}<input type="hidden" value="${filecaseBase.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${filecaseBase.attachName}<input type="hidden" value="${filecaseBase.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-								<td>
-										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${filecaseBase.attachName}</div></div>--%>
-									<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${filecaseBase.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${filecaseBase.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td">
-									<%--<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${filecaseBase.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_caseBase')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>--%>
-								</td>
-								<td style="display:none">${filecaseBase.fileFlag}</td>
-
-							</tr>
-							<c:forEach items="${filecaseBase.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="addFile_caseBase_${filecaseBase.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${projectReportRecord.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(filecaseBase.attachName,'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}"></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.url}',1)">${workClientAttachment.attachmentName}</a></td>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(filecaseBase.attachName,'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>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td class="op-td" style="text-align:center;">
-											${workClientAttachment.fileSize}
-									</td>
-									<td class="op-td" style="text-align:center; color:${workClientAttachment.syncDifySync == '1' ? 'green' : 'orange'};">
-											${workClientAttachment.syncDifySync == '1' ? '已同步' : '未同步'}
-									</td>
-									<td class="op-td">
-										<div class="op-btn-box" >
-												<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${projectReportRecord.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>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="caseBaseTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="caseBaseTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-                    <td style="text-align:center;">
-						'未同步'
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_caseBase')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
-
-
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

src/main/webapp/webpage/modules/projectcontentinfo/projectReportRecordModifyApply.jsp

@@ -342,434 +342,52 @@
 				</div>
 			</div>
 
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>成果文件</h2></div>
-				<div id="addFile_attachment" style="display: none" class="upload-progress">
-					<span id="fileName_attachment" ></span>
-					<span id="_attachment" ></span>
-					<b><span id="baifenbi_attachment" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-				<span id="attachment_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed  tree_table">
-						<thead>
-						<tr>
-								<%-- <th>序号</th>--%>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
-								<td style="display:none">${fileAttachment.id}</td>
-								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileOther.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-<%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>--%>
-								<td>
-									<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileAttachment.fileFlag}</td>
-							</tr>
-							<c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_attachment_${fileAttachment.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${projectReportRecord.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>
-															<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>
-										<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}"></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.url}',1)">${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>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
+			<%-- showAddButton="true" 显示添加按钮 --%>
+			<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+			<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+			<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+			<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="成果文件"
+					onChangeFunc="insertTitle"
+					fileList="${projectReportRecord.fileAttachmentList}"
+					projectId="${project.id}"
+					uploadMode="${projectReportRecord.uploadMode}"
+					moduleId="attachment"
+					showEditBtn="true"/>
+
+			<%-- showAddButton="true" 显示添加按钮 --%>
+			<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+			<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+			<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+			<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="依据性文件"
+					onChangeFunc="gistdataInsertTitle"
+					fileList="${projectReportRecord.fileGistdataList}"
+					projectId="${project.id}"
+					uploadMode="${projectReportRecord.uploadMode}"
+					moduleId="gistdata"
+					showEditBtn="true"/>
+
+			<%-- showAddButton="true" 显示添加按钮 --%>
+			<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+			<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+			<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+			<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="其他文件"
+					onChangeFunc="otherInsertTitle"
+					fileList="${projectReportRecord.fileOtherList}"
+					projectId="${project.id}"
+					uploadMode="${projectReportRecord.uploadMode}"
+					moduleId="other"
+					showEditBtn="true"/>
 
 
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
 
-									<td class="op-td">${workClientAttachment.fileSize}</td>
-<%--									<td>--%>
-<%--										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
-<%--									</td>--%>
-									<td class="op-td">
-										<div class="op-btn-box" >
-												<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${projectReportRecord.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>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
 
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性文件</h2></div>
-				<div id="addFile_gistdata" style="display: none" class="upload-progress">
-					<span id="fileName_gistdata" ></span>
-					<span id="_gistdata" ></span>
-					<b><span id="baifenbi_gistdata" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-				<span id="gistdata_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed  tree_table">
-						<thead>
-						<tr>
-								<%-- <th>序号</th>--%>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_gistdata">
-						<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr  id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
-									<%-- <td>${status.index + 1}</td>--%>
-								<td style="display:none">${fileGistdata.id}</td>
-								<td style="display:none">${fileGistdata.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-<%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>--%>
-<%--								<td></td>--%>
-								<td>
-									<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-								</td>
-										<td></td>
-										<td></td>
-										<td></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileGistdata.fileFlag}</td>
-
-							</tr>
-							<c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_gistdata_${fileGistdata.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${projectReportRecord.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>
-															<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>
-										<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}"></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.url}',1)">${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>
-<%--									<td>--%>
-<%--										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
-<%--									</td>--%>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-
-									<td class="op-td">${workClientAttachment.fileSize}</td>
-									<td class="op-td">
-										<div class="op-btn-box" >
-												<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${projectReportRecord.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>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>其他文件</h2></div>
-				<div id="addFile_other" style="display: none" class="upload-progress">
-					<span id="fileName_other" ></span>
-					<span id="_other" ></span>
-					<b><span id="baifenbi_other" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-				<span id="other_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed  tree_table">
-						<thead>
-						<tr>
-								<%-- <th>序号</th>--%>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_other">
-						<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
-									<%-- <td>${status.index + 1}</td>--%>
-								<td style="display:none">${fileOther.id}</td>
-								<td style="display:none">${fileOther.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileOther.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-<%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>--%>
-								<td>
-									<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-								</td>
-										<td></td>
-										<td></td>
-										<td></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileOther.fileFlag}</td>
-
-							</tr>
-							<c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_other_${fileOther.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${projectReportRecord.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>
-															<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>
-										<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}"></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.url}',1)">${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>
-<%--									<td>--%>
-<%--										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
-<%--									</td>--%>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-
-									<td class="op-td">${workClientAttachment.fileSize}</td>
-									<td class="op-td">
-										<div class="op-btn-box" >
-												<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${projectReportRecord.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>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${projectReportRecord.act.procInsId}"/>

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

@@ -1351,491 +1351,50 @@
 				</div>
 			</div>
 
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>成果文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--					&lt;%&ndash;<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=2&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
-				<div id="addFile_attachment" style="display: none" class="upload-progress">
-					<span id="fileName_attachment" ></span>
-					<span id="_attachment" ></span>
-					<b><span id="baifenbi_attachment" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-				<span id="attachment_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-							<th width="20%">文件要求</th>
-							<th width="35%">文件描述/文件</th>
-							<th width="20%">文件类型</th>
-							<th width="160px">上传时间</th>
-							<th width="120px">文件大小(M)</th>
-							<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
-									<%-- <td>${status.index + 1}</td>--%>
-								<td style="display:none">${fileAttachment.id}</td>
-								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-								<td>
-<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td" style="text-align: center">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectId}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileAttachment.fileFlag}</td>
-
-							</tr>
-							<c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_attachment_${fileAttachment.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${projectcontentinfo.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}"></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.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>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
 
+				<%-- showAddButton="true" 显示添加按钮 --%>
+				<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+				<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+				<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+				<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="成果文件"
+					onChangeFunc="insertTitle"
+					fileList="${projectcontentinfo.fileAttachmentList}"
+					projectId="${projectId}"
+					uploadMode="${projectcontentinfo.uploadMode}"
+					moduleId="attachment"
+					showEditBtn="true"/>
+
+				<%-- showAddButton="true" 显示添加按钮 --%>
+				<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+				<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+				<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+				<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="依据性文件"
+					onChangeFunc="gistdataInsertTitle"
+					fileList="${projectcontentinfo.fileGistdataList}"
+					projectId="${projectId}"
+					uploadMode="${projectcontentinfo.uploadMode}"
+					moduleId="gistdata"
+					showEditBtn="true"/>
+
+				<%-- showAddButton="true" 显示添加按钮 --%>
+				<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+				<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+				<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+				<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="其他文件"
+					onChangeFunc="otherInsertTitle"
+					fileList="${projectcontentinfo.fileOtherList}"
+					projectId="${projectId}"
+					uploadMode="${projectcontentinfo.uploadMode}"
+					moduleId="other"
+					showEditBtn="true"/>
 
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td>
-											${workClientAttachment.fileSize}
-									</td>
-									<td class="op-td" style="text-align: center">
-										<div class="op-btn-box" >
-											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="fileAttachmentTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="fileAttachment{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${projectId}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
-
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--					&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=2&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
-				<div id="addFile_gistdata" style="display: none" class="upload-progress">
-					<span id="fileName_gistdata" ></span>
-					<span id="_gistdata" ></span>
-					<b><span id="baifenbi_gistdata" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-				<span id="gistdata_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-							<th width="20%">文件要求</th>
-							<th width="35%">文件描述/文件</th>
-							<th width="20%">文件类型</th>
-							<th width="160px">上传时间</th>
-							<th width="120px">文件大小(M)</th>
-							<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_gistdata">
-						<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-								<tr id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
-									<%-- <td>${status.index + 1}</td>--%>
-								<td style="display:none">${fileGistdata.id}</td>
-								<td style="display:none">${fileGistdata.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-								<td>
-<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-								</td>
-								<td></td>
-										<td></td>
-										<td></td>
-								<td class="op-td" style="text-align: center">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectId}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileGistdata.fileFlag}</td>
-
-								</tr>
-							<c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_gistdata_${fileGistdata.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${projectcontentinfo.uploadMode == 2}">
-											<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: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="${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>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td>
-											${workClientAttachment.fileSize}
-									</td>
-									<td class="op-td" style="text-align: center">
-										<div class="op-btn-box" >
-											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="gistdataTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="gistdataTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${projectId}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
-
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>其他文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--					&lt;%&ndash;<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--						<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=2&projectId=${projectId}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_other',this)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
-				<div id="addFile_other" style="display: none" class="upload-progress">
-					<span id="fileName_other" ></span>
-					<span id="_other" ></span>
-					<b><span id="baifenbi_other" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-				<span id="other_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed  tree_table">
-						<thead>
-						<tr>
-							<th width="20%">文件要求</th>
-							<th width="35%">文件描述/文件</th>
-							<th width="20%">文件类型</th>
-							<th width="160px">上传时间</th>
-							<th width="120px">文件大小(M)</th>
-							<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_other">
-						<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
-									<%-- <td>${status.index + 1}</td>--%>
-								<td style="display:none">${fileOther.id}</td>
-								<td style="display:none">${fileOther.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileOther.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-								<td>
-<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-								</td>
-								<td></td>
-										<td></td>
-										<td></td>
-								<td class="op-td" style="text-align: center">
-									<div class="op-btn-box" style="text-align: center">
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectId}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileOther.fileFlag}</td>
-							</tr>
-							<c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_other_${fileOther.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${projectcontentinfo.uploadMode == 2}">
-											<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: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="${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>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td>
-										${workClientAttachment.fileSize}
-									</td>
-									<td class="op-td" style="text-align: center">
-										<div class="op-btn-box" >
-											<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="otherTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="otherTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${projectId}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
 			<div class="form-group layui-row">
 				<div class="form-group-label" style="overflow:hidden">
 					<h2 style="float: left">自检</h2>

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

@@ -406,635 +406,50 @@
 		<form:hidden path="project.id"/>
 			<input type="hidden" id="reviewFee" value="${projectcontentinfo.projectReportData.reviewFee}">
 		<sys:message content="${message}"/>
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>成果文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
-				<div id="addFile_attachment" style="display: none" class="upload-progress">
-					<span id="fileName_attachment" ></span>
-					<span id="_attachment" ></span>
-					<b><span id="baifenbi_attachment" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-				<span id="attachment_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<%--<table id="upTable" class="layui-table" lay-filter="permissionTable"></table>--%>
-					<table id="upTable" class="table table-bordered table-condensed">
-						<thead>
-						<tr>
-								<%-- <th>序号</th>--%>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
-								<c:choose>
-									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td class="tabMove" style="text-align:left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fileAttachment.flag == 0}">
-												<td class="tabMove"  style="text-align:left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<td></td>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
-								<td>
-									<c:choose>
-										<c:when test="${fileAttachment.flag == 0}">
-<%--											<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-											<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-										</c:when>
-										<c:otherwise>
-											<c:choose>
-												<c:when test="${projectcontentinfo.uploadMode == 2}">
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-															<img src="${fileAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.temporaryUrl}','90%','90%')" alt="${fileAttachment.attachName}">
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																	<a class="attention-info" href="javascript:void(0)"  onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',3)">${fileAttachment.attachName}</a>
-																		</c:when>
-																		<c:otherwise>
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',2)">${fileAttachment.attachName}</a>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-																</c:choose>
-																</c:otherwise>
-																</c:choose>
-																</c:when>
-																	<c:otherwise>
-																		<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																				<img src="${fileAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.url}','90%','90%')" alt="${fileAttachment.attachName}">
-																		</c:when>
-																		<c:otherwise>
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																				<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
-																			</c:when>
-																			<c:otherwise>
-																				<c:choose>
-																					<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																						<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',3)">${fileAttachment.attachName}</a>
-																					</c:when>
-																					<c:otherwise>
-																						<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',2)">${fileAttachment.attachName}</a>
-																					</c:otherwise>
-																				</c:choose>
-																			</c:otherwise>
-																		</c:choose>
-																</c:otherwise>
-															</c:choose>
-													</c:otherwise>
-											</c:choose>
-<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>--%>
-										</c:otherwise>
-									</c:choose>
-								</td>
 
+			<%-- showAddButton="true" 显示添加按钮 --%>
+			<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+			<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+			<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+			<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="成果文件"
+					onChangeFunc="insertTitle"
+					fileList="${projectcontentinfo.fileAttachmentList}"
+					projectId="${projectRecords.id}"
+					uploadMode="${projectcontentinfo.uploadMode}"
+					moduleId="attachment"
+					showEditBtn="true"/>
+
+			<%-- showAddButton="true" 显示添加按钮 --%>
+			<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+			<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+			<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+			<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="依据性文件"
+					onChangeFunc="gistdataInsertTitle"
+					fileList="${projectcontentinfo.fileGistdataList}"
+					projectId="${projectRecords.id}"
+					uploadMode="${projectcontentinfo.uploadMode}"
+					moduleId="gistdata"
+					showEditBtn="true"/>
+
+			<%-- showAddButton="true" 显示添加按钮 --%>
+			<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+			<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+			<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+			<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="其他文件"
+					onChangeFunc="otherInsertTitle"
+					fileList="${projectcontentinfo.fileOtherList}"
+					projectId="${projectRecords.id}"
+					uploadMode="${projectcontentinfo.uploadMode}"
+					moduleId="other"
+					showEditBtn="true"/>
 
-								<c:choose>
-									<c:when test="${fileAttachment.flag == 0}">
-										<td class="op-td"></td>
-									</c:when>
-									<c:otherwise>
-										<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileAttachment.description}')">${fileAttachment.description}</td>
-									</c:otherwise>
-								</c:choose>
 
-
-								<td class="op-td" style="text-align:center;">
-									<c:choose>
-										<c:when test="${fileAttachment.flag == 0}">
-											<div></div>
-										</c:when>
-										<c:otherwise>
-											<fmt:formatDate value="${fileAttachment.createDate}" type="date"/>
-										</c:otherwise>
-									</c:choose>
-								</td>
-
-								<td class="op-td" style="text-align:center;">
-									${fileAttachment.fileSize}
-								</td>
-								<td class="op-td" style="text-align:center;">
-									<div class="op-btn-box" >
-										<c:choose>
-											<c:when test="${fileAttachment.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-											</c:when>
-											<c:otherwise>
-												<%--附件下载删除--%>
-												<c:choose>
-													<c:when test="${projectcontentinfo.uploadMode == 2}">
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																<a href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:when>
-															<c:otherwise>
-																<a href="${fileAttachment.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('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-									</div>
-								</td>
-								<td style="display:none">${fileAttachment.id}</td>
-								<td style="display:none">${fileAttachment.mustFlag}</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="fileAttachmentTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="fileAttachment{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
-
-
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--					&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
-				<div id="addFile_gistdata" style="display: none" class="upload-progress">
-					<span id="fileName_gistdata" ></span>
-					<span id="_gistdata" ></span>
-					<b><span id="baifenbi_gistdata" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-				<span id="gistdata_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed">
-						<thead>
-						<tr>
-								<%-- <th>序号</th>--%>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_gistdata">
-						<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
-									<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td class="tabMove" style="text-align:left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="tabMove" style="text-align:left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-								<td>
-									<c:choose>
-										<c:when test="${fileGistdata.flag == 0}">
-<%--											<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-											<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${projectcontentinfo.uploadMode == 2}">
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-															</c:when>
-															<c:otherwise>
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
-																	</c:when>
-																	<c:otherwise>
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																				<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',3)">${fileGistdata.attachName}</a>
-																			</c:when>
-																			<c:otherwise>
-																				<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName}</a>
-																			</c:otherwise>
-																		</c:choose>
-																	</c:otherwise>
-																</c:choose>
-															</c:otherwise>
-														</c:choose>
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-															</c:when>
-															<c:otherwise>
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
-																	</c:when>
-																	<c:otherwise>
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																				<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',3)">${fileGistdata.attachName}</a>
-																			</c:when>
-																			<c:otherwise>
-																				<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName}</a>
-																			</c:otherwise>
-																		</c:choose>
-																	</c:otherwise>
-																</c:choose>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-<%--												<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
-										</c:otherwise>
-									</c:choose>
-								</td>
-
-								<c:choose>
-									<c:when test="${fileGistdata.flag == 0}">
-										<td class="op-td"></td>
-									</c:when>
-									<c:otherwise>
-										<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileGistdata.description}')">${fileGistdata.description}</td>
-									</c:otherwise>
-								</c:choose>
-								<td class="op-td" style="text-align:center;">
-									<c:choose>
-										<c:when test="${fileGistdata.flag == 0}">
-											<div></div>
-										</c:when>
-										<c:otherwise>
-											<fmt:formatDate value="${fileGistdata.createDate}" type="date"/>
-										</c:otherwise>
-									</c:choose>
-								</td>
-								<td class="op-td"  style="text-align:center;">
-									${fileGistdata.fileSize}
-								</td>
-								<td class="op-td"  style="text-align:center;">
-									<div class="op-btn-box" >
-										<c:choose>
-											<c:when test="${fileGistdata.flag == 0}">
-												<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-											</c:when>
-											<c:otherwise>
-												<%--附件下载删除--%>
-												<c:choose>
-													<c:when test="${projectcontentinfo.uploadMode == 2}">
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																<a href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:when>
-															<c:otherwise>
-																<a href="${fileGistdata.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('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-									</div>
-								</td>
-										<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="gistdataTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                    <td class="hide">
-                        <input id="gistdataTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                </tr>//-->
-			</script>
-
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>其他文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--					&lt;%&ndash;<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=1&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
-				<div id="addFile_other" style="display: none" class="upload-progress">
-					<span id="fileName_other" ></span>
-					<span id="_other" ></span>
-					<b><span id="baifenbi_other" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-				<span id="other_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed">
-						<thead>
-						<tr>
-								<%-- <th>序号</th>--%>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_other">
-						<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
-									<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileOther.mustFlag == 1}">
-												<td class="tabMove" style="text-align:left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-														<td class="tabMove" style="text-align:left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-<!--													<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>-->
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<c:choose>
-											<c:when test="${fileOther.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileOther.description}')">${fileOther.description}</td>
-											</c:otherwise>
-										</c:choose>
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileOther.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td" style="text-align:center;">
-											${fileOther.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-														<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileOther.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('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="otherTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="otherTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
 		<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

src/main/webapp/webpage/modules/ruralprojectrecords/projectReportRecord/projectReportRecordView.jsp

@@ -188,395 +188,41 @@
 			</div>
 		</div>
 
-		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>成果文件</h2></div>
-			<div id="addFile_attachment" style="display: none" class="upload-progress">
-				<span id="fileName_attachment" ></span>
-				<span id="_attachment" ></span>
-				<b><span id="baifenbi_attachment" ></span></b>
-				<div class="progress">
-					<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-					</div>
-				</div>
-			</div>
-			<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-			<span id="attachment_title"></span>
-			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-				<table id="upTable" class="table table-bordered table-condensed details">
-					<thead>
-					<tr>
-						<th width="55%">文件类型</th>
-						<th width="">文件名</th>
-						<th width="100px">操作</th>
-					</tr>
-					</thead>
-					<tbody id="file_attachment">
-					<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-						<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
-							<c:choose>
-								<c:when test="${fileAttachment.mustFlag == 1}">
-									<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
-								</c:when>
-								<c:otherwise>
-									<c:choose>
-										<c:when test="${fileAttachment.flag == 0}">
-											<td>${fileAttachment.attachName}</td>
-										</c:when>
-										<c:otherwise>
-											<td></td>
-										</c:otherwise>
-									</c:choose>
-								</c:otherwise>
-							</c:choose>
-							<td style="text-align:center;">
-								<c:choose>
-									<c:when test="${fileAttachment.flag == 0}">
-										${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${projectReportRecord.uploadMode == 2}">
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-														<img src="${fileAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.temporaryUrl}','90%','90%')" alt="${fileAttachment.attachName}">
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
-															</c:when>
-															<c:otherwise>
-																<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',2)">${fileAttachment.attachName} ; </a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-														<img src="${fileAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.url}','90%','90%')" alt="${fileAttachment.attachName}">
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
-															</c:when>
-															<c:otherwise>
-																<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',2)">${fileAttachment.attachName} ; </a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-<%--										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>--%>
-									</c:otherwise>
-								</c:choose>
-							</td>
-							<td class="op-td" style="text-align:center;">
-								<div class="op-btn-box" >
-									<c:choose>
-										<c:when test="${fileAttachment.flag == 0}">
 
-										</c:when>
-										<c:otherwise>
-											<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${projectReportRecord.uploadMode == 2}">
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-															<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-														</c:when>
-														<c:otherwise>
-															<a href="${fileAttachment.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('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-												</c:otherwise>
-											</c:choose>
-										</c:otherwise>
-									</c:choose>
-								</div>
-							</td>
-						</tr>
-					</c:forEach>
-					</tbody>
-				</table>
-			</div>
-		</div>
+		<!-- 成果文件模块引用 -->
+		<table:otherFileDisplay
+				title="成果文件"
+				onChangeFunc="insertTitle"
+				fileList="${projectReportRecord.fileAttachmentList}"
+				uploadMode="${projectReportRecord.uploadMode}"
+				moduleId="other"
+				projectContentInfo="${projectReportRecord}"
+				projectReportRecord="${projectReportRecord}"/>
+
+		<!-- 依据性文件模块引用 -->
+		<table:otherFileDisplay
+				title="依据性文件"
+				onChangeFunc="gistdataInsertTitle"
+				fileList="${projectReportRecord.fileGistdataList}"
+				uploadMode="${projectReportRecord.uploadMode}"
+				moduleId="other"
+				projectContentInfo="${projectReportRecord}"
+				projectReportRecord="${projectReportRecord}"/>
+
+
+		<!-- 其他文件模块引用 -->
+		<table:otherFileDisplay
+				title="其他文件"
+				onChangeFunc="otherInsertTitle"
+				fileList="${projectReportRecord.fileOtherList}"
+				uploadMode="${projectReportRecord.uploadMode}"
+				moduleId="other"
+				projectContentInfo="${projectReportRecord}"
+				projectReportRecord="${projectReportRecord}"/>
 
-		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>依据性资料</h2></div>
-			<div id="addFile_gistdata" style="display: none" class="upload-progress">
-				<span id="fileName_gistdata" ></span>
-				<span id="_gistdata" ></span>
-				<b><span id="baifenbi_gistdata" ></span></b>
-				<div class="progress">
-					<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-					</div>
-				</div>
-			</div>
-			<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-			<span id="gistdata_title"></span>
-			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-				<table id="gistdata_upTable" class="table table-bordered table-condensed details">
-					<thead>
-					<tr>
-						<th width="55%">文件类型</th>
-						<th width="">文件名</th>
-						<th width="100px">操作</th>
-					</tr>
-					</thead>
-					<tbody id="file_gistdata">
-					<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-						<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
-								<%-- <td>${status.index + 1}</td>--%>
-							<c:choose>
-								<c:when test="${fileGistdata.mustFlag == 1}">
-									<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
-								</c:when>
-								<c:otherwise>
-									<c:choose>
-										<c:when test="${fileGistdata.flag == 0}">
-											<td>${fileGistdata.attachName}</td>
-										</c:when>
-										<c:otherwise>
-											<td></td>
-										</c:otherwise>
-									</c:choose>
-								</c:otherwise>
-							</c:choose>
-							<td style="text-align:center;">
-								<c:choose>
-									<c:when test="${fileGistdata.flag == 0}">
-										${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${projectReportRecord.uploadMode == 2}">
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-														<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
-															</c:when>
-															<c:otherwise>
-																<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName} ; </a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-														<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
-															</c:when>
-															<c:otherwise>
-																<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName} ; </a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-<%--										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
-									</c:otherwise>
-								</c:choose>
-							</td>
-							<td class="op-td"  style="text-align:center;">
-								<div class="op-btn-box" >
-									<c:choose>
-										<c:when test="${fileGistdata.flag == 0}">
 
-										</c:when>
-										<c:otherwise>
-											<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${projectReportRecord.uploadMode == 2}">
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-															<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-														</c:when>
-														<c:otherwise>
-															<a href="${fileGistdata.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('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-												</c:otherwise>
-											</c:choose>
-										</c:otherwise>
-									</c:choose>
-								</div>
-							</td>
-							<td style="display:none">${fileGistdata.id}</td>
-							<td style="display:none">${fileGistdata.mustFlag}</td>
-						</tr>
-					</c:forEach>
-					</tbody>
-				</table>
-			</div>
-		</div>
 
-		<div class="form-group layui-row">
-			<div class="form-group-label"><h2>其他文件</h2></div>
-			<div id="addFile_other" style="display: none" class="upload-progress">
-				<span id="fileName_other" ></span>
-				<span id="_other" ></span>
-				<b><span id="baifenbi_other" ></span></b>
-				<div class="progress">
-					<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-					</div>
-				</div>
-			</div>
-			<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-			<span id="other_title"></span>
-			<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-				<table id="upTable_other" class="table table-bordered table-condensed details">
-					<thead>
-					<tr>
-						<th width="55%">文件类型</th>
-						<th width="">文件名</th>
-						<th width="100px">操作</th>
-					</tr>
-					</thead>
-					<tbody id="file_other">
-					<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-						<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
-								<%-- <td>${status.index + 1}</td>--%>
-							<c:choose>
-								<c:when test="${fileOther.mustFlag == 1}">
-									<td><span style="color: red">* </span>${fileOther.attachName}</td>
-								</c:when>
-								<c:otherwise>
-									<c:choose>
-										<c:when test="${fileOther.flag == 0}">
-											<td>${fileOther.attachName}</td>
-										</c:when>
-										<c:otherwise>
-											<td></td>
-										</c:otherwise>
-									</c:choose>
-								</c:otherwise>
-							</c:choose>
-							<td style="text-align:center;">
-								<c:choose>
-									<c:when test="${fileOther.flag == 0}">
-										${fileOther.attachLength}M;  ${fileOther.attachTypes}
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${projectReportRecord.uploadMode == 2}">
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-														<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
-															</c:when>
-															<c:otherwise>
-																<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName} ; </a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-														<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
-															</c:when>
-															<c:otherwise>
-																<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName} ; </a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-<%--										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>--%>
-									</c:otherwise>
-								</c:choose>
-							</td>
-							<td class="op-td" style="text-align:center;">
-								<div class="op-btn-box" >
-									<c:choose>
-										<c:when test="${fileOther.flag == 0}">
 
-										</c:when>
-										<c:otherwise>
-											<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${projectReportRecord.uploadMode == 2}">
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-															<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-														</c:when>
-														<c:otherwise>
-															<a href="${fileOther.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('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-												</c:otherwise>
-											</c:choose>
-										</c:otherwise>
-									</c:choose>
-								</div>
-							</td>
-							<td style="display:none">${fileOther.id}</td>
-							<td style="display:none">${fileOther.mustFlag}</td>
-						</tr>
-					</c:forEach>
-					</tbody>
-				</table>
-			</div>
-		</div>
 
 
 	<%--<div class="form-group layui-row">

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

@@ -233,561 +233,49 @@
 				</div>
 			</div>
 
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>成果文件</h2></div>
-				<div id="addFile_attachment" style="display: none" class="upload-progress">
-					<span id="fileName_attachment" ></span>
-					<span id="_attachment" ></span>
-					<b><span id="baifenbi_attachment" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-				<span id="attachment_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-							<th width="20%">文件要求</th>
-							<th width="35%">文件描述/文件</th>
-							<th width="20%">文件类型</th>
-							<th width="160px">上传时间</th>
-							<th width="120px">文件大小(M)</th>
-							<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${materialDefectRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
-								<td style="display:none">${fileAttachment.id}</td>
-								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-								<td>
-<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}&uploadMode=${materialDefectRecord.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileAttachment.fileFlag}</td>
-							</tr>
-							<c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_attachment_${fileAttachment.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${materialDefectRecord.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(fileOther.attachName,'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}"></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.url}',1)">${workClientAttachment.attachmentName}</a></td>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'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>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td class="op-td" style="text-align:center;">
-											${workClientAttachment.fileSize}
-									</td>
-									<td class="op-td">
-										<div class="op-btn-box" >
-												<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${materialDefectRecord.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>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="fileAttachmentTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="fileAttachment{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
-
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性文件</h2></div>
-				<div id="addFile_gistdata" style="display: none" class="upload-progress">
-					<span id="fileName_gistdata" ></span>
-					<span id="_gistdata" ></span>
-					<b><span id="baifenbi_gistdata" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-				<span id="gistdata_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-								<%-- <th>序号</th>--%>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_gistdata">
-						<c:forEach items="${materialDefectRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
-									<%-- <td>${status.index + 1}</td>--%>
-								<td style="display:none">${fileGistdata.id}</td>
-								<td style="display:none">${fileGistdata.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-								<td>
-<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}&uploadMode=${materialDefectRecord.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileGistdata.fileFlag}</td>
-
-							</tr>
-							<c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_gistdata_${fileGistdata.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${materialDefectRecord.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(fileOther.attachName,'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}"></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.url}',1)">${workClientAttachment.attachmentName}</a></td>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'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>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
+			<%-- showAddButton="true" 显示添加按钮 --%>
+			<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+			<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+			<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+			<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="成果文件"
+					onChangeFunc="insertTitle"
+					fileList="${materialDefectRecord.fileAttachmentList}"
+					projectId="${project.id}"
+					uploadMode="${materialDefectRecord.uploadMode}"
+					moduleId="attachment"
+					showEditBtn="true"/>
+
+			<%-- showAddButton="true" 显示添加按钮 --%>
+			<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+			<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+			<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+			<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="依据性文件"
+					onChangeFunc="gistdataInsertTitle"
+					fileList="${materialDefectRecord.fileGistdataList}"
+					projectId="${project.id}"
+					uploadMode="${materialDefectRecord.uploadMode}"
+					moduleId="gistdata"
+					showEditBtn="true"/>
+
+			<%-- showAddButton="true" 显示添加按钮 --%>
+			<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+			<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+			<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+			<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="其他文件"
+					onChangeFunc="otherInsertTitle"
+					fileList="${materialDefectRecord.fileOtherList}"
+					projectId="${project.id}"
+					uploadMode="${materialDefectRecord.uploadMode}"
+					moduleId="other"
+					showEditBtn="true"/>
 
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td class="op-td" style="text-align:center;">
-											${workClientAttachment.fileSize}
-									</td>
-									<td class="op-td">
-										<div class="op-btn-box" >
-												<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${materialDefectRecord.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>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="gistdataTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="gistdataTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
-
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>其他文件</h2></div>
-				<div id="addFile_other" style="display: none" class="upload-progress">
-					<span id="fileName_other" ></span>
-					<span id="_other" ></span>
-					<b><span id="baifenbi_other" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-				<span id="other_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-								<%-- <th>序号</th>--%>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_other">
-						<c:forEach items="${materialDefectRecord.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
-									<%-- <td>${status.index + 1}</td>--%>
-								<td style="display:none">${fileOther.id}</td>
-								<td style="display:none">${fileOther.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileOther.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-								<td>
-<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}&uploadMode=${materialDefectRecord.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileOther.fileFlag}</td>
-
-							</tr>
-							<c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="addFile_other_${fileOther.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${materialDefectRecord.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(fileOther.attachName,'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}"></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.url}',1)">${workClientAttachment.attachmentName}</a></td>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'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>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td class="op-td" style="text-align:center;">
-											${workClientAttachment.fileSize}
-									</td>
-									<td class="op-td">
-										<div class="op-btn-box" >
-												<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${materialDefectRecord.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>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="otherTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="otherTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
 
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
 			<div class="form-group layui-row page-end"></div>
 		</form:form>
 	</div>

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

@@ -588,676 +588,6 @@
                 </div>
             </div>
 
-            <%--<div class="form-group layui-row">
-                <div class="form-group-label"><h2>成果文件</h2></div>
-                <div id="addFile_attachment" style="display: none" class="upload-progress">
-                    <span id="fileName_attachment"></span>
-                    <span id="_attachment"></span>
-                    <b><span id="baifenbi_attachment"></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple"
-                       style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-                <span id="attachment_title"></span>
-                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="upTable" class="table table-bordered table-condensed tree_table">
-                        <thead>
-                        <tr>
-                            <th width="20%">文件要求</th>
-                            <th width="35%">文件描述/文件</th>
-                            <th width="20%">文件类型</th>
-                            <th width="160px">上传时间</th>
-                            <th width="120px">文件大小(M)</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_attachment">
-                        <c:forEach items="${materialDefectRecord.fileAttachmentList}" var="fileAttachment"
-                                   varStatus="status">
-                            <tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
-                                <td style="display:none">${fileAttachment.id}</td>
-                                <td style="display:none">${fileAttachment.mustFlag}</td>
-                                <c:choose>
-                                    <c:when test="${fileAttachment.mustFlag == 1}">
-                                        <td class="tabMove" style="text-align: left;"><span class='default_open'
-                                                                                            style="padding-right: 15px; "></span><span
-                                                style="color: red">* </span>${fileAttachment.attachName}<input
-                                                type="hidden" value="${fileAttachment.attachName}"/></td>
-                                    </c:when>
-                                    <c:otherwise>
-                                        <td class="tabMove" style="text-align: left;"><span class='default_open'
-                                                                                            style="padding-right: 15px; "></span>${fileAttachment.attachName}<input
-                                                type="hidden" value="${fileAttachment.attachName}"/></td>
-                                    </c:otherwise>
-                                </c:choose>
-                                <td>
-                                        &lt;%&ndash;									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>&ndash;%&gt;
-                                    <div style="white-space:normal; word-break:break-all;overflow:hidden;"><span
-                                            style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;
-                                    </div>
-                                    <div style="white-space:normal; word-break:break-all;overflow:hidden;"> ${fileAttachment.attachTypes}</div>
-                                </td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box">
-                                        <a href="javascript:void(0)"
-                                           onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}&uploadMode=${materialDefectRecord.uploadMode}','70%','80%',false,'inputForm','upTable')"
-                                           class="op-btn op-btn-edit"><i class="fa fa-edit"></i> 编辑</a>
-                                    </div>
-                                </td>
-                                <td style="display:none">${fileAttachment.fileFlag}</td>
-                            </tr>
-                            <c:forEach items="${fileAttachment.workAttachments}" var="workClientAttachment"
-                                       varStatus="status">
-                                <tr class="file_attachment_${fileAttachment.id}_tr">
-                                    <td></td>
-                                    <c:choose>
-                                        <c:when test="${materialDefectRecord.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(fileOther.attachName,'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}"></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.url}',1)">${workClientAttachment.attachmentName}</a>
-                                                            </td>
-                                                        </c:when>
-                                                        <c:otherwise>
-                                                            <c:choose>
-                                                                <c:when test="${fn:containsIgnoreCase(fileOther.attachName,'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>
-                                    <td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;"
-                                        onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-                                    <td class="op-td" style="text-align:center;">
-                                        <fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-                                    </td>
-                                    <td class="op-td" style="text-align:center;">
-                                            ${workClientAttachment.fileSize}
-                                    </td>
-                                    <td class="op-td">
-                                        <div class="op-btn-box">
-                                                &lt;%&ndash;附件下载删除&ndash;%&gt;
-                                            <c:choose>
-                                                <c:when test="${materialDefectRecord.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>
-                                        </div>
-                                    </td>
-                                </tr>
-                            </c:forEach>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>--%>
-            <%--<script type="text/template" id="fileAttachmentTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="fileAttachment{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-            </script>
-
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>依据性文件</h2></div>
-                <div id="addFile_gistdata" style="display: none" class="upload-progress">
-                    <span id="fileName_gistdata"></span>
-                    <span id="_gistdata"></span>
-                    <b><span id="baifenbi_gistdata"></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;"
-                       onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-                <span id="gistdata_title"></span>
-                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
-                        <thead>
-                        <tr>
-                                &lt;%&ndash; <th>序号</th>&ndash;%&gt;
-                            <th width="20%">文件要求</th>
-                            <th width="35%">文件描述/文件</th>
-                            <th width="20%">文件类型</th>
-                            <th width="160px">上传时间</th>
-                            <th width="120px">文件大小(M)</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_gistdata">
-                        <c:forEach items="${materialDefectRecord.fileGistdataList}" var="fileGistdata"
-                                   varStatus="status">
-                            <tr id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
-                                    &lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;
-                                <td style="display:none">${fileGistdata.id}</td>
-                                <td style="display:none">${fileGistdata.mustFlag}</td>
-                                <c:choose>
-                                    <c:when test="${fileGistdata.mustFlag == 1}">
-                                        <td class="tabMove" style="text-align: left;"><span class='default_open'
-                                                                                            style="padding-right: 15px; "></span><span
-                                                style="color: red">* </span>${fileGistdata.attachName}<input
-                                                type="hidden" value="${fileGistdata.attachName}"/></td>
-                                    </c:when>
-                                    <c:otherwise>
-                                        <td class="tabMove" style="text-align: left;"><span class='default_open'
-                                                                                            style="padding-right: 15px; "></span>${fileGistdata.attachName}<input
-                                                type="hidden" value="${fileGistdata.attachName}"/></td>
-                                    </c:otherwise>
-                                </c:choose>
-                                <td>
-                                        &lt;%&ndash;									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>&ndash;%&gt;
-                                    <div style="white-space:normal; word-break:break-all;overflow:hidden;"><span
-                                            style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;
-                                    </div>
-                                    <div style="white-space:normal; word-break:break-all;overflow:hidden;"> ${fileGistdata.attachTypes}</div>
-                                </td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box">
-                                        <a href="javascript:void(0)"
-                                           onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}&uploadMode=${materialDefectRecord.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')"
-                                           class="op-btn op-btn-edit"><i class="fa fa-edit"></i> 编辑</a>
-                                    </div>
-                                </td>
-                                <td style="display:none">${fileGistdata.fileFlag}</td>
-
-                            </tr>
-                            <c:forEach items="${fileGistdata.workAttachments}" var="workClientAttachment"
-                                       varStatus="status">
-                                <tr class="file_gistdata_${fileGistdata.id}_tr">
-                                    <td></td>
-                                    <c:choose>
-                                        <c:when test="${materialDefectRecord.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(fileOther.attachName,'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}"></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.url}',1)">${workClientAttachment.attachmentName}</a>
-                                                            </td>
-                                                        </c:when>
-                                                        <c:otherwise>
-                                                            <c:choose>
-                                                                <c:when test="${fn:containsIgnoreCase(fileOther.attachName,'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>
-                                    <td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;"
-                                        onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-                                    <td class="op-td" style="text-align:center;">
-                                        <fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-                                    </td>
-                                    <td class="op-td" style="text-align:center;">
-                                            ${workClientAttachment.fileSize}
-                                    </td>
-                                    <td class="op-td">
-                                        <div class="op-btn-box">
-                                                &lt;%&ndash;附件下载删除&ndash;%&gt;
-                                            <c:choose>
-                                                <c:when test="${materialDefectRecord.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>
-                                        </div>
-                                    </td>
-                                </tr>
-                            </c:forEach>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <script type="text/template" id="gistdataTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="gistdataTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-            </script>
-
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>其他文件</h2></div>
-                <div id="addFile_other" style="display: none" class="upload-progress">
-                    <span id="fileName_other"></span>
-                    <span id="_other"></span>
-                    <b><span id="baifenbi_other"></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;"
-                       onChange="if(this.value)otherInsertTitle(this.value);"/>
-                <span id="other_title"></span>
-                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="upTable_other" class="table table-bordered table-condensed tree_table">
-                        <thead>
-                        <tr>
-                                &lt;%&ndash; <th>序号</th>&ndash;%&gt;
-                            <th width="20%">文件要求</th>
-                            <th width="35%">文件描述/文件</th>
-                            <th width="20%">文件类型</th>
-                            <th width="160px">上传时间</th>
-                            <th width="120px">文件大小(M)</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_other">
-                        <c:forEach items="${materialDefectRecord.fileOtherList}" var="fileOther" varStatus="status">
-                            <tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
-                                    &lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;
-                                <td style="display:none">${fileOther.id}</td>
-                                <td style="display:none">${fileOther.mustFlag}</td>
-                                <c:choose>
-                                    <c:when test="${fileOther.mustFlag == 1}">
-                                        <td class="tabMove" style="text-align: left;"><span class='default_open '
-                                                                                            style="padding-right: 15px; "></span><span
-                                                style="color: red">* </span>${fileOther.attachName}<input type="hidden"
-                                                                                                          value="${fileOther.attachName}"/>
-                                        </td>
-                                    </c:when>
-                                    <c:otherwise>
-                                        <td class="tabMove" style="text-align: left;"><span class='default_open'
-                                                                                            style="padding-right: 15px; "></span>${fileOther.attachName}<input
-                                                type="hidden" value="${fileOther.attachName}"/></td>
-                                    </c:otherwise>
-                                </c:choose>
-                                <td>
-                                        &lt;%&ndash;									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>&ndash;%&gt;
-                                    <div style="white-space:normal; word-break:break-all;overflow:hidden;"><span
-                                            style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;
-                                    </div>
-                                    <div style="white-space:normal; word-break:break-all;overflow:hidden;"> ${fileOther.attachTypes}</div>
-                                </td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                                <td class="op-td">
-                                    <div class="op-btn-box">
-                                        <a href="javascript:void(0)"
-                                           onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}&uploadMode=${materialDefectRecord.uploadMode}','70%','80%',false,'inputForm','upTable_other')"
-                                           class="op-btn op-btn-edit"><i class="fa fa-edit"></i> 编辑</a>
-                                    </div>
-                                </td>
-                                <td style="display:none">${fileOther.fileFlag}</td>
-
-                            </tr>
-                            <c:forEach items="${fileOther.workAttachments}" var="workClientAttachment"
-                                       varStatus="status">
-                                <tr class="addFile_other_${fileOther.id}_tr">
-                                    <td></td>
-                                    <c:choose>
-                                        <c:when test="${materialDefectRecord.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(fileOther.attachName,'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}"></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.url}',1)">${workClientAttachment.attachmentName}</a>
-                                                            </td>
-                                                        </c:when>
-                                                        <c:otherwise>
-                                                            <c:choose>
-                                                                <c:when test="${fn:containsIgnoreCase(fileOther.attachName,'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>
-                                    <td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;"
-                                        onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-                                    <td class="op-td" style="text-align:center;">
-                                        <fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-                                    </td>
-                                    <td class="op-td" style="text-align:center;">
-                                            ${workClientAttachment.fileSize}
-                                    </td>
-                                    <td class="op-td">
-                                        <div class="op-btn-box">
-                                                &lt;%&ndash;附件下载删除&ndash;%&gt;
-                                            <c:choose>
-                                                <c:when test="${materialDefectRecord.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>
-                                        </div>
-                                    </td>
-                                </tr>
-                            </c:forEach>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <script type="text/template" id="otherTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="otherTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-            </script>
-            <div class="form-group layui-row page-end"></div>--%>
         </form:form>
     </div>
 </div>

src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModify.jsp

@@ -687,572 +687,50 @@
 					</div>
 				</div>
 			</div>
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>成果文件</h2></div>
-				<div id="addFile_attachment" style="display: none" class="upload-progress">
-					<span id="fileName_attachment" ></span>
-					<span id="_attachment" ></span>
-					<b><span id="baifenbi_attachment" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-				<span id="attachment_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-								<%-- <th>序号</th>--%>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr  id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
-								<td style="display:none">${fileAttachment.id}</td>
-								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-								<td>
-<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileAttachment.fileFlag}</td>
-							</tr>
-							<c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_attachment_${fileAttachment.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${projectReportRecord.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(fileOther.attachName,'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}"></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.url}',1)">${workClientAttachment.attachmentName}</a></td>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'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>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td class="op-td" style="text-align:center;">
-											${workClientAttachment.fileSize}
-									</td>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td">
-										<div class="op-btn-box" >
-												<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${projectReportRecord.uploadMode == 2}">
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" 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>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="fileAttachmentTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="fileAttachment{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
-
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性文件</h2></div>
-				<div id="addFile_gistdata" style="display: none" class="upload-progress">
-					<span id="fileName_gistdata" ></span>
-					<span id="_gistdata" ></span>
-					<b><span id="baifenbi_gistdata" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-				<span id="gistdata_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-								<%-- <th>序号</th>--%>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_gistdata">
-						<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
-									<%-- <td>${status.index + 1}</td>--%>
-								<td style="display:none">${fileGistdata.id}</td>
-								<td style="display:none">${fileGistdata.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-								<td>
-<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileGistdata.fileFlag}</td>
-							</tr>
-
-							<c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_gistdata_${fileGistdata.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${projectReportRecord.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(fileOther.attachName,'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}"></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.url}',1)">${workClientAttachment.attachmentName}</a></td>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'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>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
 
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td class="op-td" style="text-align:center;">
-											${workClientAttachment.fileSize}
-									</td>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td">
-										<div class="op-btn-box" >
-
-												<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${projectReportRecord.uploadMode == 2}">
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" 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>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="gistdataTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="gistdataTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
-
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>其他文件</h2></div>
-				<div id="addFile_other" style="display: none" class="upload-progress">
-					<span id="fileName_other" ></span>
-					<span id="_other" ></span>
-					<b><span id="baifenbi_other" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-				<span id="other_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-								<%-- <th>序号</th>--%>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_other">
-						<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
-									<%-- <td>${status.index + 1}</td>--%>
-								<td style="display:none">${fileOther.id}</td>
-								<td style="display:none">${fileOther.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileOther.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-								<td>
-<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}&uploadMode=${projectReportRecord.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileOther.fileFlag}</td>
-
-							</tr>
-							<c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="addFile_other_${fileOther.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${projectReportRecord.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(fileOther.attachName,'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}"></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.url}',1)">${workClientAttachment.attachmentName}</a></td>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'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>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td class="op-td" style="text-align:center;">
-											${workClientAttachment.fileSize}
-									</td>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td">
-										<div class="op-btn-box" >
-												<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${projectReportRecord.uploadMode == 2}">
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" 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>
 
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="otherTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="otherTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
+			<%-- showAddButton="true" 显示添加按钮 --%>
+			<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+			<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+			<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+			<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="成果文件"
+					onChangeFunc="insertTitle"
+					fileList="${projectReportRecord.fileAttachmentList}"
+					projectId="${project.id}"
+					uploadMode="${projectReportRecord.uploadMode}"
+					moduleId="attachment"
+					showEditBtn="true"/>
+
+			<%-- showAddButton="true" 显示添加按钮 --%>
+			<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+			<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+			<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+			<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="依据性文件"
+					onChangeFunc="gistdataInsertTitle"
+					fileList="${projectReportRecord.fileGistdataList}"
+					projectId="${project.id}"
+					uploadMode="${projectReportRecord.uploadMode}"
+					moduleId="gistdata"
+					showEditBtn="true"/>
+
+			<%-- showAddButton="true" 显示添加按钮 --%>
+			<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+			<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+			<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+			<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="其他文件"
+					onChangeFunc="otherInsertTitle"
+					fileList="${projectReportRecord.fileOtherList}"
+					projectId="${project.id}"
+					uploadMode="${projectReportRecord.uploadMode}"
+					moduleId="other"
+					showEditBtn="true"/>
 
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${project.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
 
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批流程</h2></div>

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

@@ -542,499 +542,7 @@
 				</div>
 			</div>
 
-			<%--<div class="form-group layui-row">
-				<div class="form-group-label"><h2>成果文件</h2></div>
-				<div id="addFile_attachment" style="display: none" class="upload-progress">
-					<span id="fileName_attachment" ></span>
-					<span id="_attachment" ></span>
-					<b><span id="baifenbi_attachment" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-				<span id="attachment_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-								&lt;%&ndash; <th>序号</th>&ndash;%&gt;
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${materialDefectRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
-								<td style="display:none">${fileAttachment.id}</td>
-								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-&lt;%&ndash;								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>&ndash;%&gt;
-								<td>
-&lt;%&ndash;									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>&ndash;%&gt;
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}&uploadMode=${materialDefectRecord.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileAttachment.fileFlag}</td>
-							</tr>
-							<c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_attachment_${fileAttachment.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${materialDefectRecord.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}"></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.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>
-&lt;%&ndash;									<td>&ndash;%&gt;
-&lt;%&ndash;										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>&ndash;%&gt;
-&lt;%&ndash;									</td>&ndash;%&gt;
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
 
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td class="op-td" style="text-align:center;">
-											${workClientAttachment.fileSize}
-									</td>
-									<td class="op-td">
-										<div class="op-btn-box" >
-												&lt;%&ndash;附件下载删除&ndash;%&gt;
-											<c:choose>
-												<c:when test="${materialDefectRecord.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>
-
-												&lt;%&ndash;											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>&ndash;%&gt;
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性文件</h2></div>
-				<div id="addFile_gistdata" style="display: none" class="upload-progress">
-					<span id="fileName_gistdata" ></span>
-					<span id="_gistdata" ></span>
-					<b><span id="baifenbi_gistdata" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-				<span id="gistdata_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-								&lt;%&ndash; <th>序号</th>&ndash;%&gt;
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_gistdata">
-						<c:forEach items="${materialDefectRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr  id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
-									&lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;
-								<td style="display:none">${fileGistdata.id}</td>
-								<td style="display:none">${fileGistdata.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-&lt;%&ndash;								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>&ndash;%&gt;
-&lt;%&ndash;								<td></td>&ndash;%&gt;
-								<td>
-&lt;%&ndash;									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>&ndash;%&gt;
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${project.id}&uploadMode=${materialDefectRecord.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileGistdata.fileFlag}</td>
-
-							</tr>
-							<c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_gistdata_${fileGistdata.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${materialDefectRecord.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}"></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.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>
-&lt;%&ndash;									<td>&ndash;%&gt;
-&lt;%&ndash;										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>&ndash;%&gt;
-&lt;%&ndash;									</td>&ndash;%&gt;
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td class="op-td" style="text-align:center;">
-											${workClientAttachment.fileSize}
-									</td>
-									<td class="op-td">
-										<div class="op-btn-box" >
-												&lt;%&ndash;附件下载删除&ndash;%&gt;
-											<c:choose>
-												<c:when test="${materialDefectRecord.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>
-
-												&lt;%&ndash;											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>&ndash;%&gt;
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>其他文件</h2></div>
-				<div id="addFile_other" style="display: none" class="upload-progress">
-					<span id="fileName_other" ></span>
-					<span id="_other" ></span>
-					<b><span id="baifenbi_other" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-				<span id="other_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-								&lt;%&ndash; <th>序号</th>&ndash;%&gt;
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_other">
-						<c:forEach items="${materialDefectRecord.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
-									&lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;
-								<td style="display:none">${fileOther.id}</td>
-								<td style="display:none">${fileOther.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileOther.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open ' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-&lt;%&ndash;								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>&ndash;%&gt;
-								<td>
-&lt;%&ndash;									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>&ndash;%&gt;
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${project.id}&uploadMode=${materialDefectRecord.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileOther.fileFlag}</td>
-
-							</tr>
-							<c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_other_${fileOther.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${materialDefectRecord.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}"></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.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>
-&lt;%&ndash;									<td>&ndash;%&gt;
-&lt;%&ndash;										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>&ndash;%&gt;
-&lt;%&ndash;									</td>&ndash;%&gt;
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td class="op-td" style="text-align:center;">
-											${workClientAttachment.fileSize}
-									</td>
-									<td class="op-td">
-										<div class="op-btn-box" >
-												&lt;%&ndash;附件下载删除&ndash;%&gt;
-											<c:choose>
-												<c:when test="${materialDefectRecord.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>
-
-												&lt;%&ndash;											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>&ndash;%&gt;
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>--%>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >

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

@@ -640,542 +640,6 @@
 								</div>
 							</div>
 
-							<%--<div class="form-group layui-row">
-								<div class="form-group-label"><h2>成果文件</h2></div>
-								<div class="layui-item nav-btns">
-								</div>
-								<div id="addFile_attachment" style="display: none" class="upload-progress">
-									<span id="fileName_attachment" ></span>
-									<span id="_attachment" ></span>
-									<b><span id="baifenbi_attachment" ></span></b>
-									<div class="progress">
-										<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-										</div>
-									</div>
-								</div>
-								<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-								<span id="attachment_title"></span>
-								<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-									<table id="upTable" class="table table-bordered table-condensed">
-										<thead>
-										<tr>
-											<th width="20%">文件要求</th>
-											<th width="35%">文件描述/文件</th>
-											<th width="20%">文件类型</th>
-											<th width="160px">上传时间</th>
-											<th width="120px">文件大小(M)</th>
-											<th width="100px">操作</th>
-										</tr>
-										</thead>
-										<tbody id="file_attachment">
-										<c:forEach items="${materialDefectRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-											<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
-												<c:choose>
-													<c:when test="${fileAttachment.mustFlag == 1}">
-														<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fileAttachment.flag == 0}">
-																<td class="tabMove" style="text-align: left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-															</c:when>
-															<c:otherwise>
-																<td></td>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-												<td>
-													<c:choose>
-														<c:when test="${fileAttachment.flag == 0}">
-&lt;%&ndash;															<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>&ndash;%&gt;
-															<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${projectcontentinfo.uploadMode == 2}">
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																			<img src="${fileAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.temporaryUrl}','90%','90%')" alt="${fileAttachment.attachName}">
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																					<a class="attention-info" href="javascript:void(0)"  onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
-																				</c:when>
-																				<c:otherwise>
-																					<c:choose>
-																						<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',3)">${fileAttachment.attachName}</a>
-																						</c:when>
-																						<c:otherwise>
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',2)">${fileAttachment.attachName}</a>
-																						</c:otherwise>
-																					</c:choose>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																			<img src="${fileAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.url}','90%','90%')" alt="${fileAttachment.attachName}">
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
-																				</c:when>
-																				<c:otherwise>
-																					<c:choose>
-																						<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',3)">${fileAttachment.attachName}</a>
-																						</c:when>
-																						<c:otherwise>
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',2)">${fileAttachment.attachName}</a>
-																						</c:otherwise>
-																					</c:choose>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-															&lt;%&ndash;											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>&ndash;%&gt;
-														</c:otherwise>
-													</c:choose>
-												</td>
-
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
-														<td class="op-td"></td>
-													</c:when>
-													<c:otherwise>
-														<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileAttachment.description}')">${fileAttachment.description}</td>
-													</c:otherwise>
-												</c:choose>
-
-
-												<td class="op-td" style="text-align:center;">
-													<c:choose>
-														<c:when test="${fileAttachment.flag == 0}">
-															<div></div>
-														</c:when>
-														<c:otherwise>
-															<fmt:formatDate value="${fileAttachment.createDate}" type="date"/>
-														</c:otherwise>
-													</c:choose>
-												</td>
-												<td class="op-td" style="text-align:center;">
-														${fileAttachment.fileSize}
-												</td>
-												<td class="op-td" style="text-align:center;">
-													<div class="op-btn-box" >
-														<c:choose>
-															<c:when test="${fileAttachment.flag == 0}">
-
-															</c:when>
-															<c:otherwise>
-
-																&lt;%&ndash;附件下载删除&ndash;%&gt;
-																<c:choose>
-																	<c:when test="${materialDefectRecord.uploadMode == 2}">
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																				<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																			</c:when>
-																			<c:otherwise>
-																				<a href="${fileAttachment.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('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:otherwise>
-																</c:choose>
-															</c:otherwise>
-														</c:choose>
-													</div>
-												</td>
-											</tr>
-										</c:forEach>
-										</tbody>
-									</table>
-								</div>
-							</div>
-							<div class="form-group layui-row">
-								<div class="form-group-label"><h2>依据性文件</h2></div>
-								<div class="layui-item nav-btns">
-										&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;
-								</div>
-								<div id="addFile_gistdata" style="display: none" class="upload-progress">
-									<span id="fileName_gistdata" ></span>
-									<span id="_gistdata" ></span>
-									<b><span id="baifenbi_gistdata" ></span></b>
-									<div class="progress">
-										<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-										</div>
-									</div>
-								</div>
-								<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-								<span id="gistdata_title"></span>
-								<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-									<table id="gistdata_upTable" class="table table-bordered table-condensed">
-										<thead>
-										<tr>
-											<th width="20%">文件要求</th>
-											<th width="35%">文件描述/文件</th>
-											<th width="20%">文件类型</th>
-											<th width="160px">上传时间</th>
-											<th width="120px">文件大小(M)</th>
-											<th width="100px">操作</th>
-										</tr>
-										</thead>
-										<tbody id="file_gistdata">
-										<c:forEach items="${materialDefectRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-											<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
-													&lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;
-												<c:choose>
-													<c:when test="${fileGistdata.mustFlag == 1}">
-														<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fileGistdata.flag == 0}">
-																<td class="tabMove" style="text-align: left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-															</c:when>
-															<c:otherwise>
-																<td></td>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-														<td>
-															<c:choose>
-																<c:when test="${fileGistdata.flag == 0}">
-&lt;%&ndash;																	<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>&ndash;%&gt;
-																	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${projectcontentinfo.uploadMode == 2}">
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																					<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-																				</c:when>
-																				<c:otherwise>
-																					<c:choose>
-																						<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
-																						</c:when>
-																						<c:otherwise>
-																							<c:choose>
-																								<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',3)">${fileGistdata.attachName}</a>
-																								</c:when>
-																								<c:otherwise>
-																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName}</a>
-																								</c:otherwise>
-																							</c:choose>
-																						</c:otherwise>
-																					</c:choose>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																					<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-																				</c:when>
-																				<c:otherwise>
-																					<c:choose>
-																						<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
-																						</c:when>
-																						<c:otherwise>
-																							<c:choose>
-																								<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',3)">${fileGistdata.attachName}</a>
-																								</c:when>
-																								<c:otherwise>
-																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName}</a>
-																								</c:otherwise>
-																							</c:choose>
-																						</c:otherwise>
-																					</c:choose>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																	&lt;%&ndash;												<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>&ndash;%&gt;
-																</c:otherwise>
-															</c:choose>
-														</td>
-
-														<c:choose>
-															<c:when test="${fileGistdata.flag == 0}">
-																<td class="op-td"></td>
-															</c:when>
-															<c:otherwise>
-																<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileGistdata.description}')">${fileGistdata.description}</td>
-															</c:otherwise>
-														</c:choose>
-														<td class="op-td" style="text-align:center;">
-															<c:choose>
-																<c:when test="${fileGistdata.flag == 0}">
-																	<div></div>
-																</c:when>
-																<c:otherwise>
-																	<fmt:formatDate value="${fileGistdata.createDate}" type="date"/>
-																</c:otherwise>
-															</c:choose>
-														</td>
-														<td class="op-td"  style="text-align:center;">
-																${fileGistdata.fileSize}
-														</td>
-												<td class="op-td"  style="text-align:center;">
-													<div class="op-btn-box" >
-														<c:choose>
-															<c:when test="${fileGistdata.flag == 0}">
-
-															</c:when>
-															<c:otherwise>
-
-																&lt;%&ndash;附件下载删除&ndash;%&gt;
-																<c:choose>
-																	<c:when test="${materialDefectRecord.uploadMode == 2}">
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																				<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																			</c:when>
-																			<c:otherwise>
-																				<a href="${fileGistdata.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('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:otherwise>
-																</c:choose>
-															</c:otherwise>
-														</c:choose>
-													</div>
-												</td>
-												<td style="display:none">${fileGistdata.id}</td>
-												<td style="display:none">${fileGistdata.mustFlag}</td>
-											</tr>
-										</c:forEach>
-										</tbody>
-									</table>
-								</div>
-							</div>
-							<div class="form-group layui-row">
-								<div class="form-group-label"><h2>其他文件</h2></div>
-								<div class="layui-item nav-btns">
-										&lt;%&ndash;<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;
-								</div>
-								<div id="addFile_other" style="display: none" class="upload-progress">
-									<span id="fileName_other" ></span>
-									<span id="_other" ></span>
-									<b><span id="baifenbi_other" ></span></b>
-									<div class="progress">
-										<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-										</div>
-									</div>
-								</div>
-								<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-								<span id="other_title"></span>
-								<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-									<table id="upTable_other" class="table table-bordered table-condensed">
-										<thead>
-										<tr>
-											<th width="20%">文件要求</th>
-											<th width="35%">文件描述/文件</th>
-											<th width="20%">文件类型</th>
-											<th width="160px">上传时间</th>
-											<th width="120px">文件大小(M)</th>
-											<th width="100px">操作</th>
-										</tr>
-										</thead>
-										<tbody id="file_other">
-										<c:forEach items="${materialDefectRecord.fileOtherList}" var = "fileOther" varStatus="status">
-											<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
-													&lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;
-												<c:choose>
-													<c:when test="${fileOther.mustFlag == 1}">
-														<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<c:choose>
-															<c:when test="${fileOther.flag == 0}">
-																<td class="tabMove" style="text-align: left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-															</c:when>
-															<c:otherwise>
-																<td></td>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-														<td>
-															<c:choose>
-																<c:when test="${fileOther.flag == 0}">
-&lt;%&ndash;																	<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>&ndash;%&gt;
-																	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${projectcontentinfo.uploadMode == 2}">
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																					<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-																				</c:when>
-																				<c:otherwise>
-																					<c:choose>
-																						<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
-																						</c:when>
-																						<c:otherwise>
-																							<c:choose>
-																								<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',3)">${fileOther.attachName}</a>
-																								</c:when>
-																								<c:otherwise>
-																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName}</a>
-																								</c:otherwise>
-																							</c:choose>
-																						</c:otherwise>
-																					</c:choose>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																					<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-																				</c:when>
-																				<c:otherwise>
-																					<c:choose>
-																						<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																							<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
-																						</c:when>
-																						<c:otherwise>
-																							<c:choose>
-																								<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',3)">${fileOther.attachName}</a>
-																								</c:when>
-																								<c:otherwise>
-																									<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName}</a>
-																								</c:otherwise>
-																							</c:choose>
-																						</c:otherwise>
-																					</c:choose>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																	<!--													<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>-->
-																</c:otherwise>
-															</c:choose>
-														</td>
-														<c:choose>
-															<c:when test="${fileOther.flag == 0}">
-																<td class="op-td"></td>
-															</c:when>
-															<c:otherwise>
-																<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileOther.description}')">${fileOther.description}</td>
-															</c:otherwise>
-														</c:choose>
-														<td class="op-td" style="text-align:center;">
-															<c:choose>
-																<c:when test="${fileOther.flag == 0}">
-																	<div></div>
-																</c:when>
-																<c:otherwise>
-																	<fmt:formatDate value="${fileOther.createDate}" type="date"/>
-																</c:otherwise>
-															</c:choose>
-														</td>
-														<td class="op-td" style="text-align:center;">
-																${fileOther.fileSize}
-														</td>
-												<td class="op-td" style="text-align:center;">
-													<div class="op-btn-box" >
-														<c:choose>
-															<c:when test="${fileOther.flag == 0}">
-
-															</c:when>
-															<c:otherwise>
-																&lt;%&ndash;附件下载删除&ndash;%&gt;
-																<c:choose>
-																	<c:when test="${materialDefectRecord.uploadMode == 2}">
-																		<c:choose>
-																			<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																				<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																			</c:when>
-																			<c:otherwise>
-																				<a href="${fileOther.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('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:otherwise>
-																</c:choose>
-															</c:otherwise>
-														</c:choose>
-													</div>
-												</td>
-												<td style="display:none">${fileOther.id}</td>
-												<td style="display:none">${fileOther.mustFlag}</td>
-											</tr>
-										</c:forEach>
-										</tbody>
-									</table>
-								</div>
-							</div>--%>
 
 
 

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

@@ -1374,545 +1374,41 @@
 					</c:if>
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>成果文件</h2></div>
-						<div class="layui-item nav-btns">
-						</div>
-						<div id="addFile_attachment" style="display: none" class="upload-progress">
-							<span id="fileName_attachment" ></span>
-							<span id="_attachment" ></span>
-							<b><span id="baifenbi_attachment" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-						<span id="attachment_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_attachment">
-								<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-									<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
-										<c:choose>
-											<c:when test="${fileAttachment.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<%--															<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.temporaryUrl}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)"  onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.url}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
 
 
-										<c:choose>
-											<c:when test="${fileAttachment.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileAttachment.description}')">${fileAttachment.description}</td>
-											</c:otherwise>
-										</c:choose>
 
+					<!-- 成果文件模块引用 -->
+					<table:otherFileDisplay
+							title="成果文件"
+							onChangeFunc="insertTitle"
+							fileList="${projectReportRecord.fileAttachmentList}"
+							uploadMode="${projectReportRecord.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectReportRecord}"
+							projectReportRecord="${projectReportRecord}"/>
 
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileAttachment.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td" style="text-align:center;">
-												${fileAttachment.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
+					<!-- 依据性文件模块引用 -->
+					<table:otherFileDisplay
+							title="依据性文件"
+							onChangeFunc="gistdataInsertTitle"
+							fileList="${projectReportRecord.fileGistdataList}"
+							uploadMode="${projectReportRecord.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectReportRecord}"
+							projectReportRecord="${projectReportRecord}"/>
 
-													</c:when>
-													<c:otherwise>
 
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																		<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileAttachment.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('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>依据性文件</h2></div>
-						<div class="layui-item nav-btns">
-								<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						</div>
-						<div id="addFile_gistdata" style="display: none" class="upload-progress">
-							<span id="fileName_gistdata" ></span>
-							<span id="_gistdata" ></span>
-							<b><span id="baifenbi_gistdata" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-						<span id="gistdata_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="gistdata_upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_gistdata">
-								<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-									<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<%--																	<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--												<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
+					<!-- 其他文件模块引用 -->
+					<table:otherFileDisplay
+							title="其他文件"
+							onChangeFunc="otherInsertTitle"
+							fileList="${projectReportRecord.fileOtherList}"
+							uploadMode="${projectReportRecord.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectReportRecord}"
+							projectReportRecord="${projectReportRecord}"/>
 
 
-										<c:choose>
-											<c:when test="${fileGistdata.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileGistdata.description}')">${fileGistdata.description}</td>
-											</c:otherwise>
-										</c:choose>
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileGistdata.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td"  style="text-align:center;">
-												${fileGistdata.fileSize}
-										</td>
-										<td class="op-td"  style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-
-													</c:when>
-													<c:otherwise>
-
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileGistdata.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('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>其他文件</h2></div>
-						<div class="layui-item nav-btns">
-								<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						</div>
-						<div id="addFile_other" style="display: none" class="upload-progress">
-							<span id="fileName_other" ></span>
-							<span id="_other" ></span>
-							<b><span id="baifenbi_other" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-						<span id="other_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable_other" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_other">
-								<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-									<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileOther.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<%--																	<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<!--													<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>-->
-												</c:otherwise>
-											</c:choose>
-										</td>
-
-										<c:choose>
-											<c:when test="${fileOther.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileOther.description}')">${fileOther.description}</td>
-											</c:otherwise>
-										</c:choose>
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileOther.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td" style="text-align:center;">
-												${fileOther.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileOther.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('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
 
 					<div  class="form-group layui-row">
 						<div class="form-group-label">

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

@@ -1323,545 +1323,43 @@
 					</c:if>
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>成果文件</h2></div>
-						<div class="layui-item nav-btns">
-						</div>
-						<div id="addFile_attachment" style="display: none" class="upload-progress">
-							<span id="fileName_attachment" ></span>
-							<span id="_attachment" ></span>
-							<b><span id="baifenbi_attachment" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-						<span id="attachment_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_attachment">
-								<c:forEach items="${projectReportRecord.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-									<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
-										<c:choose>
-											<c:when test="${fileAttachment.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<%--															<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.temporaryUrl}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)"  onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.url}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
 
 
-										<c:choose>
-											<c:when test="${fileAttachment.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileAttachment.description}')">${fileAttachment.description}</td>
-											</c:otherwise>
-										</c:choose>
+					<!-- 成果文件模块引用 -->
+					<table:otherFileDisplay
+							title="成果文件"
+							onChangeFunc="insertTitle"
+							fileList="${projectReportRecord.fileAttachmentList}"
+							uploadMode="${projectReportRecord.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectReportRecord}"
+							projectReportRecord="${projectReportRecord}"/>
 
+					<!-- 依据性文件模块引用 -->
+					<table:otherFileDisplay
+							title="依据性文件"
+							onChangeFunc="gistdataInsertTitle"
+							fileList="${projectReportRecord.fileGistdataList}"
+							uploadMode="${projectReportRecord.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectReportRecord}"
+							projectReportRecord="${projectReportRecord}"/>
 
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileAttachment.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td" style="text-align:center;">
-												${fileAttachment.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
 
-													</c:when>
-													<c:otherwise>
+					<!-- 其他文件模块引用 -->
+					<table:otherFileDisplay
+							title="其他文件"
+							onChangeFunc="otherInsertTitle"
+							fileList="${projectReportRecord.fileOtherList}"
+							uploadMode="${projectReportRecord.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectReportRecord}"
+							projectReportRecord="${projectReportRecord}"/>
 
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																		<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileAttachment.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('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>依据性文件</h2></div>
-						<div class="layui-item nav-btns">
-								<%--<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						</div>
-						<div id="addFile_gistdata" style="display: none" class="upload-progress">
-							<span id="fileName_gistdata" ></span>
-							<span id="_gistdata" ></span>
-							<b><span id="baifenbi_gistdata" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-						<span id="gistdata_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="gistdata_upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_gistdata">
-								<c:forEach items="${projectReportRecord.fileGistdataList}" var = "fileGistdata" varStatus="status">
-									<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<%--																	<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--												<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
 
 
-										<c:choose>
-											<c:when test="${fileGistdata.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileGistdata.description}')">${fileGistdata.description}</td>
-											</c:otherwise>
-										</c:choose>
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileGistdata.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td"  style="text-align:center;">
-												${fileGistdata.fileSize}
-										</td>
-										<td class="op-td"  style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-
-													</c:when>
-													<c:otherwise>
-
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileGistdata.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('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>其他文件</h2></div>
-						<div class="layui-item nav-btns">
-								<%--<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>--%>
-						</div>
-						<div id="addFile_other" style="display: none" class="upload-progress">
-							<span id="fileName_other" ></span>
-							<span id="_other" ></span>
-							<b><span id="baifenbi_other" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-						<span id="other_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable_other" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="35%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="100px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_other">
-								<c:forEach items="${projectReportRecord.fileOtherList}" var = "fileOther" varStatus="status">
-									<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileOther.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<%--																	<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<!--													<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>-->
-												</c:otherwise>
-											</c:choose>
-										</td>
 
-										<c:choose>
-											<c:when test="${fileOther.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileOther.description}')">${fileOther.description}</td>
-											</c:otherwise>
-										</c:choose>
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileOther.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td" style="text-align:center;">
-												${fileOther.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
 
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectReportRecord.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileOther.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('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
 
 <%--					<div  class="form-group layui-row">--%>
 <%--						<div class="form-group-label">--%>

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

@@ -1414,535 +1414,43 @@
 					</div>
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>成果文件</h2></div>
-						<div id="addFile_attachment" style="display: none" class="upload-progress">
-							<span id="fileName_attachment" ></span>
-							<b><span id="baifenbi_attachment" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-						<span id="attachment_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="30%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="180px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_attachment">
-								<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-									<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
-										<c:choose>
-											<c:when test="${fileAttachment.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
 
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.temporaryUrl}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.url}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<c:choose>
-											<c:when test="${fileAttachment.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileAttachment.description}')">${fileAttachment.description}</td>
-											</c:otherwise>
-										</c:choose>
 
+					<!-- 成果文件模块引用 -->
+					<table:otherFileDisplay
+							title="成果文件"
+							onChangeFunc="insertTitle"
+							fileList="${projectcontentinfo.fileAttachmentList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
 
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileAttachment.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td" style="text-align:center;">${fileAttachment.fileSize}</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
+					<!-- 依据性文件模块引用 -->
+					<table:otherFileDisplay
+							title="依据性文件"
+							onChangeFunc="gistdataInsertTitle"
+							fileList="${projectcontentinfo.fileGistdataList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
 
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																		<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileAttachment.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('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileAttachment.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileAttachment.url}','${fileAttachment.createBy.id}','${fileAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>依据性文件</h2></div>
-						<div id="addFile_gistdata" style="display: none" class="upload-progress">
-							<span id="fileName_gistdata" ></span>
-							<b><span id="baifenbi_gistdata" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-						<span id="gistdata_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="gistdata_upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="30%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="180px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_gistdata">
-								<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-									<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="op-td"></td>
-													</c:when>
-													<c:otherwise>
-														<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileGistdata.description}')">${fileGistdata.description}</td>
-													</c:otherwise>
-												</c:choose>
-												<td class="op-td" style="text-align:center;">
-													<c:choose>
-														<c:when test="${fileGistdata.flag == 0}">
-															<div></div>
-														</c:when>
-														<c:otherwise>
-															<fmt:formatDate value="${fileGistdata.createDate}" type="date"/>
-														</c:otherwise>
-													</c:choose>
-												</td>
-										<td class="op-td"  style="text-align:center;">
-												${fileGistdata.fileSize}
-										</td>
-										<td class="op-td"  style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
 
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileGistdata.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('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileGistdata.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileGistdata.url}','${fileGistdata.createBy.id}','${fileGistdata.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>其他文件</h2></div>
-						<div id="addFile_other" style="display: none" class="upload-progress">
-							<span id="fileName_other" ></span>
-							<b><span id="baifenbi_other" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-						<span id="other_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable_other" class="table table-bordered table-condensed tree_table">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="30%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="180px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_other">
-								<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-									<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileOther.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="op-td"></td>
-													</c:when>
-													<c:otherwise>
-														<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileOther.description}')">${fileOther.description}</td>
-													</c:otherwise>
-												</c:choose>
-												<td class="op-td" style="text-align:center;">
-													<c:choose>
-														<c:when test="${fileOther.flag == 0}">
-															<div></div>
-														</c:when>
-														<c:otherwise>
-															<fmt:formatDate value="${fileOther.createDate}" type="date"/>
-														</c:otherwise>
-													</c:choose>
-												</td>
-										<td class="op-td" style="text-align:center;">
-												${fileOther.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
+					<!-- 其他文件模块引用 -->
+					<table:otherFileDisplay
+							title="其他文件"
+							onChangeFunc="otherInsertTitle"
+							fileList="${projectcontentinfo.fileOtherList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
 
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileOther.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('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileOther.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileOther.url}','${fileOther.createBy.id}','${fileOther.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
+
+
+
+					
 				</div>
 				<div>
 					<div class="form-group layui-row">

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

@@ -1304,487 +1304,53 @@
             </c:if>
 
 
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>成果文件</h2></div>
-                <div id="addFile_attachment" style="display: none" class="upload-progress">
-                    <span id="fileName_attachment" ></span>
-                    <b><span id="baifenbi_attachment" ></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <%--<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-                <span id="attachment_title"></span>--%>
-                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="upTable" class="table table-bordered table-condensed tree_table">
-                        <thead>
-                        <tr>
-                            <th width="20%">文件要求</th>
-                            <th width="35%">文件描述/文件</th>
-                            <th width="20%">文件类型</th>
-                            <th width="160px">上传时间</th>
-                            <th width="120px">文件大小(M)</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_attachment">
-                        <c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-                                <tr id="file_attachment_${fileAttachment.id}" onclick="listTr(this)">
-                                    <td style="display:none"><span class="faid">${fileAttachment.id}</span></td>
-                                    <td style="display:none">${fileAttachment.mustFlag}</td>
-                                    <c:choose>
-                                        <c:when test="${fileAttachment.mustFlag == 1}">
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-                                        </c:when>
-                                        <c:otherwise>
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-                                        </c:otherwise>
-                                    </c:choose>
-<%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>--%>
-                                    <td>
-<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-    <div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-                                    </td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-                                        </div>
-                                    </td>
-                                    <td style="display:none">${fileAttachment.fileFlag}</td>
-                                </tr>
-                            <c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_attachment_${fileAttachment.id}">
-                                    <td></td>
-                                    <c:choose>
-                                        <c:when test="${projectcontentinfo.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}"></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.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>
-<%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-                                    <td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
+            <%-- showAddButton="true" 显示添加按钮 --%>
+            <%-- parentId="13" 父级ID，根据实际业务传递 --%>
+            <%-- projectType="2" 项目类型，根据实际业务传递 --%>
+            <%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+            <%-- showEditBtn="true" 显示编辑按钮 --%>
+            <table:otherFileInstallDisplay
+                    title="成果文件"
+                    onChangeFunc="insertTitle"
+                    fileList="${projectcontentinfo.fileAttachmentList}"
+                    projectId="${projectcontentinfo.project.id}"
+                    uploadMode="${projectcontentinfo.uploadMode}"
+                    moduleId="attachment"
+                    showEditBtn="true"/>
+
+            <%-- showAddButton="true" 显示添加按钮 --%>
+            <%-- parentId="13" 父级ID，根据实际业务传递 --%>
+            <%-- projectType="2" 项目类型，根据实际业务传递 --%>
+            <%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+            <%-- showEditBtn="true" 显示编辑按钮 --%>
+            <table:otherFileInstallDisplay
+                    title="依据性文件"
+                    onChangeFunc="gistdataInsertTitle"
+                    fileList="${projectcontentinfo.fileGistdataList}"
+                    projectId="${projectcontentinfo.project.id}"
+                    uploadMode="${projectcontentinfo.uploadMode}"
+                    moduleId="gistdata"
+                    showEditBtn="true"/>
+
+            <%-- showAddButton="true" 显示添加按钮 --%>
+            <%-- parentId="13" 父级ID，根据实际业务传递 --%>
+            <%-- projectType="2" 项目类型，根据实际业务传递 --%>
+            <%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+            <%-- showEditBtn="true" 显示编辑按钮 --%>
+            <table:otherFileInstallDisplay
+                    title="其他文件"
+                    onChangeFunc="otherInsertTitle"
+                    fileList="${projectcontentinfo.fileOtherList}"
+                    projectId="${projectcontentinfo.project.id}"
+                    uploadMode="${projectcontentinfo.uploadMode}"
+                    moduleId="other"
+                    showEditBtn="true"/>
 
 
-                                    <td class="op-td" style="text-align:center;">
-                                        <fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-                                    </td>
-                                    <td class="op-td">
-                                        ${workClientAttachment.fileSize}
-                                    </td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                                <%--附件下载删除--%>
-                                            <c:choose>
-                                                <c:when test="${projectcontentinfo.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>
 
-                                                <%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-                                        </div>
-                                    </td>
-                                </tr>
-<%--                                <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
-                            </c:forEach>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
 
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>依据性文件</h2></div>
-                <div id="addFile_gistdata" style="display: none" class="upload-progress">
-                    <span id="fileName_gistdata" ></span>
-                    <b><span id="baifenbi_gistdata" ></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-                <span id="gistdata_title"></span>
-                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="gistdata_upTable" class="table table-bordered table-condensed">
-                        <thead>
-                        <tr >
-                            <th width="20%">文件要求</th>
-                            <th width="35%">文件描述/文件</th>
-                            <th width="20%">文件类型</th>
-                            <th width="160px">上传时间</th>
-                            <th width="120px">文件大小(M)</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_gistdata">
-                        <c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-                                <tr id="file_gistdata_${fileGistdata.id}" onclick="listTr(this)">
-                                    <td style="display:none"><span class="fgid">${fileGistdata.id}</span></td>
-                                    <td style="display:none">${fileGistdata.mustFlag}</td>
-                                    <c:choose>
-                                        <c:when test="${fileGistdata.mustFlag == 1}">
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-                                        </c:when>
-                                        <c:otherwise>
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-                                        </c:otherwise>
-                                    </c:choose>
-<%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>--%>
-                                    <td>
-<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-    <div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-                                    </td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-                                        </div>
-                                    </td>
-                                    <td style="display:none">${fileGistdata.fileFlag}</td>
 
-                                </tr>
-                            <c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_gistdata_${fileGistdata.id}">
-                                    <td></td>
-                                    <c:choose>
-                                        <c:when test="${projectcontentinfo.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}"></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.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>
-<%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-                                    <td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-                                    <td class="op-td" style="text-align:center;">
-                                        <fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-                                    </td>
-                                    <td class="op-td">
-                                        ${workClientAttachment.fileSize}
-                                    </td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                                <%--附件下载删除--%>
-                                            <c:choose>
-                                                <c:when test="${projectcontentinfo.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>
-
-                                                <%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-                                        </div>
-                                    </td>
-                                </tr>
-<%--                                <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
-                            </c:forEach>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>其他文件</h2></div>
-                <div id="addFile_other" style="display: none" class="upload-progress">
-                    <span id="fileName_other" ></span>
-                    <b><span id="baifenbi_other" ></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-                <span id="other_title"></span>
-                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="upTable_other" class="table table-bordered table-condensed tree_table">
-                        <thead>
-                        <tr>
-                            <th width="20%">文件要求</th>
-                            <th width="35%">文件描述/文件</th>
-                            <th width="20%">文件类型</th>
-                            <th width="160px">上传时间</th>
-                            <th width="120px">文件大小(M)</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_other">
-                        <c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-                                <tr id="file_other_${fileOther.id}" onclick="listTr(this)">
-                                    <td style="display:none"><span class="foid">${fileOther.id}</span></td>
-                                    <td style="display:none">${fileOther.mustFlag}</td>
-                                    <c:choose>
-                                        <c:when test="${fileOther.mustFlag == 1}">
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
-                                        </c:when>
-                                        <c:otherwise>
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-                                        </c:otherwise>
-                                    </c:choose>
-<%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>--%>
-                                    <td>
-<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-    <div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-                                    </td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td class="op-td " style="text-align: center">
-                                        <div class="op-btn-box" style="text-align: center">
-                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable_other',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-                                        </div>
-                                    </td>
-                                    <td style="display:none">${fileOther.fileFlag}</td>
-
-                                </tr>
-                            <c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_other_${fileOther.id}">
-                                    <td></td>
-                                    <c:choose>
-                                        <c:when test="${projectcontentinfo.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}"></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.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>
-<%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-                                    <td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-                                    <td class="op-td" style="text-align:center;">
-                                        <fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-                                    </td>
-                                    <td class="op-td">
-                                        ${workClientAttachment.fileSize}
-                                    </td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                                <%--附件下载删除--%>
-                                            <c:choose>
-                                                <c:when test="${projectcontentinfo.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>
 
-                                                <%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-                                        </div>
-                                    </td>
-                                </tr>
-<%--                                <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
-                            </c:forEach>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
             <div class="form-group layui-row">
                 <div class="form-group-label" style="overflow:hidden">
                     <h2 style="float: left">自检</h2>

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

@@ -1275,535 +1275,43 @@
 					</div>
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>成果文件</h2></div>
-						<div id="addFile_attachment" style="display: none" class="upload-progress">
-							<span id="fileName_attachment" ></span>
-							<b><span id="baifenbi_attachment" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-						<span id="attachment_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="30%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="180px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_attachment">
-								<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-									<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
-										<c:choose>
-											<c:when test="${fileAttachment.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
 
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.temporaryUrl}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.url}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<c:choose>
-											<c:when test="${fileAttachment.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileAttachment.description}')">${fileAttachment.description}</td>
-											</c:otherwise>
-										</c:choose>
 
 
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileAttachment.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td" style="text-align:center;">${fileAttachment.fileSize}</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
+					<!-- 成果文件模块引用 -->
+					<table:otherFileDisplay
+							title="成果文件"
+							onChangeFunc="insertTitle"
+							fileList="${projectcontentinfo.fileAttachmentList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
+
+					<!-- 依据性文件模块引用 -->
+					<table:otherFileDisplay
+							title="依据性文件"
+							onChangeFunc="gistdataInsertTitle"
+							fileList="${projectcontentinfo.fileGistdataList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
+
+
+					<!-- 其他文件模块引用 -->
+					<table:otherFileDisplay
+							title="其他文件"
+							onChangeFunc="otherInsertTitle"
+							fileList="${projectcontentinfo.fileOtherList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
+
 
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																		<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileAttachment.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('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileAttachment.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileAttachment.url}','${fileAttachment.createBy.id}','${fileAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>依据性文件</h2></div>
-						<div id="addFile_gistdata" style="display: none" class="upload-progress">
-							<span id="fileName_gistdata" ></span>
-							<b><span id="baifenbi_gistdata" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-						<span id="gistdata_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="gistdata_upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="30%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="180px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_gistdata">
-								<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-									<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="op-td"></td>
-													</c:when>
-													<c:otherwise>
-														<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileGistdata.description}')">${fileGistdata.description}</td>
-													</c:otherwise>
-												</c:choose>
-												<td class="op-td" style="text-align:center;">
-													<c:choose>
-														<c:when test="${fileGistdata.flag == 0}">
-															<div></div>
-														</c:when>
-														<c:otherwise>
-															<fmt:formatDate value="${fileGistdata.createDate}" type="date"/>
-														</c:otherwise>
-													</c:choose>
-												</td>
-										<td class="op-td"  style="text-align:center;">
-												${fileGistdata.fileSize}
-										</td>
-										<td class="op-td"  style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
 
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileGistdata.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('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileGistdata.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileGistdata.url}','${fileGistdata.createBy.id}','${fileGistdata.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>其他文件</h2></div>
-						<div id="addFile_other" style="display: none" class="upload-progress">
-							<span id="fileName_other" ></span>
-							<b><span id="baifenbi_other" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-						<span id="other_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable_other" class="table table-bordered table-condensed tree_table">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="30%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="180px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_other">
-								<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-									<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileOther.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="op-td"></td>
-													</c:when>
-													<c:otherwise>
-														<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileOther.description}')">${fileOther.description}</td>
-													</c:otherwise>
-												</c:choose>
-												<td class="op-td" style="text-align:center;">
-													<c:choose>
-														<c:when test="${fileOther.flag == 0}">
-															<div></div>
-														</c:when>
-														<c:otherwise>
-															<fmt:formatDate value="${fileOther.createDate}" type="date"/>
-														</c:otherwise>
-													</c:choose>
-												</td>
-										<td class="op-td" style="text-align:center;">
-												${fileOther.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
 
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileOther.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('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileOther.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileOther.url}','${fileOther.createBy.id}','${fileOther.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
 				</div>
 				<div>
 					<div class="form-group layui-row">

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

@@ -1371,481 +1371,39 @@
 					</div>
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>成果文件</h2></div>
-						<div id="addFile_attachment" style="display: none" class="upload-progress">
-							<span id="fileName_attachment" ></span>
-							<b><span id="baifenbi_attachment" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-						<span id="attachment_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="30%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="180px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_attachment">
-								<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-									<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
-										<c:choose>
-											<c:when test="${fileAttachment.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.temporaryUrl}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',2)">${fileAttachment.attachName} ; </a>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.url}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',2)">${fileAttachment.attachName} ; </a>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
 
-										<c:choose>
-											<c:when test="${fileAttachment.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileAttachment.description}')">${fileAttachment.description}</td>
-											</c:otherwise>
-										</c:choose>
-
-
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileAttachment.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td>
-												${fileAttachment.fileSize}
-										</td>
-										<td class="op-td" style="text-align: center">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
-
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																		<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileAttachment.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('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileAttachment.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileAttachment.url}','${fileAttachment.createBy.id}','${fileAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>依据性文件</h2></div>
-						<div id="addFile_gistdata" style="display: none" class="upload-progress">
-							<span id="fileName_gistdata" ></span>
-							<b><span id="baifenbi_gistdata" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-						<span id="gistdata_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="gistdata_upTable" class="table table-bordered table-condensed ">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="30%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="180px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_gistdata">
-								<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-									<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName} ; </a>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName} ; </a>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
 
+					<!-- 成果文件模块引用 -->
+					<table:otherFileDisplay
+							title="成果文件"
+							onChangeFunc="insertTitle"
+							fileList="${projectcontentinfo.fileAttachmentList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
 
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="op-td"></td>
-													</c:when>
-													<c:otherwise>
-														<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileGistdata.description}')">${fileGistdata.description}</td>
-													</c:otherwise>
-												</c:choose>
-												<td class="op-td" style="text-align:center;">
-													<c:choose>
-														<c:when test="${fileGistdata.flag == 0}">
-															<div></div>
-														</c:when>
-														<c:otherwise>
-															<fmt:formatDate value="${fileGistdata.createDate}" type="date"/>
-														</c:otherwise>
-													</c:choose>
-												</td>
-										<td>
-												${fileGistdata.fileSize}
-										</td>
-										<td class="op-td" style="text-align: center">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
+					<!-- 依据性文件模块引用 -->
+					<table:otherFileDisplay
+							title="依据性文件"
+							onChangeFunc="gistdataInsertTitle"
+							fileList="${projectcontentinfo.fileGistdataList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
 
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileGistdata.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('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileGistdata.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileGistdata.url}','${fileGistdata.createBy.id}','${fileGistdata.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>其他文件</h2></div>
-						<div id="addFile_other" style="display: none" class="upload-progress">
-							<span id="fileName_other" ></span>
-							<b><span id="baifenbi_other" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-						<span id="other_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable_other" class="table table-bordered table-condensed tree_table">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="30%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="180px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_other">
-								<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-									<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileOther.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName} ; </a>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName} ; </a>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
 
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="op-td"></td>
-													</c:when>
-													<c:otherwise>
-														<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileOther.description}')">${fileOther.description}</td>
-													</c:otherwise>
-												</c:choose>
-												<td class="op-td" style="text-align:center;">
-													<c:choose>
-														<c:when test="${fileOther.flag == 0}">
-															<div></div>
-														</c:when>
-														<c:otherwise>
-															<fmt:formatDate value="${fileOther.createDate}" type="date"/>
-														</c:otherwise>
-													</c:choose>
-												</td>
-										<td>
-												${fileGistdata.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
+					<!-- 其他文件模块引用 -->
+					<table:otherFileDisplay
+							title="其他文件"
+							onChangeFunc="otherInsertTitle"
+							fileList="${projectcontentinfo.fileOtherList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
 
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileOther.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('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileOther.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileOther.url}','${fileOther.createBy.id}','${fileOther.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
 				</div>
 
 			</div>

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

@@ -1076,487 +1076,50 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>成果文件</h2></div>
-                <div id="addFile_attachment" style="display: none" class="upload-progress">
-                    <span id="fileName_attachment" ></span>
-                    <b><span id="baifenbi_attachment" ></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-                <span id="attachment_title"></span>
-                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="upTable" class="table table-bordered table-condensed tree_table">
-                        <thead>
-                        <tr>
-                            <th width="20%">文件要求</th>
-                            <th width="35%">文件描述/文件</th>
-                            <th width="20%">文件类型</th>
-                            <th width="160px">上传时间</th>
-                            <th width="120px">文件大小(M)</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_attachment">
-                        <c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-                                <tr id="file_attachment_${fileAttachment.id}" onclick="listTr(this)">
-                                    <td style="display:none"><span class="faid">${fileAttachment.id}</span></td>
-                                    <td style="display:none">${fileAttachment.mustFlag}</td>
-                                    <c:choose>
-                                        <c:when test="${fileAttachment.mustFlag == 1}">
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-                                        </c:when>
-                                        <c:otherwise>
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-                                        </c:otherwise>
-                                    </c:choose>
-<%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>--%>
-                                    <td>
-<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-    <div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-                                    </td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-                                        </div>
-                                    </td>
-                                    <td style="display:none">${fileAttachment.fileFlag}</td>
-                                </tr>
-                            <c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_attachment_${fileAttachment.id}">
-                                    <td></td>
-                                    <c:choose>
-                                        <c:when test="${projectcontentinfo.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}"></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.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>
-<%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-                                    <td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
 
+            <%-- showAddButton="true" 显示添加按钮 --%>
+            <%-- parentId="13" 父级ID，根据实际业务传递 --%>
+            <%-- projectType="2" 项目类型，根据实际业务传递 --%>
+            <%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+            <%-- showEditBtn="true" 显示编辑按钮 --%>
+            <table:otherFileInstallDisplay
+                    title="成果文件"
+                    onChangeFunc="insertTitle"
+                    fileList="${projectcontentinfo.fileAttachmentList}"
+                    projectId="${projectcontentinfo.project.id}"
+                    uploadMode="${projectcontentinfo.uploadMode}"
+                    moduleId="attachment"
+                    showEditBtn="true"/>
+
+            <%-- showAddButton="true" 显示添加按钮 --%>
+            <%-- parentId="13" 父级ID，根据实际业务传递 --%>
+            <%-- projectType="2" 项目类型，根据实际业务传递 --%>
+            <%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+            <%-- showEditBtn="true" 显示编辑按钮 --%>
+            <table:otherFileInstallDisplay
+                    title="依据性文件"
+                    onChangeFunc="gistdataInsertTitle"
+                    fileList="${projectcontentinfo.fileGistdataList}"
+                    projectId="${projectcontentinfo.project.id}"
+                    uploadMode="${projectcontentinfo.uploadMode}"
+                    moduleId="gistdata"
+                    showEditBtn="true"/>
+
+            <%-- showAddButton="true" 显示添加按钮 --%>
+            <%-- parentId="13" 父级ID，根据实际业务传递 --%>
+            <%-- projectType="2" 项目类型，根据实际业务传递 --%>
+            <%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+            <%-- showEditBtn="true" 显示编辑按钮 --%>
+            <table:otherFileInstallDisplay
+                    title="其他文件"
+                    onChangeFunc="otherInsertTitle"
+                    fileList="${projectcontentinfo.fileOtherList}"
+                    projectId="${projectcontentinfo.project.id}"
+                    uploadMode="${projectcontentinfo.uploadMode}"
+                    moduleId="other"
+                    showEditBtn="true"/>
 
-                                    <td class="op-td" style="text-align:center;">
-                                        <fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-                                    </td>
-                                    <td class="op-td">
-                                        ${workClientAttachment.fileSize}
-                                    </td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                                <%--附件下载删除--%>
-                                            <c:choose>
-                                                <c:when test="${projectcontentinfo.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>
-
-                                                <%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-                                        </div>
-                                    </td>
-                                </tr>
-<%--                                <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
-                            </c:forEach>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>依据性文件</h2></div>
-                <div id="addFile_gistdata" style="display: none" class="upload-progress">
-                    <span id="fileName_gistdata" ></span>
-                    <b><span id="baifenbi_gistdata" ></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-                <span id="gistdata_title"></span>
-                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="gistdata_upTable" class="table table-bordered table-condensed">
-                        <thead>
-                        <tr >
-                            <th width="20%">文件要求</th>
-                            <th width="35%">文件描述/文件</th>
-                            <th width="20%">文件类型</th>
-                            <th width="160px">上传时间</th>
-                            <th width="120px">文件大小(M)</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_gistdata">
-                        <c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-                                <tr id="file_gistdata_${fileGistdata.id}" onclick="listTr(this)">
-                                    <td style="display:none"><span class="fgid">${fileGistdata.id}</span></td>
-                                    <td style="display:none">${fileGistdata.mustFlag}</td>
-                                    <c:choose>
-                                        <c:when test="${fileGistdata.mustFlag == 1}">
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-                                        </c:when>
-                                        <c:otherwise>
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-                                        </c:otherwise>
-                                    </c:choose>
-<%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>--%>
-                                    <td>
-<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-    <div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-                                    </td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-                                        </div>
-                                    </td>
-                                    <td style="display:none">${fileGistdata.fileFlag}</td>
 
-                                </tr>
-                            <c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_gistdata_${fileGistdata.id}">
-                                    <td></td>
-                                    <c:choose>
-                                        <c:when test="${projectcontentinfo.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}"></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.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>
-<%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-                                    <td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-                                    <td class="op-td" style="text-align:center;">
-                                        <fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-                                    </td>
-                                    <td class="op-td">
-                                        ${workClientAttachment.fileSize}
-                                    </td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                                <%--附件下载删除--%>
-                                            <c:choose>
-                                                <c:when test="${projectcontentinfo.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>
-
-                                                <%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-                                        </div>
-                                    </td>
-                                </tr>
-<%--                                <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
-                            </c:forEach>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>其他文件</h2></div>
-                <div id="addFile_other" style="display: none" class="upload-progress">
-                    <span id="fileName_other" ></span>
-                    <b><span id="baifenbi_other" ></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-                <span id="other_title"></span>
-                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="upTable_other" class="table table-bordered table-condensed tree_table">
-                        <thead>
-                        <tr>
-                            <th width="20%">文件要求</th>
-                            <th width="35%">文件描述/文件</th>
-                            <th width="20%">文件类型</th>
-                            <th width="160px">上传时间</th>
-                            <th width="120px">文件大小(M)</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_other">
-                        <c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-                                <tr id="file_other_${fileOther.id}" onclick="listTr(this)">
-                                    <td style="display:none"><span class="foid">${fileOther.id}</span></td>
-                                    <td style="display:none">${fileOther.mustFlag}</td>
-                                    <c:choose>
-                                        <c:when test="${fileOther.mustFlag == 1}">
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
-                                        </c:when>
-                                        <c:otherwise>
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-                                        </c:otherwise>
-                                    </c:choose>
-<%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>--%>
-                                    <td>
-<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-    <div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-                                    </td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td class="op-td " style="text-align: center">
-                                        <div class="op-btn-box" style="text-align: center">
-                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable_other',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-                                        </div>
-                                    </td>
-                                    <td style="display:none">${fileOther.fileFlag}</td>
-
-                                </tr>
-                            <c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_other_${fileOther.id}">
-                                    <td></td>
-                                    <c:choose>
-                                        <c:when test="${projectcontentinfo.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}"></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.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>
-<%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-                                    <td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-                                    <td class="op-td" style="text-align:center;">
-                                        <fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-                                    </td>
-                                    <td class="op-td">
-                                        ${workClientAttachment.fileSize}
-                                    </td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                                <%--附件下载删除--%>
-                                            <c:choose>
-                                                <c:when test="${projectcontentinfo.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>
-
-                                                <%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-                                        </div>
-                                    </td>
-                                </tr>
-<%--                                <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
-                            </c:forEach>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
             <div class="form-group layui-row">
                 <div class="form-group-label" style="overflow:hidden">
                     <h2 style="float: left">自检</h2>

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

@@ -579,428 +579,52 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>成果文件</h2></div>
-                <div id="addFile_attachment" style="display: none" class="upload-progress">
-                    <span id="fileName_attachment" ></span>
-                    <b><span id="baifenbi_attachment" ></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-                <span id="attachment_title"></span>
-                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="upTable" class="table table-bordered table-condensed tree_table">
-                        <thead>
-                        <tr>
-                            <th width="20%">文件要求</th>
-                            <th width="35%">文件描述/文件</th>
-                            <th width="20%">文件类型</th>
-                            <th width="160px">上传时间</th>
-                            <th width="120px">文件大小(M)</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_attachment">
-                        <c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-                                <tr id="file_attachment_${fileAttachment.id}" onclick="listTr(this)">
-                                    <td style="display:none"><span class="faid">${fileAttachment.id}</span></td>
-                                    <td style="display:none">${fileAttachment.mustFlag}</td>
-                                    <c:choose>
-                                        <c:when test="${fileAttachment.mustFlag == 1}">
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-                                        </c:when>
-                                        <c:otherwise>
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-                                        </c:otherwise>
-                                    </c:choose>
-<%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>--%>
-                                    <td>
-<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-    <div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-                                    </td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-                                        </div>
-                                    </td>
-                                    <td style="display:none">${fileAttachment.fileFlag}</td>
-                                </tr>
-                            <c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_attachment_${fileAttachment.id}">
-                                    <td></td>
-                                    <c:choose>
-                                        <c:when test="${projectcontentinfo.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>
-                                                            <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>
-                                        <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}"></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.url}',1)">${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>
-<%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-                                    <td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
 
 
-                                    <td class="op-td" style="text-align:center;">
-                                        <fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-                                    </td>
-                                    <td>
-                                            ${workClientAttachment.fileSize}
-                                    </td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                                <%--附件下载删除--%>
-                                            <c:choose>
-                                                <c:when test="${projectcontentinfo.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>
+            <%-- showAddButton="true" 显示添加按钮 --%>
+            <%-- parentId="13" 父级ID，根据实际业务传递 --%>
+            <%-- projectType="2" 项目类型，根据实际业务传递 --%>
+            <%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+            <%-- showEditBtn="true" 显示编辑按钮 --%>
+            <table:otherFileInstallDisplay
+                    title="成果文件"
+                    onChangeFunc="insertTitle"
+                    fileList="${projectcontentinfo.fileAttachmentList}"
+                    projectId="${projectcontentinfo.project.id}"
+                    uploadMode="${projectcontentinfo.uploadMode}"
+                    moduleId="attachment"
+                    showEditBtn="true"/>
+
+            <%-- showAddButton="true" 显示添加按钮 --%>
+            <%-- parentId="13" 父级ID，根据实际业务传递 --%>
+            <%-- projectType="2" 项目类型，根据实际业务传递 --%>
+            <%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+            <%-- showEditBtn="true" 显示编辑按钮 --%>
+            <table:otherFileInstallDisplay
+                    title="依据性文件"
+                    onChangeFunc="gistdataInsertTitle"
+                    fileList="${projectcontentinfo.fileGistdataList}"
+                    projectId="${projectcontentinfo.project.id}"
+                    uploadMode="${projectcontentinfo.uploadMode}"
+                    moduleId="gistdata"
+                    showEditBtn="true"/>
+
+            <%-- showAddButton="true" 显示添加按钮 --%>
+            <%-- parentId="13" 父级ID，根据实际业务传递 --%>
+            <%-- projectType="2" 项目类型，根据实际业务传递 --%>
+            <%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+            <%-- showEditBtn="true" 显示编辑按钮 --%>
+            <table:otherFileInstallDisplay
+                    title="其他文件"
+                    onChangeFunc="otherInsertTitle"
+                    fileList="${projectcontentinfo.fileOtherList}"
+                    projectId="${projectcontentinfo.project.id}"
+                    uploadMode="${projectcontentinfo.uploadMode}"
+                    moduleId="other"
+                    showEditBtn="true"/>
 
-                                                <%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-                                        </div>
-                                    </td>
-                                </tr>
-<%--                                <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
-                            </c:forEach>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
 
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>依据性文件</h2></div>
-                <div id="addFile_gistdata" style="display: none" class="upload-progress">
-                    <span id="fileName_gistdata" ></span>
-                    <b><span id="baifenbi_gistdata" ></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-                <span id="gistdata_title"></span>
-                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="gistdata_upTable" class="table table-bordered table-condensed">
-                        <thead>
-                        <tr >
-                            <th width="20%">文件要求</th>
-                            <th width="35%">文件描述/文件</th>
-                            <th width="20%">文件类型</th>
-                            <th width="160px">上传时间</th>
-                            <th width="120px">文件大小(M)</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_gistdata">
-                        <c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-                                <tr id="file_gistdata_${fileGistdata.id}" onclick="listTr(this)">
-                                    <td style="display:none"><span class="fgid">${fileGistdata.id}</span></td>
-                                    <td style="display:none">${fileGistdata.mustFlag}</td>
-                                    <c:choose>
-                                        <c:when test="${fileGistdata.mustFlag == 1}">
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-                                        </c:when>
-                                        <c:otherwise>
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-                                        </c:otherwise>
-                                    </c:choose>
-<%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>--%>
-                                    <td>
-<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-    <div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-                                    </td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-                                        </div>
-                                    </td>
-                                    <td style="display:none">${fileGistdata.fileFlag}</td>
-
-                                </tr>
-                            <c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_gistdata_${fileGistdata.id}">
-                                    <td></td>
-                                    <c:choose>
-                                        <c:when test="${projectcontentinfo.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>
-                                                            <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>
-                                        <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}"></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.url}',1)">${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>
-<%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-                                    <td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-                                    <td class="op-td" style="text-align:center;">
-                                        <fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-                                    </td>
-                                    <td>
-                                            ${workClientAttachment.fileSize}
-                                    </td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                                <%--附件下载删除--%>
-                                            <c:choose>
-                                                <c:when test="${projectcontentinfo.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>
-
-                                                <%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-                                        </div>
-                                    </td>
-                                </tr>
-<%--                                <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
-                            </c:forEach>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>其他文件</h2></div>
-                <div id="addFile_other" style="display: none" class="upload-progress">
-                    <span id="fileName_other" ></span>
-                    <b><span id="baifenbi_other" ></span></b>
-                    <div class="progress">
-                        <div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-                        </div>
-                    </div>
-                </div>
-                <input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-                <span id="other_title"></span>
-                <div class="layui-item layui-col-xs12" style="padding:0 16px;">
-                    <table id="upTable_other" class="table table-bordered table-condensed tree_table">
-                        <thead>
-                        <tr>
-                            <th width="20%">文件要求</th>
-                            <th width="35%">文件描述/文件</th>
-                            <th width="20%">文件类型</th>
-                            <th width="160px">上传时间</th>
-                            <th width="120px">文件大小(M)</th>
-                            <th width="100px">操作</th>
-                        </tr>
-                        </thead>
-                        <tbody id="file_other">
-                        <c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-                                <tr id="file_other_${fileOther.id}" onclick="listTr(this)">
-                                    <td style="display:none"><span class="foid">${fileOther.id}</span></td>
-                                    <td style="display:none">${fileOther.mustFlag}</td>
-                                    <c:choose>
-                                        <c:when test="${fileOther.mustFlag == 1}">
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
-                                        </c:when>
-                                        <c:otherwise>
-                                            <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-                                        </c:otherwise>
-                                    </c:choose>
-<%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>--%>
-                                    <td>
-<%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-    <div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-                                    </td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                            <a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectcontentinfo.project.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable_other',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-                                        </div>
-                                    </td>
-                                    <td style="display:none">${fileOther.fileFlag}</td>
-
-                                </tr>
-                            <c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-                                <tr class="file_other_${fileOther.id}">
-                                    <td></td>
-                                    <c:choose>
-                                        <c:when test="${projectcontentinfo.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>
-                                                            <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>
-                                        <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}"></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.url}',1)">${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>
-<%--                                    <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-                                    <td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-                                    <td class="op-td" style="text-align:center;">
-                                        <fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-                                    </td>
-                                    <td>
-                                            ${workClientAttachment.fileSize}
-                                    </td>
-                                    <td class="op-td" style="text-align: center">
-                                        <div class="op-btn-box" >
-                                                <%--附件下载删除--%>
-                                            <c:choose>
-                                                <c:when test="${projectcontentinfo.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>
-
-                                                <%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-                                        </div>
-                                    </td>
-                                </tr>
-<%--                                <a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
-                            </c:forEach>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="form-group layui-row">
                 <div class="form-group-label" style="overflow:hidden">
                     <h2 style="float: left">自检</h2>
                     <a onclick="return duoReviewAudits('确认要审核该质量复核内容吗？', this,'${projectReview.id}')"  style="color:#fff;float: right;margin-right: 50px;" class="layui-btn layui-btn-sm">多选确认</a>

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

@@ -803,519 +803,56 @@
 						</div>
 					</div>
 				</div>
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>成果文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=11&projectType=1&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_attachment')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
-				<div id="addFile_attachment" style="display: none" class="upload-progress">
-					<span id="fileName_attachment" ></span>
-					<span id="_attachment" ></span>
-					<b><span id="baifenbi_attachment" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-				<span id="attachment_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-							<th width="20%">文件要求</th>
-							<th width="35%">文件描述/文件</th>
-							<th width="20%">文件类型</th>
-							<th width="160px">上传时间</th>
-							<th width="120px">文件大小(M)</th>
-							<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr  id="file_attachment_${fileAttachment.id}_tr" onclick="listTr(this)">
-								<td style="display:none">${fileAttachment.id}</td>
-								<td style="display:none">${fileAttachment.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-								<td>
-<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td" style="text-align: center">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileAttachment.fileFlag}</td>
-							</tr>
-							<c:forEach items="${fileAttachment.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_attachment_${fileAttachment.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${projectcontentinfo.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>
-															<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>
-										<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}"></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.url}',1)">${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>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td>
-											${workClientAttachment.fileSize}
-									</td>
-									<td class="op-td" style="text-align: center">
-										<div class="op-btn-box" >
-												<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${projectcontentinfo.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('${workAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-												</c:otherwise>
-											</c:choose>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="fileAttachmentTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="fileAttachment{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
+
+				<%-- showAddButton="true" 显示添加按钮 --%>
+				<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+				<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+				<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+				<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="成果文件"
+					onChangeFunc="insertTitle"
+					fileList="${projectcontentinfo.fileAttachmentList}"
+					projectId="${projectRecords.id}"
+					uploadMode="${projectcontentinfo.uploadMode}"
+					moduleId="attachment"
+					showEditBtn="true"/>
+
+				<%-- showAddButton="true" 显示添加按钮 --%>
+				<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+				<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+				<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+				<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="依据性文件"
+					onChangeFunc="gistdataInsertTitle"
+					fileList="${projectcontentinfo.fileGistdataList}"
+					projectId="${projectRecords.id}"
+					uploadMode="${projectcontentinfo.uploadMode}"
+					moduleId="gistdata"
+					showEditBtn="true"/>
+
+				<%-- showAddButton="true" 显示添加按钮 --%>
+				<%-- parentId="13" 父级ID，根据实际业务传递 --%>
+				<%-- projectType="2" 项目类型，根据实际业务传递 --%>
+				<%-- reviewFeeSelector="reviewFee" 评审费用选择器ID --%>
+				<%-- showEditBtn="true" 显示编辑按钮 --%>
+			<table:otherFileInstallDisplay
+					title="其他文件"
+					onChangeFunc="otherInsertTitle"
+					fileList="${projectcontentinfo.fileOtherList}"
+					projectId="${projectRecords.id}"
+					uploadMode="${projectcontentinfo.uploadMode}"
+					moduleId="other"
+					showEditBtn="true"/>
+
+
+
+
+
 
 
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--					&lt;%&ndash;<a id="gistdata_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=12&projectType=1&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_gistdata')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
-				<div id="addFile_gistdata" style="display: none" class="upload-progress">
-					<span id="fileName_gistdata" ></span>
-					<span id="_gistdata" ></span>
-					<b><span id="baifenbi_gistdata" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-				<span id="gistdata_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr >
-							<th width="20%">文件要求</th>
-							<th width="35%">文件描述/文件</th>
-							<th width="20%">文件类型</th>
-							<th width="160px">上传时间</th>
-							<th width="120px">文件大小(M)</th>
-							<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_gistdata">
-						<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr  id="file_gistdata_${fileGistdata.id}_tr" onclick="listTr(this)">
-									<%-- <td>${status.index + 1}</td>--%>
-								<td style="display:none">${fileGistdata.id}</td>
-								<td style="display:none">${fileGistdata.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-								<td>
-<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td" style="text-align: center">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileGistdata.id}&projectId=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileGistdata.fileFlag}</td>
-							</tr>
-							<c:forEach items="${fileGistdata.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_gistdata_${fileGistdata.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${projectcontentinfo.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>
-															<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>
-										<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}"></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.url}',1)">${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>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td>
-											${workClientAttachment.fileSize}
-									</td>
-									<td class="op-td" style="text-align: center">
-										<div class="op-btn-box" >
-
-												<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${projectcontentinfo.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>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="gistdataTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="gistdataTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
 
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>其他文件</h2></div>
-<%--				<div class="layui-item nav-btns">--%>
-<%--					&lt;%&ndash;<a id="other_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>&ndash;%&gt;--%>
-<%--					<a href="javascript:void(0)"  onclick="formAttachment('添加类型', '${ctx}/projectAccessoryRelation/projectAccessoryRelation/formAttachment?parentId=13&projectType=1&projectId=${projectRecords.id}&reviewFee='+$('#reviewFee').val(),'500px','350px',false,'inputForm','file_other')" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 添加类型</a>--%>
-<%--				</div>--%>
-				<div id="addFile_other" style="display: none" class="upload-progress">
-					<span id="fileName_other" ></span>
-					<span id="_other" ></span>
-					<b><span id="baifenbi_other" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-				<span id="other_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
-						<thead>
-						<tr>
-							<th width="20%">文件要求</th>
-							<th width="35%">文件描述/文件</th>
-							<th width="20%">文件类型</th>
-							<th width="160px">上传时间</th>
-							<th width="120px">文件大小(M)</th>
-							<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_other">
-						<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr  id="file_other_${fileOther.id}_tr" onclick="listTr(this)">
-									<%-- <td>${status.index + 1}</td>--%>
-								<td style="display:none">${fileOther.id}</td>
-								<td style="display:none">${fileOther.mustFlag}</td>
-								<c:choose>
-									<c:when test="${fileOther.mustFlag == 1}">
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther	.attachName}"/></td>
-									</c:when>
-									<c:otherwise>
-										<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-									</c:otherwise>
-								</c:choose>
-								<td>
-<%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-	<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-								</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td class="op-td"  style="text-align: center">
-									<div class="op-btn-box" >
-										<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileOther.id}&projectId=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-									</div>
-								</td>
-								<td style="display:none">${fileOther.fileFlag}</td>
-							</tr>
-							<c:forEach items="${fileOther.workAttachments}" var = "workClientAttachment" varStatus="status">
-								<tr class="file_other_${fileOther.id}_tr">
-									<td></td>
-									<c:choose>
-										<c:when test="${projectcontentinfo.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>
-															<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>
-										<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}"></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.url}',1)">${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>
-<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
-									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${workClientAttachment.description}')">${workClientAttachment.description}</td>
-
-
-									<td class="op-td" style="text-align:center;">
-										<fmt:formatDate value="${workClientAttachment.createDate}" type="date"/>
-									</td>
-									<td>
-										${workClientAttachment.fileSize}
-									</td>
-									<td class="op-td" style="text-align: center">
-										<div class="op-btn-box" >
-
-												<%--附件下载删除--%>
-											<c:choose>
-												<c:when test="${projectcontentinfo.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>
-
-												<%--											<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId=${fileAttachment.id}&projectId=${project.id}','70%','80%',false,'inputForm','upTable',this)" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>--%>
-										</div>
-									</td>
-								</tr>
-							</c:forEach>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-			<script type="text/template" id="otherTpl">//<!--
-                <tr id="budgetList{{idx}}">
-                    <td class="hide">
-                        <input id="otherTpl{{idx}}_id" type="hidden" value="{{row.id}}" class="clientId"/>
-                    </td>
-                    <td class="hide">
-                        0
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachName}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachLength}}
-                    </td>
-                    <td style="text-align:center;">
-                        {{row.attachTypes}}
-                    </td>
-                    <td style="text-align:center;">
-
-                    </td>
-					<td class="op-td">
-						<div class="op-btn-box" >
-							<a href="javascript:void(0)"  onclick="openBill2('编辑附件', '${ctx}/projectAccessory/projectAccessory/workAttachmentForm?attachmentId={{row.id}}&projectId=${projectRecords.id}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
-						</div>
-					</td>
-                </tr>//-->
-			</script>
 			<div class="form-group layui-row">
 				<div class="form-group-label" style="overflow:hidden">
 					<h2 style="float: left">自检</h2>

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

@@ -443,533 +443,39 @@
 					</div>
 				</div>
 			</div>
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>成果文件</h2></div>
-				<div id="addFile_attachment" style="display: none" class="upload-progress">
-					<span id="fileName_attachment" ></span>
-					<b><span id="baifenbi_attachment" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-				<span id="attachment_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable" class="table table-bordered table-condensed">
-						<thead>
-						<tr>
-							<th width="20%">文件要求</th>
-							<th width="35%">文件描述/文件</th>
-							<th width="20%">文件类型</th>
-							<th width="160px">上传时间</th>
-							<th width="120px">文件大小(M)</th>
-							<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_attachment">
-						<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-							<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
-								<c:choose>
-									<c:when test="${fileAttachment.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileAttachment.attachName}</td>
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fileAttachment.flag == 0}">
-												<td>${fileAttachment.attachName}</td>
-											</c:when>
-											<c:otherwise>
-												<td></td>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
-								<td style="text-align:center;">
-									<c:choose>
-										<c:when test="${fileAttachment.flag == 0}">
-<%--											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-											<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-										</c:when>
-										<c:otherwise>
-											<c:choose>
-												<c:when test="${projectcontentinfo.uploadMode == 2}">
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-															<img src="${fileAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.temporaryUrl}','90%','90%')" alt="${fileAttachment.attachName}">
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																	<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',3)">${fileAttachment.attachName}</a>
-																		</c:when>
-																		<c:otherwise>
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',2)">${fileAttachment.attachName}</a>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-															<img src="${fileAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.url}','90%','90%')" alt="${fileAttachment.attachName}">
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																	<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',3)">${fileAttachment.attachName}</a>
-																		</c:when>
-																		<c:otherwise>
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',2)">${fileAttachment.attachName}</a>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-												</c:otherwise>
-											</c:choose>
-<!--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>-->
-										</c:otherwise>
-									</c:choose>
-								</td>
-								<c:choose>
-									<c:when test="${fileAttachment.flag == 0}">
-										<td class="op-td"></td>
-									</c:when>
-									<c:otherwise>
-										<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileAttachment.description}')">${fileAttachment.description}</td>
-									</c:otherwise>
-								</c:choose>
 
 
-								<td class="op-td" style="text-align:center;">
-									<c:choose>
-										<c:when test="${fileAttachment.flag == 0}">
-											<div></div>
-										</c:when>
-										<c:otherwise>
-											<fmt:formatDate value="${fileAttachment.createDate}" type="date"/>
-										</c:otherwise>
-									</c:choose>
-								</td>
+			<!-- 成果文件模块引用 -->
+			<table:otherFileDisplay
+					title="成果文件"
+					onChangeFunc="insertTitle"
+					fileList="${projectcontentinfo.fileAttachmentList}"
+					uploadMode="${projectcontentinfo.uploadMode}"
+					moduleId="other"
+					projectContentInfo="${projectcontentinfo}"
+					projectReportRecord="${projectcontentinfo}"/>
 
-								<td>${fileAttachment.fileSize}</td>
-								<td class="op-td" style="text-align:center;">
-									<div class="op-btn-box" >
-										<div class="op-btn-box" >
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
+			<!-- 依据性文件模块引用 -->
+			<table:otherFileDisplay
+					title="依据性文件"
+					onChangeFunc="gistdataInsertTitle"
+					fileList="${projectcontentinfo.fileGistdataList}"
+					uploadMode="${projectcontentinfo.uploadMode}"
+					moduleId="other"
+					projectContentInfo="${projectcontentinfo}"
+					projectReportRecord="${projectcontentinfo}"/>
 
-												</c:when>
-												<c:otherwise>
-													<%--附件下载删除--%>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																	<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																</c:when>
-																<c:otherwise>
-																	<a href="${fileAttachment.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('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-														</c:otherwise>
-													</c:choose>
-													<c:if test="${fileAttachment.collectFlag != 1}">
-														<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileAttachment.url}','${fileAttachment.createBy.id}','${fileAttachment.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-													</c:if>
-												</c:otherwise>
-											</c:choose>
-										</div>
-									</div>
-								</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
 
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>依据性资料</h2></div>
-				<div id="addFile_gistdata" style="display: none" class="upload-progress">
-					<span id="fileName_gistdata" ></span>
-					<b><span id="baifenbi_gistdata" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-				<span id="gistdata_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="gistdata_upTable" class="table table-bordered table-condensed">
-						<thead>
-						<tr>
-							<th width="20%">文件要求</th>
-							<th width="35%">文件描述/文件</th>
-							<th width="20%">文件类型</th>
-							<th width="160px">上传时间</th>
-							<th width="120px">文件大小(M)</th>
-							<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_gistdata">
-						<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-							<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
-									<%-- <td>${status.index + 1}</td>--%>
-								<c:choose>
-									<c:when test="${fileGistdata.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileGistdata.attachName}</td>
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fileGistdata.flag == 0}">
-												<td>${fileGistdata.attachName}</td>
-											</c:when>
-											<c:otherwise>
-												<td></td>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
-								<td style="text-align:center;">
-									<c:choose>
-										<c:when test="${fileGistdata.flag == 0}">
-<%--											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-											<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-										</c:when>
-										<c:otherwise>
-											<c:choose>
-												<c:when test="${projectcontentinfo.uploadMode == 2}">
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-															<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																	<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',3)">${fileGistdata.attachName}</a>
-																		</c:when>
-																		<c:otherwise>
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName}</a>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-															<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																	<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',3)">${fileGistdata.attachName}</a>
-																		</c:when>
-																		<c:otherwise>
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName}</a>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-												</c:otherwise>
-											</c:choose>
-<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
-										</c:otherwise>
-									</c:choose>
-								</td>
-										<c:choose>
-											<c:when test="${fileGistdata.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileGistdata.description}')">${fileGistdata.description}</td>
-											</c:otherwise>
-										</c:choose>
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileGistdata.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-								<td>${fileGistdata.fileSize}</td>
-								<td class="op-td"  style="text-align:center;">
-									<div class="op-btn-box" >
-										<c:choose>
-											<c:when test="${fileGistdata.flag == 0}">
+			<!-- 其他文件模块引用 -->
+			<table:otherFileDisplay
+					title="其他文件"
+					onChangeFunc="otherInsertTitle"
+					fileList="${projectcontentinfo.fileOtherList}"
+					uploadMode="${projectcontentinfo.uploadMode}"
+					moduleId="other"
+					projectContentInfo="${projectcontentinfo}"
+					projectReportRecord="${projectcontentinfo}"/>
 
-											</c:when>
-											<c:otherwise>
-												<%--附件下载删除--%>
-												<c:choose>
-													<c:when test="${projectcontentinfo.uploadMode == 2}">
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:when>
-															<c:otherwise>
-																<a href="${fileGistdata.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('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-													</c:otherwise>
-												</c:choose>
-												<c:if test="${fileGistdata.collectFlag != 1}">
-													<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileGistdata.url}','${fileGistdata.createBy.id}','${fileGistdata.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-												</c:if>
-											</c:otherwise>
-										</c:choose>
-									</div>
-								</td>
-								<td style="display:none">${fileGistdata.id}</td>
-								<td style="display:none">${fileGistdata.mustFlag}</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
-
-			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>其他文件</h2></div>
-				<div id="addFile_other" style="display: none" class="upload-progress">
-					<span id="fileName_other" ></span>
-					<b><span id="baifenbi_other" ></span></b>
-					<div class="progress">
-						<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-						</div>
-					</div>
-				</div>
-				<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-				<span id="other_title"></span>
-				<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-					<table id="upTable_other" class="table table-bordered table-condensed">
-						<thead>
-						<tr>
-							<th width="20%">文件要求</th>
-							<th width="35%">文件描述/文件</th>
-							<th width="20%">文件类型</th>
-							<th width="160px">上传时间</th>
-							<th width="120px">文件大小(M)</th>
-							<th width="100px">操作</th>
-						</tr>
-						</thead>
-						<tbody id="file_other">
-						<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-							<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
-									<%-- <td>${status.index + 1}</td>--%>
-								<c:choose>
-									<c:when test="${fileOther.mustFlag == 1}">
-										<td><span style="color: red">* </span>${fileOther.attachName}</td>
-									</c:when>
-									<c:otherwise>
-										<c:choose>
-											<c:when test="${fileOther.flag == 0}">
-												<td>${fileOther.attachName}</td>
-											</c:when>
-											<c:otherwise>
-												<td></td>
-											</c:otherwise>
-										</c:choose>
-									</c:otherwise>
-								</c:choose>
-								<td style="text-align:center;">
-									<c:choose>
-										<c:when test="${fileOther.flag == 0}">
-<%--											<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-											<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-										</c:when>
-										<c:otherwise>
-											<c:choose>
-												<c:when test="${projectcontentinfo.uploadMode == 2}">
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'png')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'gif')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-                                                           or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-															<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																	<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',3)">${fileOther.attachName}</a>
-																		</c:when>
-																		<c:otherwise>
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName}</a>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																				   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-															<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																	<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',3)">${fileOther.attachName}</a>
-																		</c:when>
-																		<c:otherwise>
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName}</a>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-												</c:otherwise>
-											</c:choose>
-<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>--%>
-										</c:otherwise>
-									</c:choose>
-								</td>
-										<c:choose>
-											<c:when test="${fileGistdata.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileOther.description}')">${fileOther.description}</td>
-											</c:otherwise>
-										</c:choose>
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileOther.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-								<td>${fileOther.fileSize}</td>
-								<td class="op-td" style="text-align:center;">
-									<div class="op-btn-box" >
-										<c:choose>
-											<c:when test="${fileOther.flag == 0}">
-
-											</c:when>
-											<c:otherwise>
-												<%--附件下载删除--%>
-												<c:choose>
-													<c:when test="${projectcontentinfo.uploadMode == 2}">
-														<c:choose>
-															<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:when>
-															<c:otherwise>
-																<a href="${fileOther.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('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-													</c:otherwise>
-												</c:choose>
-												<c:if test="${fileOther.collectFlag != 1}">
-													<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileOther.url}','${fileOther.createBy.id}','${fileOther	.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-												</c:if>
-											</c:otherwise>
-										</c:choose>
-									</div>
-								</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</div>
-			</div>
 
 			<div>
 				<div class="form-group-label">

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

@@ -1247,535 +1247,42 @@
 					</div>
 				</div>
 				<div class="form-group layui-row first hide" id="AccessoryView">
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>成果文件</h2></div>
-						<div id="addFile_attachment" style="display: none" class="upload-progress">
-							<span id="fileName_attachment" ></span>
-							<b><span id="baifenbi_attachment" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_attachment" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="attachment_file" type="file" name="attachment_file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitle(this.value);"/>
-						<span id="attachment_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="30%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="180px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_attachment">
-								<c:forEach items="${projectcontentinfo.fileAttachmentList}" var = "fileAttachment" varStatus="status">
-									<tr id="${fileAttachment.id}" pid="${fileAttachment.parent.id}">
-										<c:choose>
-											<c:when test="${fileAttachment.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileAttachment.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
 
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																		   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.temporaryUrl}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'jpg')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'png')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'gif')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'bmp')
-																								   or fn:containsIgnoreCase(fileAttachment.attachName,'jpeg')}">
-																	<img src="${fileAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileAttachment.url}','90%','90%')" alt="${fileAttachment.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',1)">${fileAttachment.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileAttachment.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',3)">${fileAttachment.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileAttachment.url}',2)">${fileAttachment.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileAttachment.url}','90%','90%')">${fileAttachment.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<c:choose>
-											<c:when test="${fileAttachment.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileAttachment.description}')">${fileAttachment.description}</td>
-											</c:otherwise>
-										</c:choose>
 
+					<!-- 成果文件模块引用 -->
+					<table:otherFileDisplay
+							title="成果文件"
+							onChangeFunc="insertTitle"
+							fileList="${projectcontentinfo.fileAttachmentList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
+
+					<!-- 依据性文件模块引用 -->
+					<table:otherFileDisplay
+							title="依据性文件"
+							onChangeFunc="gistdataInsertTitle"
+							fileList="${projectcontentinfo.fileGistdataList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
+
+
+					<!-- 其他文件模块引用 -->
+					<table:otherFileDisplay
+							title="其他文件"
+							onChangeFunc="otherInsertTitle"
+							fileList="${projectcontentinfo.fileOtherList}"
+							uploadMode="${projectcontentinfo.uploadMode}"
+							moduleId="other"
+							projectContentInfo="${projectcontentinfo}"
+							projectReportRecord="${projectcontentinfo}"/>
 
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileAttachment.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileAttachment.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td" style="text-align:center;">${fileAttachment.fileSize}</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileAttachment.flag == 0}">
 
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																		<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileAttachment.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('${fileAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileAttachment.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileAttachment.url}','${fileAttachment.createBy.id}','${fileAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>依据性文件</h2></div>
-						<div id="addFile_gistdata" style="display: none" class="upload-progress">
-							<span id="fileName_gistdata" ></span>
-							<b><span id="baifenbi_gistdata" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_gistdata" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="gistdata_file" type="file" name="gistdata_file" multiple="multiple" style="display: none;" onChange="if(this.value)gistdataInsertTitle(this.value);"/>
-						<span id="gistdata_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="gistdata_upTable" class="table table-bordered table-condensed">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="30%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="180px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_gistdata">
-								<c:forEach items="${projectcontentinfo.fileGistdataList}" var = "fileGistdata" varStatus="status">
-									<tr id="${fileGistdata.id}" pid="${fileGistdata.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileGistdata.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileGistdata.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																		   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.temporaryUrl}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'jpg')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'png')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'gif')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'bmp')
-																								   or fn:containsIgnoreCase(fileGistdata.attachName,'jpeg')}">
-																	<img src="${fileGistdata.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileGistdata.url}','90%','90%')" alt="${fileGistdata.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',1)">${fileGistdata.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileGistdata.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',3)">${fileGistdata.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileGistdata.url}',2)">${fileGistdata.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileGistdata.url}','90%','90%')">${fileGistdata.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<c:choose>
-											<c:when test="${fileGistdata.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileGistdata.description}')">${fileGistdata.description}</td>
-											</c:otherwise>
-										</c:choose>
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileGistdata.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileGistdata.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td"  style="text-align:center;">
-												${fileGistdata.fileSize}
-										</td>
-										<td class="op-td"  style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileGistdata.flag == 0}">
 
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileGistdata.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('${fileGistdata.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileGistdata.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileGistdata.url}','${fileGistdata.createBy.id}','${fileGistdata.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileGistdata.id}</td>
-										<td style="display:none">${fileGistdata.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="form-group layui-row">
-						<div class="form-group-label"><h2>其他文件</h2></div>
-						<div id="addFile_other" style="display: none" class="upload-progress">
-							<span id="fileName_other" ></span>
-							<b><span id="baifenbi_other" ></span></b>
-							<div class="progress">
-								<div id="jindutiao_other" class="progress-bar" style="width: 0%" aria-valuenow="0">
-								</div>
-							</div>
-						</div>
-						<input id="other_file" type="file" name="other_file" multiple="multiple" style="display: none;" onChange="if(this.value)otherInsertTitle(this.value);"/>
-						<span id="other_title"></span>
-						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
-							<table id="upTable_other" class="table table-bordered table-condensed tree_table">
-								<thead>
-								<tr>
-									<th width="20%">文件要求</th>
-									<th width="30%">文件描述/文件</th>
-									<th width="20%">文件类型</th>
-									<th width="160px">上传时间</th>
-									<th width="120px">文件大小(M)</th>
-									<th width="180px">操作</th>
-								</tr>
-								</thead>
-								<tbody id="file_other">
-								<c:forEach items="${projectcontentinfo.fileOtherList}" var = "fileOther" varStatus="status">
-									<tr id="${fileOther.id}" pid="${fileOther.parent.id}">
-											<%-- <td>${status.index + 1}</td>--%>
-										<c:choose>
-											<c:when test="${fileOther.mustFlag == 1}">
-												<td class="tabMove" style="text-align: left;"><span style="color: red">* </span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-											</c:when>
-											<c:otherwise>
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
-														<td class="tabMove" style="text-align: left;">${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>
-													</c:when>
-													<c:otherwise>
-														<td></td>
-													</c:otherwise>
-												</c:choose>
-											</c:otherwise>
-										</c:choose>
-										<td>
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<%--													<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-													<div style="white-space:normal; word-break:break-all;overflow:hidden;"><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;</div><div style="white-space:normal; word-break:break-all;overflow:hidden;">  ${fileOther.attachTypes}</div>
-												</c:when>
-												<c:otherwise>
-													<c:choose>
-														<c:when test="${projectcontentinfo.uploadMode == 2}">
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																		   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.temporaryUrl}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:when>
-														<c:otherwise>
-															<c:choose>
-																<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'jpg')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'png')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'gif')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'bmp')
-																								   or fn:containsIgnoreCase(fileOther.attachName,'jpeg')}">
-																	<img src="${fileOther.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${fileOther.url}','90%','90%')" alt="${fileOther.attachName}">
-																</c:when>
-																<c:otherwise>
-																	<c:choose>
-																		<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachName,'pdf')}">
-																			<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',1)">${fileOther.attachName} ; </a>
-																		</c:when>
-																		<c:otherwise>
-																			<c:choose>
-																				<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'zip')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'jar')
-																					   or fn:containsIgnoreCase(fileOther.attachName,'7z')}">
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',3)">${fileOther.attachName}</a>
-																				</c:when>
-																				<c:otherwise>
-																					<a class="attention-info" href="javascript:void(0)" onclick="openPreview('${fileOther.url}',2)">${fileOther.attachName}</a>
-																				</c:otherwise>
-																			</c:choose>
-																		</c:otherwise>
-																	</c:choose>
-																</c:otherwise>
-															</c:choose>
-														</c:otherwise>
-													</c:choose>
-													<%--											<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${fileOther.url}','90%','90%')">${fileOther.attachName} ; </a>--%>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<c:choose>
-											<c:when test="${fileGistdata.flag == 0}">
-												<td class="op-td"></td>
-											</c:when>
-											<c:otherwise>
-												<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" onclick="readOpenInfo('${fileOther.description}')">${fileOther.description}</td>
-											</c:otherwise>
-										</c:choose>
-										<td class="op-td" style="text-align:center;">
-											<c:choose>
-												<c:when test="${fileOther.flag == 0}">
-													<div></div>
-												</c:when>
-												<c:otherwise>
-													<fmt:formatDate value="${fileOther.createDate}" type="date"/>
-												</c:otherwise>
-											</c:choose>
-										</td>
-										<td class="op-td" style="text-align:center;">
-												${fileOther.fileSize}
-										</td>
-										<td class="op-td" style="text-align:center;">
-											<div class="op-btn-box" >
-												<c:choose>
-													<c:when test="${fileOther.flag == 0}">
 
-													</c:when>
-													<c:otherwise>
-														<%--附件下载删除--%>
-														<c:choose>
-															<c:when test="${projectcontentinfo.uploadMode == 2}">
-																<c:choose>
-																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-																	</c:when>
-																	<c:otherwise>
-																		<a href="${fileOther.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('${fileOther.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
-															</c:otherwise>
-														</c:choose>
-														<c:if test="${fileOther.collectFlag != 1}">
-															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${fileOther.url}','${fileOther.createBy.id}','${fileOther.fileSize}')" class="op-btn op-btn-delete"  style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</div>
-										</td>
-										<td style="display:none">${fileOther.id}</td>
-										<td style="display:none">${fileOther.mustFlag}</td>
-									</tr>
-								</c:forEach>
-								</tbody>
-							</table>
-						</div>
-					</div>
 				</div>
 				<div>
 					<div class="form-group layui-row">

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

@@ -143,10 +143,20 @@
                 const degreeValue = degreeSelect ? degreeSelect.value.trim() : '';
                 const degreePhotoInput = row.querySelector('input[name$="degreePhoto"]');
                 const degreePhotoPath = degreePhotoInput ? degreePhotoInput.value.trim() : '';
+                const degreePhotoSpan = row.querySelector('span[id$="degreePhotoFileName1"]');
+                let hasDegreeValidImage = false;
+                if (degreePhotoSpan) {
+                    const imgDegreeElement = degreePhotoSpan.querySelector('img');
+                    if (imgDegreeElement && imgDegreeElement.getAttribute('src')) {
+                        const srcValue = imgDegreeElement.getAttribute('src').trim();
+                        hasDegreeValidImage = srcValue !== '';
+                    }
+                }
+                console.log(hasDegreeValidImage)
 
                 const degreeLabel = degreeLabelMap[degreeValue] || "[未知学位：" + degreeValue + "]";
 
-                if (degreeValue !== '00' && !degreePhotoPath) {
+                if (degreeValue !== '00' && !degreePhotoPath && !hasDegreeValidImage) {
                     isValid = false;
                     errorMessages.push("教育经历第" + rowNum + "行：学位为【" + degreeLabel + "】时，学位证书不能为空");
                 }
@@ -1006,7 +1016,7 @@
                     </div>--%>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>教育经历</h2></div>
+                    <div class="form-group-label"><h2><span class="require-item">*</span>教育经历<span style="color: #FF7A00;">（必填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowEducation('#educationList',educationIdx,educationTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -1186,7 +1196,7 @@
                 </div>
 
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>外语语种</h2></div>
+                    <div class="form-group-label"><h2>外语语种<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowLanguage('#languageList',languageIdx,languageTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -1301,7 +1311,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>工作经历</h2></div>
+                    <div class="form-group-label"><h2>工作经历<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowExperience('#experienceList', experienceIdx, experienceTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -1418,7 +1428,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>执业资格证书</h2></div>
+                    <div class="form-group-label"><h2>执业资格证书<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowCertificate('#certificateList',certificateIdx,certificateTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -1631,7 +1641,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>职称证书</h2></div>
+                    <div class="form-group-label"><h2>职称证书<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowTitle('#titleList',titleIdx,titleTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -1801,7 +1811,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>家庭情况</h2></div>
+                    <div class="form-group-label"><h2>家庭情况<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowFamily('#familyList', familyIdx, familyTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -1893,7 +1903,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>培训经历</h2></div>
+                    <div class="form-group-label"><h2>培训经历<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowTraining('#trainingList',trainingIdx,trainingTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -2046,7 +2056,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>社会及行业职务</h2></div>
+                    <div class="form-group-label"><h2>社会及行业职务<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowSocialPosition('#socialPositionList',socialPositionIdx,socialPositionTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -2141,7 +2151,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>表彰与奖励</h2></div>
+                    <div class="form-group-label"><h2>表彰与奖励<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowRewards('#rewardsList',rewardsIdx,rewardsTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -2240,7 +2250,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>工作业绩</h2></div>
+                    <div class="form-group-label"><h2>工作业绩<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowAchievement('#achievementList',achievementIdx,achievementTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>

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

@@ -148,10 +148,20 @@
                 const degreeValue = degreeSelect ? degreeSelect.value.trim() : '';
                 const degreePhotoInput = row.querySelector('input[name$="degreePhoto"]');
                 const degreePhotoPath = degreePhotoInput ? degreePhotoInput.value.trim() : '';
+                const degreePhotoSpan = row.querySelector('span[id$="degreePhotoFileName1"]');
+                let hasDegreeValidImage = false;
+                if (degreePhotoSpan) {
+                    const imgDegreeElement = degreePhotoSpan.querySelector('img');
+                    if (imgDegreeElement && imgDegreeElement.getAttribute('src')) {
+                        const srcValue = imgDegreeElement.getAttribute('src').trim();
+                        hasDegreeValidImage = srcValue !== '';
+                    }
+                }
+                console.log(hasDegreeValidImage)
 
                 const degreeLabel = degreeLabelMap[degreeValue] || "[未知学位：" + degreeValue + "]";
 
-                if (degreeValue !== '00' && !degreePhotoPath) {
+                if (degreeValue !== '00' && !degreePhotoPath && !hasDegreeValidImage) {
                     isValid = false;
                     errorMessages.push("教育经历第" + rowNum + "行：学位为【" + degreeLabel + "】时，学位证书不能为空");
                 }
@@ -945,7 +955,7 @@
                     </div>--%>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>教育经历</h2></div>
+                    <div class="form-group-label"><h2><span class="require-item">*</span>教育经历<span style="color: #FF7A00;">（必填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowEducation('#educationList',educationIdx,educationTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -1125,7 +1135,7 @@
                 </div>
 
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>外语语种</h2></div>
+                    <div class="form-group-label"><h2>外语语种<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowLanguage('#languageList',languageIdx,languageTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -1240,7 +1250,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>工作经历</h2></div>
+                    <div class="form-group-label"><h2>工作经历<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowExperience('#experienceList', experienceIdx, experienceTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -1358,7 +1368,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>执业资格证书</h2></div>
+                    <div class="form-group-label"><h2>执业资格证书<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowCertificate('#certificateList',certificateIdx,certificateTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -1574,7 +1584,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>职称证书</h2></div>
+                    <div class="form-group-label"><h2>职称证书<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowTitle('#titleList',titleIdx,titleTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -1744,7 +1754,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>家庭情况</h2></div>
+                    <div class="form-group-label"><h2>家庭情况<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowFamily('#familyList', familyIdx, familyTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -1836,7 +1846,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>培训经历</h2></div>
+                    <div class="form-group-label"><h2>培训经历<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowTraining('#trainingList',trainingIdx,trainingTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -1991,7 +2001,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>社会及行业职务</h2></div>
+                    <div class="form-group-label"><h2>社会及行业职务<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowSocialPosition('#socialPositionList',socialPositionIdx,socialPositionTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -2088,7 +2098,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>表彰与奖励</h2></div>
+                    <div class="form-group-label"><h2>表彰与奖励<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowRewards('#rewardsList',rewardsIdx,rewardsTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>
@@ -2187,7 +2197,7 @@
                     </div>
                 </div>
                 <div class="form-group layui-row">
-                    <div class="form-group-label"><h2>工作业绩</h2></div>
+                    <div class="form-group-label"><h2>工作业绩<span style="color: #99A3B0;">（选填）</span></h2></div>
                     <div class="layui-item nav-btns">
                         <a href=javascript:void(0); onclick="addRowAchievement('#achievementList',achievementIdx,achievementTpl)" class="nav-btn nav-btn-add" ><i class="fa fa-plus"></i> 新增</a>
                     </div>