人员信息和文件查看功能调整

src/main/java/com/jeeplus/modules/workprojectnotify/entity/WorkProjectNotify.java

@@ -71,6 +71,8 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	private String pageFlag; // 回跳页面判定
 	private String reject; //判定已办中是否驳回
 	private String defKey; //流程键
+	private String auditStatus; //审核状态
+	private String auditContent; //审核信息
 
 	public String getDefKey() {
 		return defKey;
@@ -414,4 +416,20 @@ public class WorkProjectNotify extends DataEntity<WorkProjectNotify> {
 	public void setPageFlag(String pageFlag) {
 		this.pageFlag = pageFlag;
 	}
+
+	public String getAuditStatus() {
+		return auditStatus;
+	}
+
+	public void setAuditStatus(String auditStatus) {
+		this.auditStatus = auditStatus;
+	}
+
+	public String getAuditContent() {
+		return auditContent;
+	}
+
+	public void setAuditContent(String auditContent) {
+		this.auditContent = auditContent;
+	}
 }

src/main/java/com/jeeplus/modules/workprojectnotify/service/WorkProjectNotifyService.java

@@ -150,6 +150,14 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 				}
 			}
 		}*/
+		for (WorkProjectNotify info : list) {
+			if(null == info.getWapCreateDate()){
+				info.setWapCreateDate(info.getCreateDate());
+			}
+			if(null == info.getWapEndDate()){
+				info.setWapEndDate(info.getUpdateDate());
+			}
+		}
 		page.setList(list);
 		return page;
 	}
@@ -215,6 +223,18 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 //				WorkProjectNotify next = listByMine.get(i + 1);
 					info.setReject("1");
 				}
+			}else{
+				if(StringUtils.isNotBlank(info.getAuditStatus())){
+					if(info.getAuditStatus().equals("2")){
+						info.setReject("1");
+					}
+				}
+			}
+			if(null == info.getWapCreateDate()){
+				info.setWapCreateDate(info.getCreateDate());
+			}
+			if(null == info.getWapEndDate()){
+				info.setWapEndDate(info.getUpdateDate());
 			}
 
 			//当标题中含有'重新申请'时,则获取到下一条数据,并赋值
@@ -299,6 +319,33 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 			return null;
 		}
 	}
+
+	@Transactional(readOnly = false)
+	public List<User> readByNotifyIdOnStatus(WorkProjectNotify workProjectNotify, String status) {
+		try {
+			List<User> users = null;
+			if(StringUtils.isNotBlank(status)){
+				workProjectNotify.setStatus(status);
+			}else{
+				workProjectNotify.setStatus("1");
+			}
+			if (StringUtils.isNotBlank(workProjectNotify.getAuditor())){
+				workProjectNotify.preUpdate();
+				dao.updateNewReadStateByNotifyId(workProjectNotify);
+				users = dao.findNewReadStateByNotifyId(workProjectNotify);
+
+			}else {
+				users = dao.findReadStateByNotifyId(workProjectNotify);
+				workProjectNotify.preUpdate();
+				dao.updateReadStateByNotifyId(workProjectNotify);
+			}
+
+			return users;
+		}catch (Exception e){
+			logger.error("Exception e:"+e);
+			return null;
+		}
+	}
 	@Transactional(readOnly = false)
 	public void readByNotifyUser(WorkProjectNotify workProjectNotify) {
 			workProjectNotify.setStatus("1");

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -11319,7 +11319,7 @@ public class WorkProjectNotifyController extends BaseController {
 		}
 		model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
 
-		if (workProjectNotify.getRemarks().contains("待处理") && !"1".equals(workProjectNotify.getStatus())) {
+		if (workProjectNotify.getRemarks().contains("待处理") && (!"1".equals(workProjectNotify.getStatus()) && !"2".equals(workProjectNotify.getStatus()))) {
 			return "modules/workstaff/workStaffBasicDetailAudit";
 		}else{
 			if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
@@ -11327,6 +11327,9 @@ public class WorkProjectNotifyController extends BaseController {
 				model.addAttribute("user", user);
 				return "modules/workstaff/workStaffBasicDetailModify";
 			}else{
+				Act act = new Act();
+				act.setComment(workProjectNotify.getAuditContent());
+				workStaffBasicInfo.setAct(act);
 				return "modules/workstaff/workStaffBasicInfoView";
 			}
 		}
@@ -11368,7 +11371,11 @@ public class WorkProjectNotifyController extends BaseController {
 			workStaffBasicInfo.setPictureStr(urlManage);
 		}
 
-		workStaffBasicInfo.setHome("home");
+		if(StringUtils.isBlank(workProjectNotify.getHome())){
+			workStaffBasicInfo.setHome("home");
+		}else{
+			workStaffBasicInfo.setHome(workProjectNotify.getHome());
+		}
 		model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
 
 		if (workProjectNotify.getRemarks().contains("待处理") && !"1".equals(workProjectNotify.getStatus())) {

src/main/java/com/jeeplus/modules/workstaff/entity/WorkStaffBasicInfo.java

@@ -143,6 +143,7 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
     private String idCardNationalEmblemPathStr;        // 身份证国徽照片路径
     private String idCardNationalEmblemPathThumbnailStr;        // 身份证国徽照片路径(缩略图)
     private String auditStatus;        // 审核状态
+    private String isCompleteInformation;        // 是否完善信息
 
     public String getDdId() {
         return ddId;
@@ -1083,4 +1084,12 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
     public void setIdCardNationalEmblemPathThumbnailStr(String idCardNationalEmblemPathThumbnailStr) {
         this.idCardNationalEmblemPathThumbnailStr = idCardNationalEmblemPathThumbnailStr;
     }
+
+    public String getIsCompleteInformation() {
+        return isCompleteInformation;
+    }
+
+    public void setIsCompleteInformation(String isCompleteInformation) {
+        this.isCompleteInformation = isCompleteInformation;
+    }
 }

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

@@ -1417,6 +1417,7 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && ("home".equals(workStaffBasicInfo.getHome()) || "notifyList".equals(workStaffBasicInfo.getHome()))) {
             WorkProjectNotify workProjectNotify = new WorkProjectNotify();
             workProjectNotify.setNotifyId(workStaffBasicInfo.getId());
+            workProjectNotify.setAuditStatus("1");
             workProjectNotify.setType("86");
             workProjectNotifyService.readByNotifyId(workProjectNotify);
             return;
@@ -2227,6 +2228,7 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
             WorkProjectNotify notify = new WorkProjectNotify();
             notify.setNotifyId(workStaffBasicInfo.getId());
             notify.setType("86");
+            notify.setAuditStatus("3");
             workProjectNotifyService.readByNotifyId(notify);
 
             notify.setType("186");

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

@@ -137,6 +137,7 @@ public class WorkStaffEducationService extends CrudService<WorkStaffEducationDao
                 InputStream inputStream = file.getInputStream();
                 OSSClientUtil ossClientUtil = new OSSClientUtil();
                 String url = ossClientUtil.uploadFile2OSS(file, "certificate");
+                System.out.println("获取图片路径：" + url);
                 return url;
             }
         }catch (Exception e){
@@ -546,7 +547,8 @@ public class WorkStaffEducationService extends CrudService<WorkStaffEducationDao
                     }
                     if(newEducation.getEduPhotoFile()!=null&&!newEducation.getEduPhotoFile().isEmpty()&&newEducation.getEduPhotoFile().getSize()>0){
                         MultipartFile file = newEducation.getEduPhotoFile();
-                        newEducation.setEduPhoto(this.uploadFile(file,newEducation.getEduPhoto()));
+                        String url = this.uploadFile(file,newEducation.getEduPhoto());
+                        newEducation.setEduPhoto(url);
                     }
                     WorkStaffEducation oldEducation=this.get(newEducation.getId());
                     if(oldEducation!=null){
@@ -640,9 +642,11 @@ public class WorkStaffEducationService extends CrudService<WorkStaffEducationDao
                                 MultipartFile file = newEducation.getDegreePhotoFile();
                                 newEducation.setDegreePhoto(this.uploadFile(file,newEducation.getDegreePhoto()));
                             }
-                            if(newEducation.getEduPhotoFile()!=null&&!newEducation.getEduPhotoFile().isEmpty()&&newEducation.getEduPhotoFile().getSize()>0){
+                            if(newEducation.getEduPhotoFile()!=null&&!newEducation.getEduPhotoFile().isEmpty()&&newEducation.getEduPhotoFile().getSize()>0 && StringUtils.isBlank(newEducation.getEduPhoto())){
                                 MultipartFile file = newEducation.getEduPhotoFile();
-                                newEducation.setEduPhoto(this.uploadFile(file,newEducation.getEduPhoto()));
+                                String url = this.uploadFile(file,newEducation.getEduPhoto());
+                                newEducation.setEduPhoto(url);
+
                             }
                             String newId=IdGen.uuid();
                             for (Field field : declaredFields) {
@@ -715,9 +719,10 @@ public class WorkStaffEducationService extends CrudService<WorkStaffEducationDao
                         MultipartFile file = newEducation.getDegreePhotoFile();
                         newEducation.setDegreePhoto(this.uploadFile(file,newEducation.getDegreePhoto()));
                     }
-                    if(newEducation.getEduPhotoFile()!=null&&!newEducation.getEduPhotoFile().isEmpty()&&newEducation.getEduPhotoFile().getSize()>0){
+                    if(newEducation.getEduPhotoFile()!=null&&!newEducation.getEduPhotoFile().isEmpty()&&newEducation.getEduPhotoFile().getSize()>0 && StringUtils.isBlank(newEducation.getEduPhoto())){
                         MultipartFile file = newEducation.getEduPhotoFile();
-                        newEducation.setEduPhoto(this.uploadFile(file,newEducation.getEduPhoto()));
+                        String url = this.uploadFile(file,newEducation.getEduPhoto());
+                        newEducation.setEduPhoto(url);
                     }
                     String newId=IdGen.uuid();
                     for (Field field : declaredFields) {

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

@@ -1150,17 +1150,21 @@ public class WorkStaffBasicInfoController extends BaseController {
 	}
 	@RequestMapping(value = "back")
 	public String back(WorkStaffBasicInfo workStaffBasicInfo, Model model, RedirectAttributes redirectAttributes,HttpServletRequest request) throws Exception{
+
+		String actComment="";
+		if(null != workStaffBasicInfo.getAct() && StringUtils.isNotBlank(workStaffBasicInfo.getAct().getComment())){
+			workStaffBasicInfoService.updateActComment(workStaffBasicInfo);
+			actComment = workStaffBasicInfo.getAct().getComment();
+		}
+
 		if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && ("home".equals(workStaffBasicInfo.getHome()) || "notifyList".equals(workStaffBasicInfo.getHome())) ){
 			WorkProjectNotify workProjectNotify = new WorkProjectNotify();
 			workProjectNotify.setNotifyId(workStaffBasicInfo.getId());
+			workProjectNotify.setAuditStatus("2");
+			workProjectNotify.setAuditContent(actComment);
 			workProjectNotify.setType("86");
 			workProjectNotifyService.readByNotifyId(workProjectNotify);
 		}
-		String actComment="";
-		if(null != workStaffBasicInfo.getAct() && StringUtils.isNotBlank(workStaffBasicInfo.getAct().getComment())){
-			workStaffBasicInfoService.updateActComment(workStaffBasicInfo);
-			actComment = workStaffBasicInfo.getAct().getComment();
-		}
 
 		workStaffBasicInfoService.completeBack(workStaffBasicInfo.getId(),actComment);
 
@@ -1201,6 +1205,11 @@ public class WorkStaffBasicInfoController extends BaseController {
 		workStaffBasicInfoService.updateActComment(workStaffBasicInfo);
 
 		addMessage(redirectAttributes, "保存员工档案信息成功");
+		if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/home/?repage";
+		}else if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "notifyList".equals(workStaffBasicInfo.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+		}
 		return "redirect:" + Global.getAdminPath() + "/home/?repage";
 	}
 
@@ -1218,6 +1227,11 @@ public class WorkStaffBasicInfoController extends BaseController {
 		}
 		workStaffAchivesLogDao.deleteDirectlyBack("执业资格证书",workStaffBasicInfo.getId());
 		addMessage(redirectAttributes, "驳回成功");
+		if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/home/?repage";
+		}else if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "notifyList".equals(workStaffBasicInfo.getHome())){
+			return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
+		}
 		return "redirect:" + Global.getAdminPath() + "/home/?repage";
 	}
 
@@ -1308,7 +1322,7 @@ public class WorkStaffBasicInfoController extends BaseController {
 	/**
 	 * 项目相应文件批量下载并压缩
 	 */
-	@RequiresPermissions("ruralProject:ruralProjectRecords:del")
+	@RequiresPermissions("workstaff:workStaffBasicInfo:batchExport")
 	@RequestMapping(value = "exportAll")
 	public String exportAll(HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
 		String listIds = request.getParameter("listId");

src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml

@@ -50,6 +50,8 @@
 		SELECT
 		<include refid="workProjectNotifyColumns"/>
 		,a.process_instance_id as "processInstanceId"
+		,a.audit_status AS "auditStatus"
+		,a.audit_content AS "auditContent"
 		FROM work_project_notify a
 		<include refid="workProjectNotifyJoins"/>
 		WHERE a.id = #{id}
@@ -663,6 +665,12 @@
 									   update_by = #{updateBy.id},
 									   update_date = #{updateDate},
 									   status = #{status}
+		<if test="auditStatus != null and auditStatus != ''">
+			,audit_status = #{auditStatus}
+		</if>
+		<if test="auditContent != null and auditContent != ''">
+			,audit_content = #{auditContent}
+		</if>
 		<where>
 			notify_id = #{notifyId} AND status != '1'
 			<if test="type != null and type != ''">
@@ -675,6 +683,12 @@
 		   update_by = #{updateBy.id},
 		   update_date = #{updateDate},
 		   status = #{status}
+		<if test="auditStatus != null and auditStatus != ''">
+			,audit_status = #{auditStatus}
+		</if>
+		<if test="auditContent != null and auditContent != ''">
+			,audit_content = #{auditContent}
+		</if>
 	   <where>
 		   notify_id = #{notifyId} AND status != '1' and notify_user = #{auditor}
 		   <if test="title != null and title != ''">
@@ -717,6 +731,8 @@
 		,a.wap_begin_date AS "wapCreateDate"
 		,a.process_instance_id AS "processInstanceId"
 		,a.wap_over_date AS "wapEndDate"
+		,a.audit_status AS "auditStatus"
+		,a.audit_content AS "auditContent"
 		,su.name as "createUserName"
 		FROM work_project_notify a
 		<include refid="workProjectNotifyJoins"/>
@@ -779,10 +795,24 @@
 
 			and a.create_by is not null
 
-			and a.process_instance_id in( select process_instance_id from work_activity_process
+			<!-- 原有条件保留，用OR连接新增条件 -->
+			and (
+			a.process_instance_id in(
+			select process_instance_id from work_activity_process
 			where process_instance_id in(select process_id from work_activity_process_user where user_id = #{user.id} and type=1)
 			and del_flag = 0 and (remarks !='[强制撤销]' or remarks is null) and is_approval != 0
 			)
+			<!-- 新增条件：处理无process_instance_id的情况 -->
+			or (
+			a.process_instance_id is null
+			and a.status = 1
+			and (a.audit_status is null or a.audit_status = '' or a.audit_status != 3)
+			and a.title LIKE
+			<if test="dbName == 'oracle'">'%修改档案信息%'</if>
+			<if test="dbName == 'mssql'">'%修改档案信息%'</if>
+			<if test="dbName == 'mysql'">concat('%','修改档案信息','%')</if>
+			)
+			)
 			and a.remarks != '待通知'
 			and a.notify_user = #{user.id}
 		</where>
@@ -858,10 +888,24 @@
 
 			and a.create_by is not null
 
-			and a.process_instance_id in( select process_instance_id from work_activity_process
+			<!-- 原有条件保留，用OR连接新增条件 -->
+			and (
+			a.process_instance_id in(
+			select process_instance_id from work_activity_process
 			where process_instance_id in(select process_id from work_activity_process_user where user_id = #{user.id} and type=1)
 			and del_flag = 0 and (remarks !='[强制撤销]' or remarks is null) and is_approval != 0
 			)
+			<!-- 新增条件：处理无process_instance_id的情况 -->
+			or (
+			a.process_instance_id is null
+			and a.status = 1
+			and (a.audit_status is null or a.audit_status = '' or a.audit_status != 3)
+			and a.title LIKE
+			<if test="dbName == 'oracle'">'%修改档案信息%'</if>
+			<if test="dbName == 'mssql'">'%修改档案信息%'</if>
+			<if test="dbName == 'mysql'">concat('%','修改档案信息','%')</if>
+			)
+			)
 			and remarks != '待通知'
 			and a.notify_user = #{user.id}
 		</where>

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

@@ -193,6 +193,7 @@
 		LEFT JOIN sys_user su ON su.id = a.audit_user_id
 		LEFT JOIN sys_user suc ON suc.id = a.user_id
 		LEFT JOIN work_staff_certificate wsc ON wsc.staff_id = a.achive_id and wsc.del_flag = 0
+		LEFT JOIN work_staff_achives wsa ON wsa.user_id = a.user_id and wsa.del_flag = 0
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="certificateType != null and certificateType != ''">
@@ -252,6 +253,15 @@
 			<if test="achiveId != null and achiveId !=''">
 				AND a.achive_id = #{achiveId}
 			</if>
+
+			<if test="isCompleteInformation != null and isCompleteInformation !='' and isCompleteInformation ==1">
+				AND wsa.alteration_date is not null and wsa.id_card_portrait_path is not null and wsa.id_card_portrait_path != ''
+			</if>
+
+			<if test="isCompleteInformation != null and isCompleteInformation !='' and isCompleteInformation ==0">
+				AND (wsa.alteration_date is null or wsa.id_card_portrait_path is null or wsa.id_card_portrait_path = '')
+			</if>
+
 			<if test="isHandSignature != null and isHandSignature !=''">
 				<choose>
 					<when test="isHandSignature == 1">

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

@@ -43,7 +43,7 @@
 <%-- 4. 组件核心HTML结构 --%>
 <div class="form-group layui-row">
     <%-- 标题区域 --%>
-    <div class="form-group-label"><h2>${title}2</h2></div>
+    <div class="form-group-label"><h2>${title}</h2></div>
 
     <%-- 操作按钮区域（添加附件+下载模板） --%>
     <c:if test="${showOperateBtn}">

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

@@ -79,7 +79,7 @@
 <%-- 组件HTML结构 --%>
 <div class="form-group layui-row">
     <%-- 标题区域 --%>
-    <div class="form-group-label"><h2>${title}1</h2></div>
+    <div class="form-group-label"><h2>${title}</h2></div>
 
         <%-- 操作按钮区域 --%>
         <c:if test="${showOperateArea}">

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

@@ -31,7 +31,7 @@
 <%@ attribute name="collectSearchKey" type="java.lang.String" description="collectSelect搜索字段"%>
 
 <%-- 初始化默认值 --%>
-<c:set var="ctx" value="${pageContext.request.contextPath}" />
+<c:set var="ctx" value="${pageContext.request.contextPath}${fns:getAdminPath()}" />
 <c:set var="defaultTitle" value="附件信息" />
 <c:set var="defaultAddBtnText" value="添加附件" />
 <c:set var="defaultUploadMode" value="2" />
@@ -78,7 +78,7 @@
 <%-- 组件HTML结构 --%>
 <div class="form-group layui-row">
     <%-- 标题区域 --%>
-    <div class="form-group-label"><h2>${title}3</h2></div>
+    <div class="form-group-label"><h2>${title}</h2></div>
 
     <%-- 操作按钮区域 --%>
     <c:if test="${showOperateArea}">

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

@@ -334,6 +334,48 @@ function openDialogView(title,url,width,height){
 
 }
 
+
+// 点击图片放大预览
+function clickPicture(url) {
+    var img = new Image();
+    img.src = url;
+    img.onload = function (ev) {
+        // 原图宽高
+        var originalWidth = this.width;
+        var originalHeight = this.height;
+
+        // 最大显示尺寸限制
+        var maxWidth = 1680;
+        var maxHeight = 747;
+
+        // 计算缩放比例（保持宽高比）
+        var scale = Math.min(
+            maxWidth / originalWidth,
+            maxHeight / originalHeight
+        );
+
+        // 计算缩放后的尺寸
+        var displayWidth = originalWidth * scale;
+        var displayHeight = originalHeight * scale;
+
+        // 用字符串拼接构建图片HTML（避免模板字符串）
+        var imgHtml = "<img style='width: 100%; height: 100%; object-fit: contain; background: #f5f5f5;' src='" + url + "' />";
+
+        // 弹出层
+        top.layer.open({
+            type: 1,
+            shade: 0.2,
+            offset: 'auto',
+            area: [displayWidth + 'px', displayHeight + 'px'],
+            shadeClose: true,
+            scrollbar: false,
+            title: false,
+            content: imgHtml
+        });
+    };
+}
+
+
 function search(){//查询，页码清零
 	$("#pageNo").val(0);
 	$("#searchForm").submit();

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

@@ -36,7 +36,7 @@
 
 <!-- jeeplus -->
 <link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-<script src="${ctxStatic}/common/jeeplus.js?23" type="text/javascript"></script>
+<script src="${ctxStatic}/common/jeeplus.js?24" type="text/javascript"></script>
 <script type="text/javascript" src="${ctxStatic}/common/openShow.js"></script>
 
 <!-- jquery ui -->

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

@@ -38,9 +38,9 @@
 				$("#"+val+"sort").val(i+1);
 			}
 
-			$("#attachment_btn").click(function () {
+			/*$("#attachment_btn").click(function () {
 				$("#attachment_file").click();
-			});
+			});*/
 
 			//文件行拖拽功能
 			$("#upTable tbody").sortable({
@@ -64,7 +64,7 @@
 			}).disableSelection();
 		});
 
-		function insertTitle(tValue){
+		/*function insertTitle(tValue){
 			//文件后缀名
 			var attachTypes = $("#attachTypes").val();
 			console.log("attachTypes",attachTypes)
@@ -111,7 +111,7 @@
 				var timestamp=new Date().getTime();
 
 				var storeAs = "workAttachment";
-				var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
+				var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/!*将这段字符串存到数据库即可*!/
 				var divId = "_attachment";
 				$("#addFile"+divId).show();
 				var fileCount = $("#fileCount").val();
@@ -166,7 +166,7 @@
 				var timestamp=new Date().getTime();
 
 				var storeAs = "workAttachment";
-				var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
+				var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/!*将这段字符串存到数据库即可*!/
 				var divId = "_attachment";
 				$("#addFile"+divId).show();
 				var fileCount = $("#fileCount").val();
@@ -174,7 +174,7 @@
 				multipartUploadWithStsCollectionCollect(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size,fileCount);
 				//multipartUploadWithStsOnProcessAccessoryCollect(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,size,fileCount);
 			}
-		}
+		}*/
 		function showfile(){
 			var length=$("#file_attachment tr").length;
 			var files=new Array();
@@ -252,7 +252,19 @@
 			<form:hidden path="attachTypes"/>
 			<form:hidden path="attachLength"/>
 			<input type="hidden" id="fileCount" value="">
-			<div class="form-group layui-row">
+
+			<table:fileUpload
+					title="附件信息"
+					addBtnText="添加附件"
+					baseId="attachment"
+					attachments="${projectTemplateInfo.workAttachments}"
+					storeAs="workAttachment"
+					attachmentFlag="100"
+					attachTypes="${projectTemplateInfo.attachTypes}"
+					attachLength="${projectTemplateInfo.attachLength}"
+			/>
+
+			<%--<div class="form-group layui-row">
 				<div class="form-group-label"><h2>附件信息</h2></div>
 				<div class="layui-item nav-btns">
 					<a id="attachment_btn" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
@@ -275,7 +287,7 @@
 					<table id="upTable" class="table table-bordered table-condensed details">
 						<thead>
 						<tr>
-								<%-- <th>序号</th>--%>
+								&lt;%&ndash; <th>序号</th>&ndash;%&gt;
 							<th width="30%">文件预览</th>
 							<th width="80px">上传人</th>
 							<th width="160px">上传时间</th>
@@ -288,7 +300,7 @@
 						<c:forEach items="${projectTemplateInfo.workAttachments}" var = "workClientAttachment" varStatus="status">
 							<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>--%>
+									&lt;%&ndash; <td>${status.index + 1}</td>&ndash;%&gt;
 										<c:choose>
 											<c:when test="${projectTemplateInfo.uploadMode == 2}">
 												<c:choose>
@@ -366,7 +378,7 @@
 						</tbody>
 					</table>
 				</div>
-			</div>
+			</div>--%>
 		</form:form>
 	</div>
 </div>

src/main/webapp/webpage/modules/projectConstruction/projectConstructionView.jsp

@@ -225,15 +225,17 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                        <td>
+                                                            <img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openPreview('${workClientAttachment.temporaryUrl}',5)" alt="${workClientAttachment.attachmentName}">
+                                                        </td>
                                                     </c:when>
                                                     <c:otherwise>
                                                         <c:choose>
                                                             <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('预览','${workClientAttachment.temporaryUrl}','90%','90%',1)">${workClientAttachment.attachmentName}</a></td>
                                                             </c:when>
                                                             <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.temporaryUrl}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
+                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('预览','${workClientAttachment.temporaryUrl}','90%','90%',2)">${workClientAttachment.attachmentName}</a></td>
                                                             </c:otherwise>
                                                         </c:choose>
                                                     </c:otherwise>
@@ -251,10 +253,10 @@
                                                     <c:otherwise>
                                                         <c:choose>
                                                             <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%','1')">${workClientAttachment.attachmentName}</a></td>
+                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('预览','${workClientAttachment.url}','90%','90%',1)">${workClientAttachment.attachmentName}</a></td>
                                                             </c:when>
                                                             <c:otherwise>
-                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="preview('预览','${workClientAttachment.url}','90%','90%')">${workClientAttachment.attachmentName}</a></td>
+                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('预览','${workClientAttachment.url}','90%','90%',2)">${workClientAttachment.attachmentName}</a></td>
                                                             </c:otherwise>
                                                         </c:choose>
                                                     </c:otherwise>

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

@@ -188,7 +188,7 @@
                                                            or fn:containsIgnoreCase(projectBasedData.fileName,'gif')
                                                            or fn:containsIgnoreCase(projectBasedData.fileName,'bmp')
                                                            or fn:containsIgnoreCase(projectBasedData.fileName,'jpeg')}">
-													<img src="${projectBasedData.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${projectBasedData.temporaryUrl}','90%','90%')" alt="${projectBasedData.fileName}">
+													<img src="${projectBasedData.temporaryUrl}" width="50" height="50" onclick="openPreview('${projectBasedData.temporaryUrl}',5)" alt="${projectBasedData.fileName}">
 												</c:when>
 												<c:otherwise>
 													<c:choose>
@@ -319,7 +319,9 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-												<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+												<td>
+													<img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openPreview('${workClientAttachment.temporaryUrl}',5)" alt="${projectBasedData.attachmentName}">
+												</td>
 											</c:when>
 											<c:otherwise>
 												<c:choose>

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

@@ -784,7 +784,9 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                <td>
+                                                    <img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openPreview('${workClientAttachment.temporaryUrl}',5)" alt="${workClientAttachment.attachmentName}">
+                                                </td>
                                             </c:when>
                                             <c:otherwise>
                                                 <c:choose>
@@ -829,7 +831,16 @@
                                         <c:when test="${projectcontentinfo.projectContentData.uploadMode == 2}">
                                             <c:choose>
                                                 <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                    <a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                    <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');"
+                                                       class="op-btn op-btn-download">
+                                                        <i class="fa fa-download"></i>&nbsp;下载
+                                                    </a>
+                                                </c:when>
+                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'xml')}">
+                                                    <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');"
+                                                       class="op-btn op-btn-download">
+                                                        <i class="fa fa-download"></i>&nbsp;下载
+                                                    </a>
                                                 </c:when>
                                                 <c:otherwise>
                                                     <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/reportForm.jsp

@@ -1111,7 +1111,7 @@
                                                            or fn:containsIgnoreCase(projectBasedData.fileName,'gif')
                                                            or fn:containsIgnoreCase(projectBasedData.fileName,'bmp')
                                                            or fn:containsIgnoreCase(projectBasedData.fileName,'jpeg')}">
-														<img src="${projectBasedData.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${projectBasedData.temporaryUrl}','90%','90%')" alt="${projectBasedData.fileName}">
+														<img src="${projectBasedData.temporaryUrl}" width="50" height="50" onclick="openPreview('${projectBasedData.temporaryUrl}',5)" alt="${projectBasedData.fileName}">
 													</c:when>
 													<c:otherwise>
 														<c:choose>
@@ -1501,7 +1501,9 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-												<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}"></td>
+												<td>
+													<img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openPreview('${workClientAttachment.temporaryUrl}',5)" alt="${workClientAttachment.attachmentName}">
+												</td>
 											</c:when>
 											<c:otherwise>
 												<c:choose>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/reportView.jsp

@@ -185,7 +185,7 @@
                                                            or fn:containsIgnoreCase(projectBasedData.fileName,'gif')
                                                            or fn:containsIgnoreCase(projectBasedData.fileName,'bmp')
                                                            or fn:containsIgnoreCase(projectBasedData.fileName,'jpeg')}">
-												<img src="${projectBasedData.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${projectBasedData.temporaryUrl}','90%','90%')" alt="${projectBasedData.fileName}">
+												<img src="${projectBasedData.temporaryUrl}" width="50" height="50" onclick="openPreview('${projectBasedData.temporaryUrl}',5)" alt="${projectBasedData.fileName}">
 											</c:when>
 											<c:otherwise>
 												<c:choose>
@@ -317,7 +317,9 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-													<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+													<td>
+														<img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openPreview('${workClientAttachment.temporaryUrl}',5)" alt="${workClientAttachment.attachmentName}">
+													</td>
 												</c:when>
 												<c:otherwise>
 													<c:choose>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/workContentForm.jsp

@@ -996,7 +996,9 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                    <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                    <td>
+                                                        <img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openPreview('${workClientAttachment.temporaryUrl}',5)" alt="${workClientAttachment.attachmentName}">
+                                                    </td>
                                                 </c:when>
                                                 <c:otherwise>
                                                     <c:choose>
@@ -1009,7 +1011,7 @@
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
                                                                 </c:when>
                                                                 <c:otherwise>
                                                                     <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
@@ -1040,7 +1042,7 @@
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
                                                                 </c:when>
                                                                 <c:otherwise>
                                                                     <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
@@ -1066,7 +1068,16 @@
                                                 <c:when test="${projectcontentinfo.uploadMode == 2}">
                                                     <c:choose>
                                                         <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                            <a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                            <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');"
+                                                               class="op-btn op-btn-download">
+                                                                <i class="fa fa-download"></i>&nbsp;下载
+                                                            </a>
+                                                        </c:when>
+                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'xml')}">
+                                                            <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');"
+                                                               class="op-btn op-btn-download">
+                                                                <i class="fa fa-download"></i>&nbsp;下载
+                                                            </a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1641,7 +1652,9 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                    <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                    <td>
+                                                        <img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openPreview('${workClientAttachment.temporaryUrl}',5)" alt="${workClientAttachment.attachmentName}">
+                                                    </td>
                                                 </c:when>
                                                 <c:otherwise>
                                                     <c:choose>
@@ -1654,7 +1667,7 @@
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
                                                                 </c:when>
                                                                 <c:otherwise>
                                                                     <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
@@ -1685,7 +1698,7 @@
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
                                                                 </c:when>
                                                                 <c:otherwise>
                                                                     <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
@@ -1711,8 +1724,18 @@
                                                 <c:when test="${projectcontentinfo.uploadMode == 2}">
                                                     <c:choose>
                                                         <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                            <a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                            <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');"
+                                                               class="op-btn op-btn-download">
+                                                                <i class="fa fa-download"></i>&nbsp;下载
+                                                            </a>
+                                                        </c:when>
+                                                        <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'xml')}">
+                                                            <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');"
+                                                               class="op-btn op-btn-download">
+                                                                <i class="fa fa-download"></i>&nbsp;下载
+                                                            </a>
                                                         </c:when>
+
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:otherwise>

src/main/webapp/webpage/modules/projectrecord/workContentFromAndView/workContentView.jsp

@@ -674,7 +674,9 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                    <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                    <td>
+                                                        <img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openPreview('${workClientAttachment.temporaryUrl}',5)" alt="${workClientAttachment.attachmentName}">
+                                                    </td>
                                                 </c:when>
                                                 <c:otherwise>
                                                     <c:choose>
@@ -683,11 +685,11 @@
                                                         </c:when>
                                                         <c:otherwise>
                                                             <c:choose>
-                                                                <c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+                                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
                                                                 </c:when>
                                                                 <c:otherwise>
                                                                     <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
@@ -714,11 +716,11 @@
                                                         </c:when>
                                                         <c:otherwise>
                                                             <c:choose>
-                                                                <c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+                                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
                                                                 </c:when>
                                                                 <c:otherwise>
                                                                     <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
@@ -744,7 +746,7 @@
                                                 <c:when test="${projectcontentinfo.uploadMode == 2}">
                                                     <c:choose>
                                                         <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                            <a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                            <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1211,7 +1213,9 @@
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
                                                            or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
-                                                    <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                    <td>
+                                                        <img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openPreview('${workClientAttachment.temporaryUrl}',5)" alt="${workClientAttachment.attachmentName}">
+                                                    </td>
                                                 </c:when>
                                                 <c:otherwise>
                                                     <c:choose>
@@ -1220,11 +1224,11 @@
                                                         </c:when>
                                                         <c:otherwise>
                                                             <c:choose>
-                                                                <c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+                                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
                                                                 </c:when>
                                                                 <c:otherwise>
                                                                     <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
@@ -1251,11 +1255,11 @@
                                                         </c:when>
                                                         <c:otherwise>
                                                             <c:choose>
-                                                                <c:when test="${fn:containsIgnoreCase(fileOther.attachName,'rar')
+                                                                <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
 																					   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
-                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                    <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
                                                                 </c:when>
                                                                 <c:otherwise>
                                                                     <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
@@ -1281,7 +1285,7 @@
                                                 <c:when test="${projectcontentinfo.uploadMode == 2}">
                                                     <c:choose>
                                                         <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                            <a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                            <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

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

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

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

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

@@ -18,7 +18,7 @@
 	<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 	<!-- jeeplus -->
 	<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-	<script src="${ctxStatic}/common/jeeplus.js?23" type="text/javascript"></script>
+	<script src="${ctxStatic}/common/jeeplus.js?24" type="text/javascript"></script>
 	<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 	<!-- text fonts -->
 	<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />

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

@@ -16,7 +16,7 @@
 		<link href="${ctxStatic}/awesome/4.4/css/font-awesome.min.css" rel="stylesheet" />
 		<!-- jeeplus -->
 		<link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-		<script src="${ctxStatic}/common/jeeplus.js?23" type="text/javascript"></script>
+		<script src="${ctxStatic}/common/jeeplus.js?24" type="text/javascript"></script>
 		<link rel="shortcut icon" href="images/favicon.png" type="image/png">
 		<!-- text fonts -->
 		<link rel="stylesheet" href="${ctxStatic }/common/login/ace-fonts.css" />

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

@@ -840,7 +840,7 @@
                                             <span id="idCardPortraitName1">
                                               <c:if test="${not empty workStaffBasicInfo.idCardPortraitPathStr}">
                                                 <div style="position:relative; display:inline-block;">
-                                                  <img src="${workStaffBasicInfo.idCardPortraitPathThumbnailStr}" width="50" height="50" style="cursor:pointer;" onclick="openLayerPreview('${workStaffBasicInfo.idCardPortraitPathStr}')" alt="身份证照片">
+                                                  <img src="${workStaffBasicInfo.idCardPortraitPathThumbnailStr}" width="50" height="50" style="cursor:pointer;" onclick="clickPicture('${workStaffBasicInfo.idCardPortraitPathStr}')" alt="身份证照片">
                                                 </div>
                                                   <!-- 下载按钮（重点）-->
                                                   <%--<a href="javascript:void(0);" title="下载 ${workStaffBasicInfo.idCardPortraitName}" style="color: #28a745; margin-left: 5px; text-decoration: none;" onclick="downloadFile('${ctx}', '${workStaffBasicInfo.idCardPortraitPath}', '${workStaffBasicInfo.idCardPortraitName}')"><i class="fa fa-download"></i></a>--%>
@@ -857,7 +857,7 @@
                                             <span id="idCardNationalEmblemName1">
                                               <c:if test="${not empty workStaffBasicInfo.idCardNationalEmblemPathStr}">
                                                 <div style="position:relative; display:inline-block;">
-                                                  <img src="${workStaffBasicInfo.idCardNationalEmblemPathThumbnailStr}" width="50" height="50" style="cursor:pointer;" onclick="openLayerPreview('${workStaffBasicInfo.idCardNationalEmblemPathStr}')" alt="身份证照片">
+                                                  <img src="${workStaffBasicInfo.idCardNationalEmblemPathThumbnailStr}" width="50" height="50" style="cursor:pointer;" onclick="clickPicture('${workStaffBasicInfo.idCardNationalEmblemPathStr}')" alt="身份证照片">
                                                 </div>
                                                   <!-- 下载按钮 -->
                                                   <%--<a href="javascript:void(0);" title="下载 ${workStaffBasicInfo.idCardNationalEmblemName}" style="color: #28a745; margin-left: 5px; text-decoration: none;" onclick="downloadFile('${ctx}', '${workStaffBasicInfo.idCardNationalEmblemPath}', '${workStaffBasicInfo.idCardNationalEmblemName}')"><i class="fa fa-download"></i></a>--%>
@@ -929,7 +929,7 @@
                                                             <%-- 图片展示 --%>
                                                             <img src="${safePhotoThumbnailUrl}" width="24" height="24"
                                                                  style="cursor:pointer; vertical-align:middle;"
-                                                                 onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${safePhotoUrl}','90%','90%')"
+                                                                 onclick="clickPicture('${safePhotoUrl}')"
                                                                  alt="图片预览" title="点击预览图片" />
 
                                                             <%-- 提取扩展名 --%>
@@ -955,7 +955,7 @@
                                                             <%-- 图片展示 --%>
                                                             <img src="${safeDegreeThumbnailUrl}" width="24" height="24"
                                                                  style="cursor:pointer; vertical-align:middle;"
-                                                                 onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${safeDegreeUrl}','90%','90%')"
+                                                                 onclick="clickPicture('${safeDegreeUrl}')"
                                                                  alt="图片预览" title="点击预览图片" />
 
                                                             <%-- 提取扩展名 --%>
@@ -1036,7 +1036,7 @@
                                                             <%-- 显示图片缩略图 --%>
                                                             <img src="${safeFilePathThumbnail}" width="24" height="24"
                                                                  style="cursor:pointer; vertical-align:middle;"
-                                                                 onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${safeFilePath}','90%','90%')"
+                                                                 onclick="clickPicture('${safeFilePath}')"
                                                                  alt="文件预览" title="点击预览" />
 
                                                             <%-- 下载按钮 --%>
@@ -1171,7 +1171,7 @@
                                                                 <c:when test="${ext == 'jpg' || ext == 'jpeg' || ext == 'png' || ext == 'gif' || ext == 'bmp' || ext == 'webp'}">
                                                                     <img src="${safeFilePathThumbnail}" width="24" height="24"
                                                                          style="cursor:pointer; vertical-align:middle;"
-                                                                         onclick="preview('预览','${safeFilePath}','90%','90%','1')"
+                                                                         onclick="clickPicture('${safeFilePath}')"
                                                                          alt="图片预览" title="点击预览图片" />
                                                                 </c:when>
 
@@ -1275,7 +1275,7 @@
                                                                 <c:when test="${ext == 'jpg' || ext == 'jpeg' || ext == 'png' || ext == 'gif' || ext == 'bmp' || ext == 'webp'}">
                                                                     <img src="${safeFilePathThumbnail}" width="24" height="24"
                                                                          style="cursor:pointer; vertical-align:middle;"
-                                                                         onclick="preview('预览','${safeFilePath}','90%','90%','1')"
+                                                                         onclick="clickPicture('${safeFilePath}')"
                                                                          alt="图片预览" title="点击预览图片" />
                                                                 </c:when>
 
@@ -1429,7 +1429,7 @@
                                                             <%-- 显示图片缩略图 --%>
                                                             <img src="${safeFilePathThumbnail}" width="24" height="24"
                                                                  style="cursor:pointer; vertical-align:middle;"
-                                                                 onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${safeFilePath}','90%','90%')"
+                                                                 onclick="clickPicture('${safeFilePath}')"
                                                                  alt="文件预览" title="点击预览" />
 
                                                             <%-- 下载按钮 --%>
@@ -1611,7 +1611,7 @@
                                                                         <!-- 图片预览 -->
                                                                         <img src="${buyDetails.filePathStr}" width="24" height="24"
                                                                              style="cursor:pointer; vertical-align:middle;"
-                                                                             onclick="preview('预览','${buyDetails.filePathStr}','90%','90%','1')"
+                                                                             onclick="clickPicture('${buyDetails.filePathStr}')"
                                                                              alt="图片预览" title="点击预览图片" />
                                                                     </c:when>
                                                                     <c:otherwise>

src/main/webapp/webpage/modules/workprojectnotify/workProjectNotifyList.jsp

@@ -1292,6 +1292,22 @@
 									"</a>";
 						}
 
+                    }
+                    else if(d.remarks == "待处理" && d.status != "1" && d.type == "186") {
+                    	if (d.isreply == "2"){
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+"【通过】"+  d.title +"</span>" +
+									"</a>";
+						}else if (d.isreply == "1"){
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\" style=\"color: red;\">"+"【驳回】"+  d.title +"</span>" +
+									"</a>";
+						}else {
+							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogre('"+ d.type1 +"待审批', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +
+									"<span title=\""+ d.title +"\">"+ d.title +"</span>" +
+									"</a>";
+						}
+
                     } else{
                     	if (d.isreply == "1"){
 							return "<a class=\"attention-info\"  href=\"javascript:void(0)\" onclick=\"openDialogView('"+ d.type1 +"', '${ctx}/workprojectnotify/workProjectNotify/form?id="+d.id+"&home=notifyList','95%','95%')\">" +

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

@@ -394,7 +394,7 @@
                 return;
             }
             var spanId = $(obj).attr("id") + 'Name' + index;
-            var imgStr = '<img src="'+url+'" width="24" height="24" onclick="openDialogView(\'预览\',\'${ctx}/sys/picturepreview/picturePreview?url='+url+'\',\'90%\',\'90%\')" alt="'+file.name+'">';
+            var imgStr = '<img src="'+url+'" width="24" height="24" onclick="clickPicture(\''+url+'\')" alt="'+file.name+'">';
             $('#'+spanId).html(imgStr);
         }
         function f1(row) {
@@ -623,7 +623,7 @@
                             <span id="idCardPortraitName1">
                               <c:if test="${not empty workStaffBasicInfo.idCardPortraitPathStr}">
                                 <div style="position:relative; display:inline-block;">
-                                  <img src="${workStaffBasicInfo.idCardPortraitPathThumbnailStr}" width="50" height="50" style="cursor:pointer;" onclick="openLayerPreview('${workStaffBasicInfo.idCardPortraitPathStr}')" alt="身份证照片">
+                                  <img src="${workStaffBasicInfo.idCardPortraitPathThumbnailStr}" width="50" height="50" style="cursor:pointer;" onclick="clickPicture('${workStaffBasicInfo.idCardPortraitPathStr}')" alt="身份证照片">
                                 </div>
                                   <!-- 下载按钮（重点）-->
                                   <a href="javascript:void(0);" title="下载 ${workStaffBasicInfo.idCardPortraitName}" style="color: #28a745; margin-left: 5px; text-decoration: none;" onclick="downloadFile('${ctx}', '${workStaffBasicInfo.idCardPortraitPath}', '${workStaffBasicInfo.idCardPortraitName}')"><i class="fa fa-download"></i></a>
@@ -645,7 +645,7 @@
                             <span id="idCardNationalEmblemName1">
                               <c:if test="${not empty workStaffBasicInfo.idCardNationalEmblemPathStr}">
                                 <div style="position:relative; display:inline-block;">
-                                  <img src="${workStaffBasicInfo.idCardNationalEmblemPathThumbnailStr}" width="50" height="50" style="cursor:pointer;" onclick="openLayerPreview('${workStaffBasicInfo.idCardNationalEmblemPathStr}')" alt="身份证照片">
+                                  <img src="${workStaffBasicInfo.idCardNationalEmblemPathThumbnailStr}" width="50" height="50" style="cursor:pointer;" onclick="clickPicture('${workStaffBasicInfo.idCardNationalEmblemPathStr}')" alt="身份证照片">
                                 </div>
                                   <!-- 下载按钮 -->
                                   <a href="javascript:void(0);" title="下载 ${workStaffBasicInfo.idCardNationalEmblemName}" style="color: #28a745; margin-left: 5px; text-decoration: none;" onclick="downloadFile('${ctx}', '${workStaffBasicInfo.idCardNationalEmblemPath}', '${workStaffBasicInfo.idCardNationalEmblemName}')"><i class="fa fa-download"></i></a>
@@ -785,11 +785,11 @@
                                                value="<fmt:formatDate value="${education.endDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                     </td>
                                     <td class="text-left op-td">
-                                        <span id="educationList${varStatus.index}_eduPhotoFileName1"><c:if test="${not empty education.eduPhotoThumbnailStr}"><img src="${education.eduPhotoThumbnailStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${education.eduPhotoStr}','90%','90%')" alt=""></c:if></span>
+                                        <span id="educationList${varStatus.index}_eduPhotoFileName1"><c:if test="${not empty education.eduPhotoThumbnailStr}"><img src="${education.eduPhotoThumbnailStr}" width="24" height="24" onclick="clickPicture('${education.eduPhotoStr}')" alt=""></c:if></span>
                                         <input id="educationList${varStatus.index}_eduPhotoFile" name="educationList[${varStatus.index}].eduPhotoFile" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                     </td>
                                     <td class="text-left op-td">
-                                        <span id="educationList${varStatus.index}_degreePhotoFileName1"><c:if test="${not empty education.degreePhotoThumbnailStr}"><img src="${education.degreePhotoThumbnailStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${education.degreePhotoStr}','90%','90%')" alt=""></c:if></span>
+                                        <span id="educationList${varStatus.index}_degreePhotoFileName1"><c:if test="${not empty education.degreePhotoThumbnailStr}"><img src="${education.degreePhotoThumbnailStr}" width="24" height="24" onclick="clickPicture('${education.degreePhotoStr}')" alt=""></c:if></span>
                                         <input id="educationList${varStatus.index}_degreePhotoFile" name="educationList[${varStatus.index}].degreePhotoFile" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                     </td>
                                 </tr>
@@ -838,7 +838,7 @@
                                                value="<fmt:formatDate value="${language.certifDate}" pattern="yyyy-MM-dd"/>" readOnly="true" />
                                     </td>
                                     <td class="text-left op-td">
-                                        <span id="languageList${varStatus.index}_fileName1"><c:if test="${not empty language.filePathThumbnailStr}"><img src="${language.filePathThumbnailStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${language.filePathStr}','90%','90%')" alt="${language.fileName}"></c:if></span>
+                                        <span id="languageList${varStatus.index}_fileName1"><c:if test="${not empty language.filePathThumbnailStr}"><img src="${language.filePathThumbnailStr}" width="24" height="24" onclick="clickPicture('${language.filePathStr}')" alt="${language.fileName}"></c:if></span>
                                         <input id="languageList${varStatus.index}_file" name="languageList[${varStatus.index}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                     </td>
                                 </tr>
@@ -1200,7 +1200,7 @@
                                         <input id="trainingList${varStatus.index}_certificate" name="trainingList[${varStatus.index}].certificate" readonly="true" class="form-control " value="${training.certificate}"/>
                                     </td>
                                     <td class="text-left op-td">
-                                        <span id="trainingList${varStatus.index}_fileName1"><c:if test="${not empty training.filePathThumbnailStr}"><img src="${training.filePathThumbnailStr}" width="24" height="24" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${training.filePathStr}','90%','90%')" alt=""></c:if></span>
+                                        <span id="trainingList${varStatus.index}_fileName1"><c:if test="${not empty training.filePathThumbnailStr}"><img src="${training.filePathThumbnailStr}" width="24" height="24" onclick="clickPicture('${training.filePathStr}')" alt=""></c:if></span>
                                         <input id="trainingList${varStatus.index}_file" name="trainingList[${varStatus.index}].file" style="display:none" type="file" onchange="changeFileName(this,1)"/>
                                     </td>
                                     <td>

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

@@ -276,6 +276,16 @@
                             </form:select>
                         </div>
                     </div>
+
+                    <div class="layui-item query athird">
+                        <label class="layui-form-label">是否完善信息：</label>
+                        <div class="layui-input-block">
+                            <form:select path="isCompleteInformation" class="form-control simple-select">
+                                <form:option value="" label=""/>
+                                <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                            </form:select>
+                        </div>
+                    </div>
                 </div>
             </form:form>
 	        </div>

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

@@ -307,7 +307,7 @@
                             <span id="idCardPortraitName1">
                           <c:if test="${not empty workStaffBasicInfo.idCardPortraitPathStr}">
                             <div style="position:relative; display:inline-block;">
-                              <img src="${workStaffBasicInfo.idCardPortraitPathStr}" width="50" height="50" style="cursor:pointer;" onclick="openLayerPreview('${workStaffBasicInfo.idCardPortraitPathStr}')" alt="身份证照片">
+                              <img src="${workStaffBasicInfo.idCardPortraitPathStr}" width="50" height="50" style="cursor:pointer;" onclick="clickPicture('${workStaffBasicInfo.idCardPortraitPathStr}')" alt="身份证照片">
                                 <!-- 删除按钮 -->
                               <i class="fa fa-times-circle" style="position:absolute; top:-8px; right:-8px; color:red; cursor:pointer;" onclick="deleteImage('idCardPortraitName1', 'idCardPortrait')"></i>
                             </div>
@@ -330,7 +330,7 @@
                             <span id="idCardNationalEmblemName1">
                           <c:if test="${not empty workStaffBasicInfo.idCardNationalEmblemPathStr}">
                             <div style="position:relative; display:inline-block;">
-                              <img src="${workStaffBasicInfo.idCardNationalEmblemPathStr}" width="50" height="50" style="cursor:pointer;" onclick="openLayerPreview('${workStaffBasicInfo.idCardNationalEmblemPathStr}')" alt="身份证照片">
+                              <img src="${workStaffBasicInfo.idCardNationalEmblemPathStr}" width="50" height="50" style="cursor:pointer;" onclick="clickPicture('${workStaffBasicInfo.idCardNationalEmblemPathStr}')" alt="身份证照片">
                                 <!-- 删除按钮 -->
                               <i class="fa fa-times-circle" style="position:absolute; top:-8px; right:-8px; color:red; cursor:pointer;" onclick="deleteImage('idCardNationalEmblemName1', 'idCardNationalEmblem')"></i>
                             </div>
@@ -494,7 +494,7 @@
                                             <%-- 图片展示 --%>
                                             <img src="${safePhotoUrl}" width="24" height="24"
                                                  style="cursor:pointer; vertical-align:middle;"
-                                                 onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${safePhotoUrl}','90%','90%')"
+                                                 onclick="clickPicture('${safePhotoUrl}')"
                                                  alt="图片预览" title="点击预览图片" />
 
                                             <%-- 提取扩展名 --%>
@@ -519,7 +519,7 @@
                                             <%-- 图片展示 --%>
                                             <img src="${safeDegreeUrl}" width="24" height="24"
                                                  style="cursor:pointer; vertical-align:middle;"
-                                                 onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${safeDegreeUrl}','90%','90%')"
+                                                 onclick="clickPicture('${safeDegreeUrl}')"
                                                  alt="图片预览" title="点击预览图片" />
 
                                             <%-- 提取扩展名 --%>
@@ -600,7 +600,7 @@
                                             <%-- 显示图片缩略图 --%>
                                             <img src="${safeFilePath}" width="24" height="24"
                                                  style="cursor:pointer; vertical-align:middle;"
-                                                 onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${safeFilePath}','90%','90%')"
+                                                 onclick="clickPicture('${safeFilePath}')"
                                                  alt="文件预览" title="点击预览" />
 
                                             <%-- 下载按钮 --%>
@@ -722,7 +722,7 @@
                                                 <c:when test="${ext == 'jpg' || ext == 'jpeg' || ext == 'png' || ext == 'gif' || ext == 'bmp' || ext == 'webp'}">
                                                     <img src="${safeFilePath}" width="24" height="24"
                                                          style="cursor:pointer; vertical-align:middle;"
-                                                         onclick="preview('预览','${safeFilePath}','90%','90%','1')"
+                                                         onclick="clickPicture('${safeFilePath}')"
                                                          alt="图片预览" title="点击预览图片" />
                                                 </c:when>
 
@@ -823,7 +823,7 @@
                                                 <c:when test="${ext == 'jpg' || ext == 'jpeg' || ext == 'png' || ext == 'gif' || ext == 'bmp' || ext == 'webp'}">
                                                     <img src="${safeFilePath}" width="24" height="24"
                                                          style="cursor:pointer; vertical-align:middle;"
-                                                         onclick="preview('预览','${safeFilePath}','90%','90%','1')"
+                                                         onclick="clickPicture('${safeFilePath}')"
                                                          alt="图片预览" title="点击预览图片" />
                                                 </c:when>
 
@@ -976,7 +976,7 @@
                                             <%-- 显示图片缩略图 --%>
                                             <img src="${safeFilePath}" width="24" height="24"
                                                  style="cursor:pointer; vertical-align:middle;"
-                                                 onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${safeFilePath}','90%','90%')"
+                                                 onclick="clickPicture('${safeFilePath}')"
                                                  alt="文件预览" title="点击预览" />
 
                                             <%-- 下载按钮 --%>
@@ -1158,7 +1158,7 @@
                                                                         <!-- 图片预览 -->
                                                                         <img src="${buyDetails.filePathStr}" width="24" height="24"
                                                                              style="cursor:pointer; vertical-align:middle;"
-                                                                             onclick="preview('预览','${buyDetails.filePathStr}','90%','90%','1')"
+                                                                             onclick="clickPicture('${buyDetails.filePathStr}')"
                                                                              alt="图片预览" title="点击预览图片" />
                                                                     </c:when>
                                                                     <c:otherwise>
@@ -1202,6 +1202,19 @@
                         </table>
                     </div>
                 </div>
+
+                <c:if test="${not empty workStaffBasicInfo.act.comment}">
+                    <div class="form-group-label">
+                        <h2>驳回原因</h2>
+                    </div>
+                    <div class="layui-item layui-col-sm8 lw6 with-textarea">
+                        <div class="layui-input-block" style="margin-left:10px;position: relative">
+                            <textarea path="" id="opinion" class="form-control"  rows="4" style="width: 100%; height: 80%; border: 1px solid #f1f1f1;
+                             padding: 5px; background-color: #f9f9f9; font-weight: bold;" readonly maxlength="500">${workStaffBasicInfo.act.comment}</textarea>
+                            <input type="file" name="upload_files" style="display: none;">
+                        </div>
+                    </div>
+                </c:if>
                 <%--<div class="form-group layui-row">
                     <div class="form-group-label"><h2>电子档案</h2></div>
                     <div class="layui-item layui-col-xs12 form-table-container">