文件上传展示修改

src/main/java/com/jeeplus/modules/identification/web/AuditTemplateController.java

@@ -109,6 +109,18 @@ public class AuditTemplateController extends BaseController {
         model.addAttribute("auditTemplates",auditTemplates);
         return "modules/iframeView/opinion";
     }
+
+    /**
+     * 审核-展示
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "iframeDescriptionView")
+    public String iframeDescriptionView(AuditTemplate auditTemplate, Model model) {
+        List<AuditTemplate> auditTemplates=auditTemplateService.findByIdentification(auditTemplate);
+        model.addAttribute("auditTemplates",auditTemplates);
+        return "modules/iframeView/description";
+    }
     /**
      * 审核-备考表
      * @param model

src/main/java/com/jeeplus/modules/projectAccessory/entity/ProjectTemplateInfo.java

@@ -40,6 +40,7 @@ public class ProjectTemplateInfo extends TreeEntity<ProjectTemplateInfo>{
 
 	private String collectFlag;	//判断是否收藏
 	private String fileSize;	//f附件大小
+	private String description;	//文件描述
 
 
 	public ProjectTemplateInfo() {
@@ -226,4 +227,12 @@ public class ProjectTemplateInfo extends TreeEntity<ProjectTemplateInfo>{
 	public void setFileSize(String fileSize) {
 		this.fileSize = fileSize;
 	}
-}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+}

src/main/java/com/jeeplus/modules/projectAccessory/service/ProjectAccessoryService.java

@@ -13,6 +13,7 @@ import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryInfo;
 import com.jeeplus.modules.projectAccessory.entity.ProjectAccessoryTree;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.entity.Workattachment;
 import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
@@ -274,11 +275,15 @@ public class ProjectAccessoryService extends TreeService<ProjectAccessoryDao, Pr
                 }
                 //判断附件信息是否是删除项
                 if (WorkClientAttachment.DEL_FLAG_NORMAL.equals(workClientAttachment.getDelFlag())) {
+                    Workattachment workattachment = null;
+                    if(StringUtils.isNotBlank(workClientAttachment.getId())){
+                        workattachment = workattachmentService.get(workClientAttachment.getId());
+                    }
                     //添加附件信息基本信息
                     workClientAttachment.setAttachmentId(projectAccessory.getId());
                     workClientAttachment.setProjectId(projectAccessory.getProjectId());
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
-                    if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())) {
+                    if (null == workattachment && StringUtils.isNotBlank(workClientAttachment.getUrl())) {
                         //新增附件信息
                         workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
                     } else {

src/main/java/com/jeeplus/modules/projectAccessory/web/ProjectAccessoryController.java

@@ -21,6 +21,7 @@ import com.jeeplus.modules.projectAccessory.service.CollectAccessoryService;
 import com.jeeplus.modules.projectAccessory.service.ProjectAccessoryService;
 import com.jeeplus.modules.projectAccessory.service.ProjectTemplateService;
 import com.jeeplus.modules.projectEngineering.service.ProjectEngineeringService;
+import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
@@ -553,4 +554,15 @@ public class ProjectAccessoryController extends BaseController {
 		model.addAttribute("page", page);
 		return  "modules/sys/collectSelect";
 	}
+
+	/**
+	 * 选择报销项目
+	 */
+	@RequestMapping(value = "getDescription")
+	public String getDescription(String auditOpinion, Model model) {
+		//审核意见模板标识
+		model.addAttribute("identification", "fileDescription");
+		model.addAttribute("auditOpinion",auditOpinion);
+		return "modules/sys/gridselectConsultantDescription";
+	}
 }

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

@@ -2094,6 +2094,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		List<ProjectTemplateInfo> fileAttachmentList = ruralProjectcontentinfo.getFileAttachmentList();
 		List<ProjectTemplateInfo> gistdataList = ruralProjectcontentinfo.getFileGistdataList();
 		List<ProjectTemplateInfo> otherAttachMentList = ruralProjectcontentinfo.getFileOtherList();
+
 		List<ProjectTemplateInfo> attachmentList = disposeDataAttachment(fileAttachmentList);
 		List<ProjectTemplateInfo> gistList = disposeDataAttachment(gistdataList);
 		List<ProjectTemplateInfo> otherList = disposeDataAttachment(otherAttachMentList);
@@ -2124,7 +2125,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 				attach.setAttachTypes(attachment.getType());
 				attach.setCollectFlag(attachment.getCollectFlag());
 				attach.setCreateBy(UserUtils.getUser());
+				attach.setCreateDate(attachment.getCreateDate());
 				attach.setFileSize(attachment.getFileSize());
+				attach.setDescription(attachment.getDescription());
 				//添加临时查看url（阿里云）
 				attach.setTemporaryUrl(attachment.getTemporaryUrl());
 				list.add(attach);

src/main/java/com/jeeplus/modules/sys/service/WorkattachmentService.java

@@ -344,13 +344,15 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 	@Transactional(readOnly = false)
 	public void updateOnWorkClientAttachment(WorkClientAttachment workattachment) {
 		//
-		switch (uploadMode){
-			case "1":
-				workattachment.setUrl(workattachment.getUrl().replace(bosUrl,""));
-				break;
-			case "2":
-				workattachment.setUrl(workattachment.getUrl().replace(aliyunUrl,""));
-				break;
+		if(StringUtils.isNotBlank(workattachment.getUrl())){
+			switch (uploadMode){
+				case "1":
+					workattachment.setUrl(workattachment.getUrl().replace(bosUrl,""));
+					break;
+				case "2":
+					workattachment.setUrl(workattachment.getUrl().replace(aliyunUrl,""));
+					break;
+			}
 		}
 		workattachment.preUpdate();
 		workClientAttachmentDao.update(workattachment);

src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientAttachment.java

@@ -4,9 +4,12 @@
 package com.jeeplus.modules.workclientinfo.entity;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.common.persistence.DataEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 
+import java.util.Date;
+
 /**
  * 添加附件Entity
  * @author mapengbo
@@ -26,6 +29,9 @@ public class WorkClientAttachment extends DataEntity<WorkClientAttachment> {
 	private String temporaryUrl;		// 附件地址(临时地址)
 	private String collectFlag;		// 收藏判定
 	private String fileSize;	//文件大小
+	private String createName;	//创建人
+	private String sort;	//排序
+	private String description;	//说明
 
 	public WorkClientAttachment() {
 		super();
@@ -127,4 +133,28 @@ public class WorkClientAttachment extends DataEntity<WorkClientAttachment> {
 	public void setFileSize(String fileSize) {
 		this.fileSize = fileSize;
 	}
+
+	public String getCreateName() {
+		return createName;
+	}
+
+	public void setCreateName(String createName) {
+		this.createName = createName;
+	}
+
+	public String getSort() {
+		return sort;
+	}
+
+	public void setSort(String sort) {
+		this.sort = sort;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
 }

src/main/resources/mappings/modules/workclientinfo/WorkClientAttachmentDao.xml

@@ -19,6 +19,8 @@
         a.company_id AS "companyId",
         a.file_size AS "fileSize",
         createBy.name AS "createBy.name"
+        ,createBy.name AS "createName"
+        ,a.description AS "description"
     </sql>
 
     <sql id="workClientAttachmentJoins">
@@ -96,6 +98,12 @@
         <if test="projectId != null and projectId != ''">
             ,project_id
         </if>
+        <if test="sort != null and sort != ''">
+            ,sort
+        </if>
+        <if test="description != null and description != ''">
+            ,description
+        </if>
         ,file_size
         ) VALUES (
         #{id},
@@ -115,22 +123,48 @@
         <if test="projectId != null and projectId != ''">
             ,#{projectId}
         </if>
+        <if test="sort != null and sort != ''">
+            ,#{sort}
+        </if>
+        <if test="description != null and description != ''">
+            ,#{description}
+        </if>
         ,#{fileSize}
         )
     </insert>
 
     <update id="update">
         UPDATE work_attachment SET
-        update_by = #{updateBy.id},
-        update_date = #{updateDate},
-        remarks = #{remarks},
-        url = #{url},
-        type = #{type},
-        attachment_flag = #{attachmentFlag},
-        attachment_id = #{attachmentId},
-        attachment_user = #{attachmentUser},
-        attachment_name = #{attachmentName},
-        company_id = #{companyId}
+        update_by = #{updateBy.id}
+        ,update_date = #{updateDate}
+        ,remarks = #{remarks}
+        <if test="url != null and url != ''">
+            ,url = #{url}
+        </if>
+        <if test="type != null and type != ''">
+            ,type = #{type}
+        </if>
+        <if test="attachmentFlag != null and attachmentFlag != ''">
+            ,attachment_flag = #{attachmentFlag}
+        </if>
+        <if test="attachmentId != null and attachmentId != ''">
+            ,attachment_id = #{attachmentId}
+        </if>
+        <if test="attachmentUser != null and attachmentUser != ''">
+            ,attachment_user = #{attachmentUser}
+        </if>
+        <if test="attachmentName != null and attachmentName != ''">
+            ,attachment_name = #{attachmentName}
+        </if>
+        <if test="companyId != null and companyId != ''">
+            ,company_id = #{companyId}
+        </if>
+        <if test="sort != null and sort != ''">
+            ,sort = #{sort}
+        </if>
+        <if test="description != null and description != ''">
+            ,description = #{description}
+        </if>
         WHERE id = #{id}
     </update>
 
@@ -174,7 +208,7 @@
             </if>
         </where>
 
-        ORDER BY a.update_date DESC
+        ORDER BY a.sort,a.update_date DESC
     </select>
 
 
@@ -184,4 +218,4 @@
         WHERE attachment_id = #{attachmentId}
         and project_id = #{projectId}
     </update>
-</mapper>
+</mapper>

src/main/webapp/static/oss/ossupload.js

@@ -153,6 +153,64 @@ function CollectUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPa
             CollectMultitest(client, storeAs, file,attachmentId,attachmentFlag,uploadPath.replace('http://dmtest-test.oss-cn-shanghai.aliyuncs.com', result.AliyunUrl),divId,size, cpt);
     })
 };
+
+
+
+function multipartUploadWithStsOnProcessAccessory(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, fileCount) {
+    file.name.replace(" ","")
+    file.name.replace(/—/g,"")
+    var fileName = file.name;
+    // 将单引号‘’都转换成'，将双引号“”都转换成"
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    // 将中括号【】转换成[]，将大括号｛｝转换成{}
+    fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\｛/g,"(").replace(/\｝/g,")");
+    fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
+    // 将逗号，转换成,，将：转换成:
+    fileName = fileName.replace(/，/g,",").replace(/：/g,":");
+    //将中文——转换为英文-
+    fileName = fileName.replace(/—/g,"-")
+    fileName = fileName.replace(/……/g,"")
+    fileName = fileName.replace(/±/g,"")
+    fileName = fileName.replace(/#/g,"")
+    fileName = fileName.replace(/%/g,"")
+    var dfl=new File([file],fileName,{type:file.type});
+    file = dfl
+
+    requestUrl = realPath+"/previewController/getAccess";
+    OSS.urllib.request(requestUrl, {method: 'GET'}, function (err, response) {
+        if (err) {
+            console.log(err);
+            $.ajax({
+                type:"post",
+                url:realPath+"/previewController/saveJSError",
+                data:{object:err.toString()},
+                async: false,
+                success:function(data){
+                }
+            });
+            return alert(err);
+        }
+        try {
+            result = JSON.parse(response);
+        } catch (e) {
+            errmsg = 'parse sts response info error: ' + e.message;
+            return alert(errmsg);
+        }
+        console.log("---------result"+result);
+        client = new OSS.Wrapper({
+            accessKeyId: result.AccessKeyId,
+            accessKeySecret: result.AccessKeySecret,
+            stsToken: result.SecurityToken,
+            bucket: result.Bucket,
+            endpoint: result.Endpoint,
+            timeout:'30000'
+        });
+        storeAs = "attachment-file/" + storeAs +"/"+today+new Date().getTime()+ file.name;
+        multitestOnProcessAccessory(client, storeAs, file,attachmentId,attachmentFlag,uploadPath.replace('http://dmtest-test.oss-cn-shanghai.aliyuncs.com', result.AliyunUrl),divId,size, fileCount);
+    })
+};
+
+
 function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size, cpt,idx,prefix,currentUser) {
 
     console.log("-----------------------start");
@@ -1327,6 +1385,141 @@ function multitestRecordsReported (ossClient, storeAs, file,attachmentId,attachm
         console.log(err);
     });
 };
+
+
+function multitestOnProcessAccessory (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadPath,divId, size,fileCount) {
+
+    var names =  storeAs.split("/");
+    var name = names[names.length-1];
+    ossClient.multipartUpload(storeAs, file,{
+        partSize: 1 * 1024 * 1024,
+        parallel: 5,
+        progress: function* (percent, cpt) {
+            var p = Math.floor(percent*100);
+            $("#jindutiao"+divId).attr("style","width: "+p+"%");
+            $("#jindutiao"+divId).attr("aria-valuenow",p+"%");
+            $("#baifenbi"+divId).html(p+"%");
+            $("#fileName"+divId).html(file.name);
+            checkpoint_temp = cpt;
+        }
+    }).then(function (result) {
+        var fileLocation = "";
+        var lookUrl = "";
+        //获取文件存储位置（0：本地；1：百度云；2：阿里云）
+        $.ajax({
+            type:"get",
+            url:realPath+"/bos/getFileStorageLocation",
+            async: false,
+            success:function(data){
+                fileLocation = data.fileLocation;
+            }
+        });
+
+        returnUrl = realPath+"/sys/workattachment/saveAttachment";
+        $.ajax({
+            type:'post',
+            url:returnUrl,
+            data:{
+                "attachmentName":file['name'],
+                "attachmentId":attachmentId,
+                "attachmentFlag":attachmentFlag,
+                "fileSize":file['size'],
+                "url":"/"+storeAs
+            },
+            success:function(data){
+                var lowerType = data.type.toLowerCase();
+                if(data.status=="Success"){
+                    parent.layer.msg("上传成功！",{icon:1});
+                    var lenght =$(".trIdAdds").length;
+                    if(parseInt(fileCount) == parseInt(lenght)){
+
+                    }else{
+                        lenght = parseInt(fileCount);
+                    }
+                    if (size != 0){
+                        lenght += size;
+                    }
+                    var sort = parseInt(fileCount)+1;
+                    var addFile = "addFile"+divId;
+                    var str = '<tr class="trIdAdds">'+
+                        '<td class="text-center">' ;
+                    if(2 == fileLocation){
+                        $.ajax({
+                            type:"post",
+                            async:false,
+                            url:realPath+"/workfullmanage/workFullManage/getFileTemporaryLookUrl",
+                            data:{"file":data.url,},
+                            success:function(result){
+                                lookUrl = result.lookUrl;
+                                if (isContains("jpg,png,gif,bmp,jpeg",lowerType)){
+                                    str = str +'<img src="'+lookUrl+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/picturePreview?url=' +lookUrl+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
+                                }else if(isContains("pdf",lowerType)){
+                                    str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',1)">'+data.attachmentName+'</a>';
+                                }else if(isContains("rar,zip,jar,7z",lowerType)){
+                                    str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',3)">'+data.attachmentName+'</a>';
+                                }else if(isContains("avi,wmv,mpg,mpeg,mov,rm,ram,swf,flv,mp4,rmvb",lowerType)){
+                                    str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/videoPreview?url=' +lookUrl+ '\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
+                                }else {
+                                    str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',2)">'+data.attachmentName+'</a>';
+                                }
+                            }
+                        });
+
+                    }else{
+                        if (isContains("jpg,png,gif,bmp,jpeg",lowerType)){
+                            str = str +'<img src="'+data.url+'" width="50" height="50" onclick="openDialogView(\'预览\',\''+realPath+ '/a/sys/picturepreview/picturePreview?url=' +data.url+ '\',\'90%\',\'90%\')" alt="'+data.attachmentName+'"/>';
+                        }else if(isContains("pdf",lowerType)){
+                            str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',1)">'+data.attachmentName+'</a>';
+                        }else if(isContains("rar,zip,jar,7z",lowerType)){
+                            str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',3)">'+data.attachmentName+'</a>';
+                        }else if(isContains("avi,wmv,mpg,mpeg,mov,rm,ram,swf,flv,mp4,rmvb",lowerType)){
+                            str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openDialogView(\'预览\',\''+ '/a/sys/picturepreview/videoPreview?url=' +lookUrl+ '\',\'90%\',\'90%\')">'+data.attachmentName+'</a>';
+                        }else {
+                            str = str + '<a class="attention-info" href="javascript:void(0)" onclick="openPreview(\''+data.url+'\',2)">'+data.attachmentName+'</a>';
+                        }
+                    }
+                    str = str +'</td>'+
+                        '<td >'+data.createByName+'</td>'+
+                        '<td >'+data.createDate+
+                        '<input name="workAttachments['+sort+'].id" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value=""/>'+
+                        '<input name="workAttachments['+sort+'].attachmentId" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.attachmentId+'"/>'+
+                        '<input name="workAttachments['+sort+'].url" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.url+'"/>'+
+                        '<input name="workAttachments['+sort+'].temporaryUrl" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.temporaryUrl+'"/>'+
+                        '<input name="workAttachments['+sort+'].attachmentName" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.attachmentName+'"/>'+
+                        '<input name="workAttachments['+sort+'].createBy.id" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.createBy+'"/>'+
+                        '<input name="workAttachments['+sort+'].type" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.type+'"/>'+
+                        '<input name="workAttachments['+sort+'].attachmentFlag" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.attachmentFlag+'"/>'+
+                        '<input name="workAttachments['+sort+'].fileSize" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+data.fileSize+'"/>'+
+                        '<input id="workAttachments'+sort+'_sort" name="workAttachments['+sort+'].sort" type="hidden" readonly="readonly" maxlength="20" style="width:140px;" class="form-control" value="'+sort+'"/>'+
+                        '</td>'+
+                        '<td style="padding:0px">'+'<input id="workAttachments'+sort+'_description" name="workAttachments['+sort+'].description" type="text" readonly="readonly" maxlength="250" class="form-control layui-input" required  placeholder="请输入文件描述" onclick="openInfo(\'workAttachments'+sort+'\',this.value)" style="width: 100%;height: 100%;padding:0px;background-color: #FFFFFF;" />'+'</td>'+
+                        '<td class="op-td">'+
+                        '<div class="op-btn-box">';
+                    if(2 == fileLocation){
+                        if(isContains("pdf",lowerType)){
+                            str = str +'<a href="'+lookUrl+'" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
+                        }else{
+                            str = str +'<a href="'+lookUrl+'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
+                        }
+                    }else{
+                        str = str +'<a href="javascript:location.href=\''+realPath+'/a/workfullmanage/workFullManage/downLoadAttach?file=\'+encodeURIComponent(\''+data.url+'\');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
+                    }
+                    str = str + '<a href="javascript:void(0)" onclick="ossCollectingAccessory(this,\''+realPath+'/projectAccessory/projectAccessory/saveCollectAccessory?url='+data.url+'&fileName='+data.attachmentName+'\',\''+addFile+'\',\''+data.createBy+'\')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>'+
+                        '<a href="javascript:void(0)" onclick="deleteFileFromAliyun1(this,\''+realPath+'/a/sys/workattachment/deleteFileFromAliyun?url='+encodeURIComponent(data.url)+'&id='+data.id+'&type=2\',\''+addFile+'\',\''+divId+'\')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>'+
+                        '</div>' +
+                        '</td>'+
+                        '</tr>';
+                    $("#file"+divId).append(str);
+                }else {
+                    parent.layer.msg("上传失败！",{icon:2});
+                }
+            }
+        })
+    }).catch(function (err) {
+        console.log("err------ err:");
+        console.log(err);
+    });
+};
 function ossCollectingAccessory(obj,url,id,uploadUserId){
     $.ajax({
         type:"post",

src/main/webapp/webpage/modules/act/actTaskHistoricFlow.jsp

@@ -19,7 +19,7 @@
 <script>
 	function readOpenInfo(value) {
 		layer.open({
-			title: '意见',
+			title: '内容',
 			btn: ['关闭'],
 			content: value
 		});
@@ -225,4 +225,4 @@
 <%--</td>--%>
 <%--</tr>--%>
 <%--</c:forEach>--%>
-<%--</table>--%>
+<%--</table>--%>

src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineView.jsp

@@ -1757,7 +1757,7 @@
 	}
 	function readOpenInfo(value) {
 		layer.open({
-			title: '意见',
+			title: '内容',
 			btn: ['关闭'],
 			content: value
 		});

src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineform.jsp

@@ -1814,7 +1814,7 @@
 	}
 	function readOpenInfo(value) {
 		layer.open({
-			title: '意见',
+			title: '内容',
 			btn: ['关闭'],
 			content: value
 		});

src/main/webapp/webpage/modules/iframeView/description.jsp

@@ -0,0 +1,92 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+    <title>Title</title>
+    <script src="${ctxStatic}/iSignature/js/jquery-1.4.2.min.js"></script>
+    <script src="${ctxStatic}/layer-v2.3/laydate/laydate.js"></script>
+    <link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+    <script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+    <link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+</head>
+<body>
+<div class="single-form">
+    <div class="container">
+        <form class="layui-form">
+            <div class="form-group layui-row">
+                <div class="layui-item layui-col-sm8 lw6 with-textarea">
+                    <div class="layui-input-block" style="margin-left:10px;position: relative">
+                        <textarea placeholder="请输入文件描述：" path="" id="opinion" class="form-control" rows="4" style="width: 100%;height: 80%;border: 1px solid #f1f1f1;padding: 5px;" maxlength="245"></textarea>
+                        <a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
+                        <input type="file" name="upload_files" style="display: none;">
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm4 lw6 with-textarea">
+                    <div class="layui-input-block" style="margin-left:10px;">
+                        <div style="padding: 5px 0px;" class="layui-col-sm8">
+                            <select id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
+                                <option value=""></option>
+                                <c:forEach items="${auditTemplates}" var="var">
+                                    <option value="${var.content}">${var.content}</option>
+                                </c:forEach>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+<script>
+    function opinion(){
+        var op=$("opinion").val();
+        return op;
+    }
+    $(document).ready(function() {
+        var val = parent.document.getElementById("iframe").innerHTML;
+        if (val!=''){
+            $("#opinion").val(val)
+        }
+
+        $("#clearOpinon").click(function(){
+            var s=$("input[name='sh']").length;
+            for(var i=0;i<s;i++){
+                $("input[name='sh']").attr("checked",false)
+                layui.form.render();
+            }
+            $("#opinion").val("");
+            window.parent.f1("");
+        })
+        layui.use(['form', 'layer'], function () {
+            var form = layui.form;
+            //下拉框监听器
+            layui.form.on('select(opinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    var opinion=$("#opinion").val()+span
+                    if (opinion.length<250){
+                        $("#opinion").val(opinion);
+                        window.parent.f1(opinion);
+                    }else if (opinion.length>=250){
+                        top.layer.msg('文件描述长度不能大于250字符！', {icon: 0});
+                    }
+                }
+            });
+            layui.form.on('checkbox(raopinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    $(this).attr("checked",false)
+                    var opinion=$("#opinion").val()+span
+                    if (opinion.length<250){
+                        $("#opinion").val(opinion);
+                        window.parent.f1(opinion);
+                    }else if (opinion.length>=250){
+                        top.layer.msg('文件描述长度不能大于250字符！', {icon: 0});
+                    }
+                }
+            });
+        });
+    });
+</script>
+</body>
+</html>

src/main/webapp/webpage/modules/projectAccessory/workAttachmentForm.jsp

@@ -30,9 +30,38 @@
 					}
 				}
 			});
+			var attachmentFile = $("#file_attachment tr").length;
+			$("#fileCount").val(attachmentFile);
+			for(var i = 0 ; i<attachmentFile; i++){
+
+				let val = $("#file_attachment").find("tr").eq(i).find("input").eq(0).attr("name");
+				$("#"+val+"sort").val(i+1);
+			}
+
 			$("#attachment_btn").click(function () {
 				$("#attachment_file").click();
 			});
+
+			//文件行拖拽功能
+			$("#upTable tbody").sortable({
+				helper: fixHelperModified,
+				stop: updateIndex,
+				update : function(event, ui){       //更新排序之后
+					var attachmentFile = $("#file_attachment tr").length;
+					for(var i = 0 ; i<attachmentFile; i++){
+						let val = $("#file_attachment").find("tr").eq(i).find("input").eq(0).attr("name");
+						if(val.indexOf("[") != -1){
+							var number = val.substring(val.indexOf("[")+1,val.indexOf("[")+2);
+							console.log($("#workAttachments"+number+"_sort").val())
+							$("#workAttachments"+number+"_sort").val(i+1);
+						}else{
+							$("#"+val+"sort").val(i+1);
+						}
+
+					}
+
+				}
+			}).disableSelection();
 		});
 
 		function insertTitle(tValue){
@@ -85,7 +114,9 @@
 				var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
 				var divId = "_attachment";
 				$("#addFile"+divId).show();
-				multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size);}
+				var fileCount = $("#fileCount").val();
+				$("#fileCount").val(parseInt(fileCount)+1);
+				multipartUploadWithStsOnProcessAccessory(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size,fileCount);}
 		}
 
 		function insertTitleCollection(tValue){
@@ -156,6 +187,56 @@
 			}
 			return xia;
 		}
+
+		//文件行拖拽方法
+		var fixHelperModified = function(e, tr) {
+			var $originals = tr.children();
+			var $helper = tr.clone();
+			$helper.children().each(function(index) {
+				$(this).width($originals.eq(index).width())
+			});
+			return $helper;
+		},
+
+		//文件行拖拽方法
+		updateIndex = function(e, ui) {
+			$('td.index', ui.item.parent()).each(function (i) {
+				$(this).html(i + 1);
+			});
+		};
+
+		function ceshi() {
+			alert(1);
+		}
+
+		function openInfo(id,value) {
+			console.log(id);
+			top.layer.open({
+				type: 2,
+				area: ['80%','65%'],
+				title:"意见",
+				name:'friend',
+				skin:"two-btns",
+				content: encodeURI("${ctx}/projectAccessory/projectAccessory/getDescription?auditOpinion="+value),
+				btn: ['确定', '关闭'],
+				yes: function(index, layero){
+					var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象，执行iframe页的方法：iframeWin.method();
+					var item = iframeWin.getSelectedItem();
+					console.log(item);
+					if(item == "-1"){
+						return;
+					}
+					var items = item.split('_item_');
+					console.log(items)
+					console.log(id)
+
+					$("#"+id+"_description").val(items[1]);
+					top.layer.close(index);//关闭对话框。
+				},
+				cancel: function(index){
+				}
+			});
+		}
 	</script>
 </head>
 <body>
@@ -166,6 +247,7 @@
 			<form:hidden path="projectId"/>
 			<form:hidden path="attachTypes"/>
 			<form:hidden path="attachLength"/>
+			<input type="hidden" id="fileCount" value="">
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>附件信息</h2></div>
 				<div class="layui-item nav-btns">
@@ -190,15 +272,18 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="50%">文件预览</th>
-							<th>上传人</th>
-							<th>上传时间</th>
+							<th width="30%">文件预览</th>
+							<th width="80px">上传人</th>
+							<th width="160px">上传时间</th>
+							<th width="30%" ><span style="color: red">* </span>文件描述</th>
 							<th width="200px">操作</th>
+							<th class="hide"></th>
 						</tr>
 						</thead>
 						<tbody id="file_attachment">
 						<c:forEach items="${projectTemplateInfo.workAttachments}" var = "workClientAttachment" varStatus="status">
-							<tr>
+							<tr class="attachmentClass${status.index} trIdAdds">
+								<input type="hidden" id="workAttachments${status.index + 1}_" name="workAttachments${status.index + 1}_" value="${workClientAttachment.id}" />
 									<%-- <td>${status.index + 1}</td>--%>
 										<c:choose>
 											<c:when test="${projectTemplateInfo.uploadMode == 2}">
@@ -247,6 +332,7 @@
 
 								<td>${workClientAttachment.createBy.name}</td>
 								<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+								<td style="padding:0px"><input id="workAttachments${status.index + 1}_description" name="workAttachments[${status.index + 1}].description" type="text" value="${workClientAttachment.description}"  class="form-control layui-input required" placeholder="请输入文件描述" style="width: 100%;height: 100%;padding:0px;background-color: #FFFFFF;" readonly="true" onclick="openInfo('workAttachments${status.index + 1}',this.value)"/></td>
 								<td class="op-td">
 									<div class="op-btn-box" >
 										<span>
@@ -267,6 +353,10 @@
 
 									</div>
 								</td>
+								<td class="hide">
+									<input id="workAttachments${status.index + 1}_id" name="workAttachments[${status.index + 1}].id" type="hidden" value="${workClientAttachment.id}"/>
+									<input id="workAttachments${status.index + 1}_sort" name="workAttachments[${status.index + 1}].sort" type="hidden" value="${workClientAttachment.sort}"/>
+								</td>
 							</tr>
 						</c:forEach>
 						</tbody>

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

@@ -1185,10 +1185,12 @@
 							<table id="upTable" class="table table-bordered table-condensed">
 								<thead>
 								<tr>
-									<th width="30%">文件类型</th>
-									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</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">
@@ -1213,7 +1215,7 @@
 											<c:choose>
 												<c:when test="${fileAttachment.flag == 0}">
 													<%--															<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-													<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+													<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>
@@ -1284,6 +1286,26 @@
 												</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>
@@ -1341,10 +1363,12 @@
 							<table id="gistdata_upTable" class="table table-bordered table-condensed">
 								<thead>
 								<tr>
-									<th width="30%">文件类型</th>
-									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</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">
@@ -1370,7 +1394,7 @@
 											<c:choose>
 												<c:when test="${fileGistdata.flag == 0}">
 													<%--																	<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-													<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+													<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>
@@ -1441,6 +1465,25 @@
 												</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>
@@ -1500,10 +1543,12 @@
 							<table id="upTable_other" class="table table-bordered table-condensed">
 								<thead>
 								<tr>
-									<th width="30%">文件类型</th>
-									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</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">
@@ -1529,7 +1574,7 @@
 											<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>
 												</c:when>
 												<c:otherwise>
 													<c:choose>
@@ -1600,6 +1645,26 @@
 												</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>

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

@@ -360,11 +360,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
-							<th width="150px">操作</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">
@@ -382,8 +383,11 @@
 								</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><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>
 								</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>
@@ -438,6 +442,14 @@
 											</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">${workClientAttachment.fileSize}</td>
 <%--									<td>--%>
 <%--										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
 <%--									</td>--%>
@@ -489,11 +501,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
-							<th width="150px">操作</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">
@@ -513,8 +526,11 @@
 <%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>--%>
 <%--								<td></td>--%>
 								<td>
-									<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>
 								</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>
@@ -573,6 +589,14 @@
 <%--									<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" >
 												<%--附件下载删除--%>
@@ -621,11 +645,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="40%">电子件名称</th>
-<%--							<th width="100px">最大容量(M)</th>--%>
-							<th width="">类型限制</th>
-<%--							<th>文件名</th>--%>
-							<th width="150px">操作</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">
@@ -644,8 +669,11 @@
 								</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><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>
 								</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>
@@ -704,6 +732,14 @@
 <%--									<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" >
 												<%--附件下载删除--%>

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

@@ -391,10 +391,12 @@
 					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -412,9 +414,11 @@
 								</c:choose>
 								<td>
 										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+											<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>
@@ -490,6 +494,12 @@
 											</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>
@@ -566,10 +576,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -588,9 +600,11 @@
 								</c:choose>
 								<td>
 										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+											<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>
@@ -666,6 +680,12 @@
 											</c:choose>
 										</c:otherwise>
 									</c:choose>
+									<td class="op-td" style="white-space:normal; word-break:break-all;overflow:hidden;" 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>
@@ -742,10 +762,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -764,9 +786,11 @@
 								</c:choose>
 								<td>
 										<%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+											<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>
@@ -842,6 +866,12 @@
 											</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>

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

@@ -668,6 +668,14 @@
 			obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
 			obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
 		}
+
+		function readOpenInfo(value) {
+			layer.open({
+				title: '内容',
+				btn: ['关闭'],
+				content: value
+			});
+		}
 	</script>
 </head>
 <body>
@@ -1295,9 +1303,11 @@
 					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th>文件描述/文件</th>
-							<th width="100px">文件大小(M)</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>
@@ -1316,9 +1326,11 @@
 								</c:choose>
 								<td>
 <%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+									<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=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -1395,6 +1407,13 @@
 									</c:otherwise>
 									</c:choose>
 <%--										<a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a>--%>
+									<td class="op-td" 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" >
@@ -1474,9 +1493,11 @@
 					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th >文件描述/文件</th>
-							<th width="100px">文件大小(M)</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>
@@ -1496,9 +1517,11 @@
 								</c:choose>
 								<td>
 <%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+	<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=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','gistdata_upTable')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -1575,6 +1598,12 @@
 										</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>
@@ -1657,9 +1686,11 @@
 					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th>文件描述/文件</th>
-							<th width="100px">文件大小(M)</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>
@@ -1679,9 +1710,11 @@
 								</c:choose>
 								<td>
 <%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+	<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=${projectRecords.id}&uploadMode=${projectcontentinfo.uploadMode}','70%','80%',false,'inputForm','upTable_other')" class="op-btn op-btn-edit" ><i class="fa fa-edit"></i> 编辑</a>
@@ -1756,6 +1789,12 @@
 											</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>${workClientAttachment.fileSize}</td>
 								<%--									<td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workAttachment.url}','90%','90%')">${workAttachment.attachmentName} ; </a></td>--%>
 									<td class="op-td">

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

@@ -1166,9 +1166,11 @@
 					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th>文件描述/文件</th>
-							<th width="100px">文件大小(M)</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>
@@ -1188,9 +1190,11 @@
 								</c:choose>
 								<td>
 <%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+	<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>
@@ -1267,6 +1271,12 @@
 										</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>
@@ -1333,9 +1343,11 @@
 					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th>文件描述/文件</th>
-							<th width="100px">文件大小(M)</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>
@@ -1355,9 +1367,11 @@
 								</c:choose>
 								<td>
 <%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+	<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>
@@ -1412,6 +1426,12 @@
 										</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>
@@ -1478,9 +1498,11 @@
 					<table id="upTable_other" class="table table-bordered table-condensed  tree_table">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th>文件描述/文件</th>
-							<th width="100px">文件大小(M)</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>
@@ -1500,9 +1522,11 @@
 								</c:choose>
 								<td>
 <%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+	<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>
@@ -1556,6 +1580,12 @@
 										</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>

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

@@ -384,7 +384,13 @@
                 }
             })
         }
-
+		function readOpenInfo(value) {
+			layer.open({
+				title: '内容',
+				btn: ['关闭'],
+				content: value
+			});
+		}
 	</script>
 </head>
 <body>
@@ -422,10 +428,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="100px">操作</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">
@@ -450,7 +458,7 @@
 									<c:choose>
 										<c:when test="${fileAttachment.flag == 0}">
 <%--											<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-											<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+											<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>
@@ -521,6 +529,29 @@
 										</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>
@@ -610,10 +641,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="100px">操作</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">
@@ -639,7 +672,7 @@
 									<c:choose>
 										<c:when test="${fileGistdata.flag == 0}">
 <%--											<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-											<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+											<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>
@@ -710,6 +743,25 @@
 										</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>
@@ -798,10 +850,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="100px">操作</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">
@@ -827,7 +881,7 @@
 											<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>
 												</c:when>
 												<c:otherwise>
 													<c:choose>
@@ -898,6 +952,24 @@
 												</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>

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

@@ -250,10 +250,12 @@
 					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -271,9 +273,11 @@
 								</c:choose>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+	<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>
@@ -349,6 +353,12 @@
 											</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>
@@ -425,10 +435,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-								<th width="30%">文件类型</th>
-								<th width="">文件描述/文件</th>
-								<th width="100px">文件大小(M)</th>
-								<th width="150px">操作</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">
@@ -447,9 +459,11 @@
 								</c:choose>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+	<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>
@@ -525,6 +539,12 @@
 											</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>
@@ -601,10 +621,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -623,9 +645,11 @@
 								</c:choose>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+	<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>
@@ -701,6 +725,12 @@
 											</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>

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

@@ -1318,10 +1318,12 @@
 							<table id="upTable" class="table table-bordered table-condensed">
 								<thead>
 								<tr>
-									<th width="30%">文件类型</th>
-									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</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">
@@ -1346,7 +1348,7 @@
 											<c:choose>
 												<c:when test="${fileAttachment.flag == 0}">
 													<%--															<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-													<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+													<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>
@@ -1417,6 +1419,28 @@
 												</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>
@@ -1474,10 +1498,12 @@
 							<table id="gistdata_upTable" class="table table-bordered table-condensed">
 								<thead>
 								<tr>
-									<th width="30%">文件类型</th>
-									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</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">
@@ -1503,7 +1529,7 @@
 											<c:choose>
 												<c:when test="${fileGistdata.flag == 0}">
 													<%--																	<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-													<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+													<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>
@@ -1574,6 +1600,26 @@
 												</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>
@@ -1633,10 +1679,12 @@
 							<table id="upTable_other" class="table table-bordered table-condensed">
 								<thead>
 								<tr>
-									<th width="30%">文件类型</th>
-									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</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">
@@ -1662,7 +1710,7 @@
 											<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>
 												</c:when>
 												<c:otherwise>
 													<c:choose>
@@ -1733,6 +1781,25 @@
 												</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>
@@ -2125,7 +2192,7 @@
 	}
 	function readOpenInfo(value) {
 		layer.open({
-			title: '意见',
+			title: '内容',
 			btn: ['关闭'],
 			content: value
 		});

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

@@ -153,6 +153,13 @@
             $("#addFile"+divId).show();
             multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size);}
         }
+		function readOpenInfo(value) {
+			layer.open({
+				title: '内容',
+				btn: ['关闭'],
+				content: value
+			});
+		}
 	</script>
 </head>
 <body>
@@ -249,10 +256,12 @@
 					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -270,9 +279,11 @@
 								</c:choose>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+	<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>
@@ -348,6 +359,12 @@
 											</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>
@@ -424,10 +441,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-								<th width="30%">文件类型</th>
-								<th width="">文件描述/文件</th>
-								<th width="100px">文件大小(M)</th>
-								<th width="150px">操作</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">
@@ -446,9 +465,11 @@
 								</c:choose>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+	<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>
@@ -524,6 +545,12 @@
 											</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>
@@ -600,10 +627,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -622,9 +651,11 @@
 								</c:choose>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+	<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>
@@ -700,6 +731,12 @@
 											</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>

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

@@ -263,10 +263,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -285,9 +287,11 @@
 <%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>--%>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+	<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>
@@ -365,6 +369,12 @@
 <%--									<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" style="text-align:center;">
 											${workClientAttachment.fileSize}
 									</td>
@@ -416,10 +426,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -440,9 +452,11 @@
 <%--								<td></td>--%>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+	<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>
@@ -521,7 +535,12 @@
 <%--									<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" style="text-align:center;">
 											${workClientAttachment.fileSize}
 									</td>
@@ -573,10 +592,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -596,9 +617,11 @@
 <%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>--%>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+	<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>
@@ -677,8 +700,13 @@
 <%--									<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" style="text-align:center;">
 											${workClientAttachment.fileSize}
 									</td>
 									<td class="op-td">

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

@@ -645,10 +645,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-									<th width="30%">文件类型</th>
-									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</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">
@@ -666,9 +668,11 @@
 								</c:choose>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+	<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>
@@ -743,6 +747,12 @@
 											</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>
@@ -822,10 +832,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-									<th width="30%">文件类型</th>
-									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</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">
@@ -844,9 +856,11 @@
 								</c:choose>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+	<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" >
@@ -923,6 +937,12 @@
 											</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>
@@ -1003,10 +1023,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-									<th width="30%">文件类型</th>
-									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</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">
@@ -1025,9 +1047,11 @@
 								</c:choose>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+	<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>
@@ -1103,6 +1127,12 @@
 											</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>

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

@@ -620,10 +620,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -642,9 +644,11 @@
 <%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>--%>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+	<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>
@@ -722,6 +726,12 @@
 <%--									<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" style="text-align:center;">
 											${workClientAttachment.fileSize}
 									</td>
@@ -773,10 +783,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -797,9 +809,11 @@
 <%--								<td></td>--%>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+	<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>
@@ -878,7 +892,12 @@
 <%--									<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" style="text-align:center;">
 											${workClientAttachment.fileSize}
 									</td>
@@ -930,10 +949,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -953,9 +974,11 @@
 <%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>--%>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+	<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>
@@ -1034,8 +1057,13 @@
 <%--									<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" style="text-align:center;">
 											${workClientAttachment.fileSize}
 									</td>
 									<td class="op-td">

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

@@ -444,10 +444,12 @@
 									<table id="upTable" class="table table-bordered table-condensed">
 										<thead>
 										<tr>
-											<th width="30%">文件类型</th>
-											<th width="">文件描述/文件</th>
-											<th width="100px">文件大小(M)</th>
-											<th width="150px">操作</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">
@@ -472,7 +474,7 @@
 													<c:choose>
 														<c:when test="${fileAttachment.flag == 0}">
 <%--															<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-															<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+															<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>
@@ -543,6 +545,29 @@
 														</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>
@@ -600,10 +625,12 @@
 									<table id="gistdata_upTable" class="table table-bordered table-condensed">
 										<thead>
 										<tr>
-											<th width="30%">文件类型</th>
-											<th width="">文件描述/文件</th>
-											<th width="100px">文件大小(M)</th>
-											<th width="150px">操作</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">
@@ -629,7 +656,7 @@
 															<c:choose>
 																<c:when test="${fileGistdata.flag == 0}">
 <%--																	<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-																	<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+																	<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>
@@ -700,6 +727,26 @@
 																</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>
@@ -759,10 +806,12 @@
 									<table id="upTable_other" class="table table-bordered table-condensed">
 										<thead>
 										<tr>
-											<th width="30%">文件类型</th>
-											<th width="">文件描述/文件</th>
-											<th width="100px">文件大小(M)</th>
-											<th width="150px">操作</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">
@@ -788,7 +837,7 @@
 															<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>
 																</c:when>
 																<c:otherwise>
 																	<c:choose>
@@ -859,6 +908,26 @@
 																</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>

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

@@ -262,10 +262,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -284,9 +286,11 @@
 <%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileAttachment.attachName}<input type="hidden" value="${fileAttachment.attachName}"/></td>--%>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+	<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>
@@ -364,6 +368,12 @@
 <%--									<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" style="text-align:center;">
 											${workClientAttachment.fileSize}
 									</td>
@@ -415,10 +425,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -439,9 +451,11 @@
 <%--								<td></td>--%>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+	<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>
@@ -520,7 +534,12 @@
 <%--									<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" style="text-align:center;">
 											${workClientAttachment.fileSize}
 									</td>
@@ -572,10 +591,12 @@
 						<thead>
 						<tr>
 								<%-- <th>序号</th>--%>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</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">
@@ -595,9 +616,11 @@
 <%--								<td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>--%>
 								<td>
 <%--									<div><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+	<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>
@@ -676,8 +699,13 @@
 <%--									<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" style="text-align:center;">
 											${workClientAttachment.fileSize}
 									</td>
 									<td class="op-td">

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

@@ -412,10 +412,12 @@
 									<table id="upTable" class="table table-bordered table-condensed">
 										<thead>
 										<tr>
-											<th width="30%">文件类型</th>
-											<th width="">文件描述/文件</th>
-											<th width="100px">文件大小(M)</th>
-											<th width="150px">操作</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">
@@ -440,7 +442,7 @@
 													<c:choose>
 														<c:when test="${fileAttachment.flag == 0}">
 <%--															<div><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-															<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+															<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>
@@ -511,6 +513,27 @@
 														</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>
@@ -568,10 +591,12 @@
 									<table id="gistdata_upTable" class="table table-bordered table-condensed">
 										<thead>
 										<tr>
-											<th width="30%">文件类型</th>
-											<th width="">文件描述/文件</th>
-											<th width="100px">文件大小(M)</th>
-											<th width="150px">操作</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">
@@ -597,7 +622,7 @@
 															<c:choose>
 																<c:when test="${fileGistdata.flag == 0}">
 <%--																	<div><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-																	<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+																	<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>
@@ -668,6 +693,25 @@
 																</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>
@@ -727,10 +771,12 @@
 									<table id="upTable_other" class="table table-bordered table-condensed">
 										<thead>
 										<tr>
-											<th width="30%">文件类型</th>
-											<th width="">文件描述/文件</th>
-											<th width="100px">文件大小(M)</th>
-											<th width="150px">操作</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">
@@ -756,7 +802,7 @@
 															<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>
 																</c:when>
 																<c:otherwise>
 																	<c:choose>
@@ -827,6 +873,24 @@
 																</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>

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

@@ -1278,10 +1278,12 @@
 							<table id="upTable" class="table table-bordered table-condensed">
 								<thead>
 								<tr>
-									<th width="30%">文件类型</th>
-									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</th>
+									<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">
@@ -1306,7 +1308,7 @@
 											<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>
 
@@ -1378,6 +1380,26 @@
 												</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" >
@@ -1431,10 +1453,12 @@
 							<table id="gistdata_upTable" class="table table-bordered table-condensed">
 								<thead>
 								<tr>
-									<th width="30%">文件类型</th>
-									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</th>
+									<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">
@@ -1460,7 +1484,7 @@
 											<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>
@@ -1531,6 +1555,24 @@
 												</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>
@@ -1588,10 +1630,12 @@
 							<table id="upTable_other" class="table table-bordered table-condensed tree_table">
 								<thead>
 								<tr>
-									<th width="30%">文件类型</th>
-									<th width="">文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</th>
+									<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">
@@ -1617,7 +1661,7 @@
 											<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>
 												</c:when>
 												<c:otherwise>
 													<c:choose>
@@ -1688,6 +1732,24 @@
 												</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>
@@ -1969,7 +2031,7 @@
 	}
 	function readOpenInfo(value) {
 		layer.open({
-			title: '意见',
+			title: '内容',
 			btn: ['关闭'],
 			content: value
 		});

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

@@ -1305,10 +1305,12 @@
 							<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>
+									<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">
@@ -1333,7 +1335,7 @@
 											<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>
 
@@ -1385,6 +1387,27 @@
 												</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>
@@ -1440,10 +1463,12 @@
 							<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>
+									<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">
@@ -1469,7 +1494,7 @@
 											<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>
@@ -1520,6 +1545,26 @@
 												</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>
@@ -1577,10 +1622,12 @@
 							<table id="upTable_other" class="table table-bordered table-condensed tree_table">
 								<thead>
 								<tr>
-									<th width="30%">文件类型</th>
-									<th >文件描述/文件</th>
-									<th width="100px">文件大小(M)</th>
-									<th width="150px">操作</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">
@@ -1606,7 +1653,7 @@
 											<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>
 												</c:when>
 												<c:otherwise>
 													<c:choose>
@@ -1657,6 +1704,25 @@
 												</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>
@@ -1936,7 +2002,7 @@
 
 	function readOpenInfo(value) {
 		layer.open({
-			title: '意见',
+			title: '内容',
 			btn: ['关闭'],
 			content: value
 		});

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

@@ -354,6 +354,13 @@
             obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
             obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
         }
+        function readOpenInfo(value) {
+            layer.open({
+                title: '内容',
+                btn: ['关闭'],
+                content: value
+            });
+        }
     </script>
 </head>
 <body >
@@ -885,9 +892,11 @@
                     <table id="upTable" class="table table-bordered table-condensed tree_table">
                         <thead>
                         <tr>
-                            <th width="30%">文件类型</th>
-                            <th >文件描述/文件</th>
-                            <th width="100px">文件大小(M)</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>
@@ -907,9 +916,11 @@
 <%--                                    <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><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>
                                     </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>
@@ -985,6 +996,12 @@
                                         </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>
@@ -1035,9 +1052,11 @@
                     <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="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>
@@ -1057,9 +1076,11 @@
 <%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>--%>
                                     <td>
 <%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-                                        <div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+    <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>
@@ -1136,6 +1157,12 @@
                                         </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>
@@ -1186,9 +1213,11 @@
                     <table id="upTable_other" class="table table-bordered table-condensed tree_table">
                         <thead>
                         <tr>
-                            <th width="30%">文件类型</th>
-                            <th >文件描述/文件</th>
-                            <th width="100px">文件大小(M)</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>
@@ -1208,9 +1237,11 @@
 <%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>--%>
                                     <td>
 <%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-                                        <div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+    <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>
@@ -1287,6 +1318,12 @@
                                         </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>

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

@@ -587,9 +587,11 @@
                     <table id="upTable" class="table table-bordered table-condensed tree_table">
                         <thead>
                         <tr>
-                            <th width="30%">文件类型</th>
-                            <th >文件描述/文件</th>
-                            <th width="100px">文件大小(M)</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>
@@ -609,9 +611,11 @@
 <%--                                    <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><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>
                                     </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>
@@ -667,6 +671,12 @@
                                         </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>
@@ -717,9 +727,11 @@
                     <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="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>
@@ -739,9 +751,11 @@
 <%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileGistdata.attachName}<input type="hidden" value="${fileGistdata.attachName}"/></td>--%>
                                     <td>
 <%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-                                        <div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+    <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>
@@ -798,6 +812,12 @@
                                         </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>
@@ -848,9 +868,11 @@
                     <table id="upTable_other" class="table table-bordered table-condensed tree_table">
                         <thead>
                         <tr>
-                            <th width="30%">文件类型</th>
-                            <th >文件描述/文件</th>
-                            <th width="100px">文件大小(M)</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>
@@ -870,9 +892,11 @@
 <%--                                    <td class="tabMove" style="text-align: left;"><span class='default_open' style="padding-right: 15px; "></span>${fileOther.attachName}<input type="hidden" value="${fileOther.attachName}"/></td>--%>
                                     <td>
 <%--                                        <div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-                                        <div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+    <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>
@@ -929,6 +953,12 @@
                                         </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>

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

@@ -593,6 +593,13 @@
 			obj.value = obj.value.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
 			obj.value = obj.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3'); //只能输入两个小数
 		}
+		function readOpenInfo(value) {
+			layer.open({
+				title: '内容',
+				btn: ['关闭'],
+				content: value
+			});
+		}
 	</script>
 </head>
 <body>
@@ -1227,9 +1234,11 @@
 					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th >文件描述/文件</th>
-							<th width="100px">文件大小(M)</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>
@@ -1248,9 +1257,11 @@
 								</c:choose>
 								<td>
 <%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+	<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>
@@ -1326,6 +1337,12 @@
 										</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>
@@ -1408,9 +1425,11 @@
 					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr >
-							<th width="30%">文件类型</th>
-							<th >文件描述/文件</th>
-							<th width="100px">文件大小(M)</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>
@@ -1430,9 +1449,11 @@
 								</c:choose>
 								<td>
 <%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+	<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>
@@ -1508,6 +1529,12 @@
 										</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>
@@ -1590,9 +1617,11 @@
 					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th >文件描述/文件</th>
-							<th width="100px">文件大小(M)</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>
@@ -1612,9 +1641,11 @@
 								</c:choose>
 								<td>
 <%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+	<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>
@@ -1690,6 +1721,12 @@
 										</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>

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

@@ -572,6 +572,14 @@
 				}
 			});
 		}
+
+		function readOpenInfo(value) {
+			layer.open({
+				title: '内容',
+				btn: ['关闭'],
+				content: value
+			});
+		}
 	</script>
 </head>
 <body>
@@ -833,9 +841,11 @@
 					<table id="upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th >文件描述/文件</th>
-							<th width="100px">文件大小(M)</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>
@@ -854,9 +864,11 @@
 								</c:choose>
 								<td>
 <%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileAttachment.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileAttachment.attachLength}M;  ${fileAttachment.attachTypes}</div>
+	<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>
@@ -912,6 +924,12 @@
 										</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>
@@ -994,9 +1012,11 @@
 					<table id="gistdata_upTable" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr >
-							<th width="30%">文件类型</th>
-							<th >文件描述/文件</th>
-							<th width="100px">文件大小(M)</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>
@@ -1016,9 +1036,11 @@
 								</c:choose>
 								<td>
 <%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileGistdata.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileGistdata.attachLength}M;  ${fileGistdata.attachTypes}</div>
+	<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>
@@ -1074,6 +1096,12 @@
 										</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>
@@ -1156,9 +1184,11 @@
 					<table id="upTable_other" class="table table-bordered table-condensed tree_table">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th >文件描述/文件</th>
-							<th width="100px">文件大小(M)</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>
@@ -1178,9 +1208,11 @@
 								</c:choose>
 								<td>
 <%--									<div style="overflow: hidden"><span class="file_nei">内容：</span><div class="file_neirong">${fileOther.attachName}</div></div>--%>
-									<div><span style="font-weight: bold">文件格式及大小：</span>${fileOther.attachLength}M;  ${fileOther.attachTypes}</div>
+	<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>
@@ -1236,6 +1268,12 @@
 										</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>

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

@@ -68,7 +68,7 @@
 
 		function readOpenInfo(value) {
 			layer.open({
-				title: '意见',
+				title: '内容',
 				btn: ['关闭'],
 				content: value
 			});
@@ -437,10 +437,12 @@
 					<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>
+							<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">
@@ -465,7 +467,7 @@
 									<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>
@@ -536,6 +538,27 @@
 										</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" >
@@ -592,10 +615,12 @@
 					<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>
+							<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">
@@ -621,7 +646,7 @@
 									<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>
@@ -692,6 +717,24 @@
 										</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" >
@@ -748,10 +791,12 @@
 					<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>
+							<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">
@@ -777,7 +822,7 @@
 									<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>
 										</c:when>
 										<c:otherwise>
 											<c:choose>
@@ -848,6 +893,24 @@
 										</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" >

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

@@ -68,7 +68,7 @@
 
 		function readOpenInfo(value) {
 			layer.open({
-				title: '意见',
+				title: '内容',
 				btn: ['关闭'],
 				content: value
 			});
@@ -530,10 +530,12 @@
 					<table id="upTable" class="table table-bordered table-condensed">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</th>
+							<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">
@@ -558,7 +560,7 @@
 									<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>
@@ -629,6 +631,26 @@
 										</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>
@@ -687,10 +709,12 @@
 					<table id="gistdata_upTable" class="table table-bordered table-condensed ">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</th>
+							<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">
@@ -716,7 +740,7 @@
 									<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>
@@ -787,6 +811,24 @@
 										</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>
@@ -845,10 +887,12 @@
 					<table id="upTable_other" class="table table-bordered table-condensed">
 						<thead>
 						<tr>
-							<th width="30%">文件类型</th>
-							<th width="">文件描述/文件</th>
-							<th width="100px">文件大小(M)</th>
-							<th width="150px">操作</th>
+							<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">
@@ -874,7 +918,7 @@
 									<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>
 										</c:when>
 										<c:otherwise>
 											<c:choose>
@@ -945,6 +989,24 @@
 										</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>

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

@@ -57,6 +57,14 @@
 				});
 			})
 		});
+
+		function readOpenInfo(value) {
+			layer.open({
+				title: '内容',
+				btn: ['关闭'],
+				content: value
+			});
+		}
 	</script>
 </head>
 <body>
@@ -107,10 +115,12 @@
 					<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>
+							<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">
@@ -135,7 +145,7 @@
 									<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>
@@ -206,6 +216,28 @@
 										</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" >
@@ -262,10 +294,12 @@
 					<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>
+							<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">
@@ -291,7 +325,7 @@
 									<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>
@@ -362,6 +396,26 @@
 										</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" >
@@ -417,10 +471,12 @@
 					<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>
+							<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">
@@ -446,7 +502,7 @@
 											<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>
 												</c:when>
 												<c:otherwise>
 													<c:choose>
@@ -517,6 +573,26 @@
 												</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" >

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

@@ -144,7 +144,7 @@
 
 		function readOpenInfo(value) {
 			layer.open({
-				title: '意见',
+				title: '内容',
 				btn: ['关闭'],
 				content: value
 			});

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

@@ -144,7 +144,7 @@
 
 		function readOpenInfo(value) {
 			layer.open({
-				title: '意见',
+				title: '内容',
 				btn: ['关闭'],
 				content: value
 			});

src/main/webapp/webpage/modules/sys/gridselectConsultantDescription.jsp

@@ -0,0 +1,132 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<html>
+<head>
+	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
+	<link href="${ctxStatic}/layer-v2.3/layui/tableTree/treetable.css" rel="stylesheet" />
+	<%@include file="/webpage/include/treetable.jsp" %>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			$('#contentTable thead tr th input.i-checks').on('ifChecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定
+				$('#contentTable tbody tr td input.i-checks').iCheck('check');
+			});
+
+			$('#contentTable thead tr th input.i-checks').on('ifUnchecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定
+				$('#contentTable tbody tr td input.i-checks').iCheck('uncheck');
+			});
+			});
+
+		function getSelectedItem() {
+			var ss= document.getElementById("iframe").contentWindow.document.getElementById("opinion").value
+			$("#reimburseRemarks").val(ss);
+			//获取意见栏信息
+			var reimburseRemarks = $("#reimburseRemarks").val();
+			if(reimburseRemarks == undefined || reimburseRemarks == null || reimburseRemarks == ''){
+				top.layer.msg("请输入审核意见")
+			}
+			return "0" + "_item_" + reimburseRemarks;
+		}
+	</script>
+</head>
+<body>
+<div class="single-form">
+	<div class="layui-row">
+		<div class="full-width fl">
+			<div class="layui-row">
+				<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>
+					<h2>文件描述</h2>
+				</div>
+				<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeDescriptionView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value">${auditOpinion}</iframe>
+				<form:form id="searchForm" modelAttribute="projectReportData" action="" method="post" class="layui-form">
+					<div class="commonQuery">
+					<input type="hidden" id="reimburseRemarks" name="reimburseRemarks" value="${auditOpinion}" maxlength="250">
+					</div>
+				</form:form>
+			</div>
+		</div>
+	</div>
+</div>
+<script>
+	// $(document).ready(function() {
+	// 	$("#clearOpinon").click(function(){
+	// 		var s=$("input[name='sh']").length;
+	// 		for(var i=0;i<s;i++){
+	// 			$("input[name='sh']").attr("checked",false)
+	// 			layui.form.render();
+	// 		}
+	// 		$("#reimburseRemarks").val("");
+	// 	})
+	// 	$("#clearOpinons").click(function(){
+	// 		var s=$("input[name='shs']").length;
+	// 		for(var i=0;i<s;i++){
+	// 			$("input[name='shs']").attr("checked",false)
+	// 			layui.form.render();
+	// 		}
+	// 		$("#fuzerenOpinion").val("");
+	// 	})
+	// 	layui.use(['form', 'layer'], function () {
+	// 		var form = layui.form;
+	// 		//下拉框监听器
+	// 		layui.form.on('select(zixunOpinion)', function(data){
+	// 			var span=data.value;
+	// 			if(span!=""){
+	// 				var opinion=$("#reimburseRemarks").val()+span+";"
+	// 				$("#reimburseRemarks").val(opinion);
+	// 			}
+	// 		});
+	// 		layui.form.on('checkbox(raopinion)', function(data){
+	// 			var span=data.value;
+	// 			if(span!=""){
+	// 				$(this).attr("checked",false)
+	// 				var opinion=$("#reimburseRemarks").val()+span+";"
+	// 				$("#reimburseRemarks").val(opinion);
+	// 			}
+	// 		});
+	// 		layui.form.on('select(fuzerenOpinion)', function(data){
+	// 			var span=data.value;
+	// 			if(span!=""){
+	// 				var opinion=$("#fuzerenOpinion").val()+span+";"
+	// 				$("#fuzerenOpinion").val(opinion);
+	// 			}
+	// 		});
+	// 		layui.form.on('checkbox(raopinions)', function(data){
+	// 			var span=data.value;
+	// 			if(span!=""){
+	// 				$(this).attr("checked",false)
+	// 				var opinion=$("#fuzerenOpinion").val()+span+";"
+	// 				$("#fuzerenOpinion").val(opinion);
+	// 			}
+	// 		});
+	// 	});
+	// })
+	function f1(row) {
+		// window.parent.document.getElementById('opinion').value = row;
+		$("#opinion").val(row)
+	}
+	function openDialogre(title,url,width,height,target,buttons) {
+		if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端，就使用自适应大小弹窗
+			width = 'auto';
+			height = 'auto';
+		} else {//如果是PC端，根据用户设置的width和height显示。
+		}
+		var split = buttons.split(",");
+		top.layer.open({
+			type: 2,
+			area: [width, height],
+			title: title,
+			maxmin: true, //开启最大化最小化按钮
+			skin: 'three-btns',
+			content: url,
+			btn: split,
+			btn1: function(index, layero){
+				top.layer.close(index)
+				document.getElementById('iframe').contentWindow.location.reload();
+			}
+		});
+	}
+</script>
+</body>
+</html>