pdf文件下载修改

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordsDao.java

@@ -87,11 +87,17 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
 
 
     /**
-     * 查询即将超期的项目数据信息
+     * 查询即将超期的项目数据信息（紧急）
      * @param records
      * @return
      */
     List<RuralProjectRecords> getProjectReportedListByAdvent(RuralProjectRecords records);
+    /**
+     * 查询即将超期的项目数据信息(非紧急)
+     * @param records
+     * @return
+     */
+    List<RuralProjectRecords> getProjectReportedListByAdventNoUrgency(RuralProjectRecords records);
 
     /**
      * 查询即将超期的项目数据信息
@@ -99,6 +105,12 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
      * @return
      */
     List<RuralProjectRecords> getProjectNotReportList(RuralProjectRecords records);
+    /**
+     * 查询即将超期的项目数据信息
+     * @param records
+     * @return
+     */
+    List<RuralProjectRecords> getProjectNotReportListNoUrgency(RuralProjectRecords records);
 
     //批量修改项目上报状态
     void updateProjectReportedState(@Param("idList") List<String> idList);
@@ -171,13 +183,13 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
     List<RuralProjectRecords> getProjectRecordListByAdvent(RuralProjectRecords records);
 
     /**
-     * 查询即将超期的项目数据信息(紧急项目-电子归档)
+     * 查询超期的项目数据信息(紧急项目-电子归档)
      * @param records
      * @return
      */
     List<RuralProjectRecords> getProjectNotrecordListExamine(RuralProjectRecords records);
     /**
-     * 查询即将超期的项目数据信息(紧急项目-电子归档)
+     * 查询超期的项目数据信息(紧急项目-电子归档)
      * @param records
      * @return
      */

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

@@ -1609,6 +1609,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		}
 		//获取项目数据（提前三天进行通知 即 获取即将超期的数据）
 		List<RuralProjectRecords> projectRecordsList = dao.getProjectReportedListByAdvent(projectRecords);
+		List<RuralProjectRecords> projectRecordsListNoUrgency = dao.getProjectReportedListByAdventNoUrgency(projectRecords);
+		projectRecordsList.addAll(projectRecordsListNoUrgency);
 		for (RuralProjectRecords info: projectRecordsList) {
 			String notifyStr = null;
 			String titleStr = null;
@@ -1638,6 +1640,8 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		}
 		//获取项目数据（获取已经超期的项目数据，进行修改超期状态）
 		List<RuralProjectRecords> projectNotReportList = dao.getProjectNotReportList(projectRecords);
+		List<RuralProjectRecords> projectNotReportListNoUrgency = dao.getProjectNotReportList(projectRecords);
+		projectNotReportList.addAll(projectNotReportListNoUrgency);
 		List<String> idList = Lists.newArrayList();
 		if(projectNotReportList.size()>0) {
 			for (RuralProjectRecords info : projectNotReportList){

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -1279,6 +1279,32 @@
 			left join sys_office so on so.id = su.office_id
 		<where>
 			a.del_flag = 0
+			and a.emergency_project = 1
+			and (a.reported_state=6 or a.reported_state is null)
+			and prd.status = 5
+			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
+		</where>
+	</select>
+
+	<select id="getProjectReportedListByAdventNoUrgency" resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords" >
+		SELECT
+			<include refid="projectRecordsColumns"/>
+			,date_add(date_format(prd.audit_pass_date, '%Y-%m-%d'),interval #{endingCount} day) as adventDate
+			,date_add(date_format(prd.audit_pass_date, '%Y-%m-%d'),interval #{endingCount} day) as adventDateDate
+			,a.project_type as "projectType"
+			FROM rural_project_records a
+			left join work_contract_info wci on a.contract_id = wci.id
+			left join project_report_data_two prd on prd.project_id = a.id
+			left join rural_project_report_record prr on prr.report_id = prd.id
+			left join sys_user u on u.id = a.create_by
+			left join sys_office o on o.id = a.office_id
+			LEFT JOIN sys_area area ON area.id = a.area_id
+			LEFT JOIN work_project_user w1 on a.id = w1.project_id
+			left join sys_user su on su.id = w1.user_id
+			left join sys_office so on so.id = su.office_id
+		<where>
+			a.del_flag = 0
+			and (a.emergency_project = 0 or a.emergency_project is null)
 			and (a.reported_state=6 or a.reported_state is null)
 			and prd.status = 5
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
@@ -1302,6 +1328,33 @@
 			left join sys_office so on so.id = su.office_id
 		<where>
 			a.del_flag = 0
+			and a.emergency_project = 1
+			and (a.reported_state!=5 or a.reported_state is null)
+			and prd.status = 5
+			and now() > date_add(prd.audit_pass_date,interval #{endingCount} day)
+			and prd.audit_pass_date is not null
+			and a.reported_state is null
+		</where>
+	</select>
+
+	<select id="getProjectNotReportListNoUrgency" resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords" >
+		SELECT
+		<include refid="projectRecordsColumns"/>
+		,date_add(date_format(prd.audit_pass_date, '%Y-%m-%d'),interval #{endingCount} day) as adventDate
+		,a.project_type as "projectType"
+		FROM rural_project_records a
+		left join work_contract_info wci on a.contract_id = wci.id
+		left join project_report_data_two prd on prd.project_id = a.id
+		left join rural_project_report_record prr on prr.report_id = prd.id
+		left join sys_user u on u.id = a.create_by
+		left join sys_office o on o.id = a.office_id
+		LEFT JOIN sys_area area ON area.id = a.area_id
+		LEFT JOIN work_project_user w1 on a.id = w1.project_id
+		left join sys_user su on su.id = w1.user_id
+		left join sys_office so on so.id = su.office_id
+		<where>
+			a.del_flag = 0
+			and (a.emergency_project = 0 or a.emergency_project is null)
 			and (a.reported_state!=5 or a.reported_state is null)
 			and prd.status = 5
 			and now() > date_add(prd.audit_pass_date,interval #{endingCount} day)
@@ -1610,6 +1663,7 @@
 		left join sys_office so on so.id = su.office_id
 		<where>
 			a.del_flag = 0
+			and a.emergency_project = 1
 			and (a.record_state=6 or a.record_state is null)
 			and prd.status = 5
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
@@ -1633,6 +1687,7 @@
 		left join sys_office so on so.id = su.office_id
 		<where>
 			a.del_flag = 0
+			and (a.emergency_project = 0 or a.emergency_project is null)
 			and (a.record_state=6 or a.record_state is null)
 			and prd.status = 5
 			and now() > date_add(prd.audit_pass_date,interval #{startCount} day)
@@ -1656,6 +1711,7 @@
 		left join sys_office so on so.id = su.office_id
 		<where>
 			a.del_flag = 0
+			and a.emergency_project = 1
 			and (a.record_state!=5 or a.record_state is null)
 			and prd.status = 5
 			and now() > date_add(prd.audit_pass_date,interval #{endingCount} day)
@@ -1682,6 +1738,7 @@
 		left join sys_office so on so.id = su.office_id
 		<where>
 			a.del_flag = 0
+			and (a.emergency_project = 0 or a.emergency_project is null)
 			and (a.record_state!=5 or a.record_state is null)
 			and prd.status = 5
 			and now() > date_add(prd.audit_pass_date,interval #{endingCount} day)

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

@@ -769,7 +769,7 @@ function multitest (ossClient, storeAs, file,attachmentId,attachmentFlag,uploadP
                         '<div class="op-btn-box">';
                     if(2 == fileLocation){
                         if(isContains("pdf",lowerType)){
-                            str = str +'<a href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
+                            str = str +'<a href="'+lookUrl+'" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
                         }else{
                             str = str +'<a href="'+lookUrl+'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
                         }
@@ -954,7 +954,7 @@ function multitestRecordsReported (ossClient, storeAs, file,attachmentId,attachm
                         '<div class="op-btn-box">';
                     if(2 == fileLocation){
                         if(isContains("pdf",lowerType)){
-                            str = str +'<a href="javascript:void(0)" onclick="openPreview(\''+lookUrl+'\',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
+                            str = str +'<a href="'+lookUrl+'" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
                         }else{
                             str = str +'<a href="'+lookUrl+'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>';
                         }

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

@@ -520,7 +520,7 @@
 															<c:when test="${projectcontentinfo.uploadMode == 2}">
 																<c:choose>
 																	<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																		<a href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																		<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																	</c:when>
 																	<c:otherwise>
 																		<a href="${fileAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -674,7 +674,7 @@
 															<c:when test="${projectcontentinfo.uploadMode == 2}">
 																<c:choose>
 																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																		<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																	</c:when>
 																	<c:otherwise>
 																		<a href="${fileGistdata.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -829,7 +829,7 @@
 															<c:when test="${projectcontentinfo.uploadMode == 2}">
 																<c:choose>
 																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																	</c:when>
 																	<c:otherwise>
 																		<a href="${fileOther.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1122,7 +1122,7 @@
 																	<c:when test="${workContractInfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -541,7 +541,7 @@
 															<c:when test="${projectcontentinfo.uploadMode == 2}">
 																<c:choose>
 																	<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																		<a href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																		<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																	</c:when>
 																	<c:otherwise>
 																		<a href="${fileAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -695,7 +695,7 @@
 															<c:when test="${projectcontentinfo.uploadMode == 2}">
 																<c:choose>
 																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																		<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																	</c:when>
 																	<c:otherwise>
 																		<a href="${fileGistdata.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -850,7 +850,7 @@
 															<c:when test="${projectcontentinfo.uploadMode == 2}">
 																<c:choose>
 																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																	</c:when>
 																	<c:otherwise>
 																		<a href="${fileOther.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1143,7 +1143,7 @@
 																	<c:when test="${workContractInfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/oa/oaNotifyAdminForm.jsp

@@ -309,7 +309,7 @@
                                             <c:when test="${workReimbursement.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                     </c:when>
                                                     <c:otherwise>
                                                         <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/oa/oaNotifyAudit.jsp

@@ -466,7 +466,7 @@
                                                 <c:when test="${oaNotify.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/oa/oaNotifyForm.jsp

@@ -523,7 +523,7 @@
                                             <c:when test="${oaNotify.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                     </c:when>
                                                     <c:otherwise>
                                                         <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/oa/oaNotifyModifyApply.jsp

@@ -499,7 +499,7 @@
                                             <c:when test="${oaNotify.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                     </c:when>
                                                     <c:otherwise>
                                                         <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/oa/oaNotifyView.jsp

@@ -401,7 +401,7 @@
                                             <c:when test="${oaNotify.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                     </c:when>
                                                     <c:otherwise>
                                                         <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -517,7 +517,7 @@
 																	<c:when test="${projectReportRecord.uploadMode == 2}">
 																		<c:choose>
 																			<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																				<a href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																				<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${fileAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -649,7 +649,7 @@
 																	<c:when test="${projectReportRecord.uploadMode == 2}">
 																		<c:choose>
 																			<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																				<a href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																				<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${fileGistdata.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -782,7 +782,7 @@
 																	<c:when test="${projectReportRecord.uploadMode == 2}">
 																		<c:choose>
 																			<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																				<a href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																				<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${fileOther.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -446,7 +446,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -576,7 +576,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -705,7 +705,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingForm.jsp

@@ -408,7 +408,7 @@
                                             <c:when test="${projectRecords.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                     </c:when>
                                                     <c:otherwise>
                                                         <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostForm.jsp

@@ -409,7 +409,7 @@
                                             <c:when test="${projectRecords.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                     </c:when>
                                                     <c:otherwise>
                                                         <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanView.jsp

@@ -329,7 +329,7 @@
                                             <c:when test="${projectRecords.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                     </c:when>
                                                     <c:otherwise>
                                                         <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/bzshbReportedAudit.jsp

@@ -1551,7 +1551,7 @@
                                                 <c:when test="${ruralProjectRecordsReported.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/newReportedForm.jsp

@@ -1594,7 +1594,7 @@
                                                 <c:when test="${ruralProjectRecordsReported.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedAudit.jsp

@@ -1606,7 +1606,7 @@
                                                 <c:when test="${ruralProjectRecordsReported.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedModify.jsp

@@ -1596,7 +1596,7 @@
                                                 <c:when test="${ruralProjectRecordsReported.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReportedForm.jsp

@@ -1562,7 +1562,7 @@
                                                 <c:when test="${ruralProjectRecordsReported.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -1387,7 +1387,7 @@
 												<c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1570,7 +1570,7 @@
 												<c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1750,7 +1750,7 @@
 												<c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/reportedModify.jsp

@@ -1559,7 +1559,7 @@
                                                 <c:when test="${ruralProjectRecordsReported.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -294,7 +294,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${fileAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -423,7 +423,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${fileGistdata.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -554,7 +554,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${fileOther.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -359,7 +359,7 @@
 												<c:when test="${materialDefectRecord.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -535,7 +535,7 @@
 												<c:when test="${materialDefectRecord.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -711,7 +711,7 @@
 												<c:when test="${materialDefectRecord.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -358,7 +358,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -534,7 +534,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -710,7 +710,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -556,7 +556,7 @@
 																	<c:when test="${materialDefectRecord.uploadMode == 2}">
 																		<c:choose>
 																			<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																				<a href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																				<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${fileAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -713,7 +713,7 @@
 																	<c:when test="${materialDefectRecord.uploadMode == 2}">
 																		<c:choose>
 																			<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																				<a href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																				<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${fileGistdata.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -871,7 +871,7 @@
 																	<c:when test="${materialDefectRecord.uploadMode == 2}">
 																		<c:choose>
 																			<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																				<a href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																				<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${fileOther.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -374,7 +374,7 @@
 												<c:when test="${materialDefectRecord.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -531,7 +531,7 @@
 												<c:when test="${materialDefectRecord.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -687,7 +687,7 @@
 												<c:when test="${materialDefectRecord.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -524,7 +524,7 @@
 																	<c:when test="${materialDefectRecord.uploadMode == 2}">
 																		<c:choose>
 																			<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																				<a href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																				<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${fileAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -681,7 +681,7 @@
 																	<c:when test="${materialDefectRecord.uploadMode == 2}">
 																		<c:choose>
 																			<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																				<a href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																				<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${fileGistdata.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -839,7 +839,7 @@
 																	<c:when test="${materialDefectRecord.uploadMode == 2}">
 																		<c:choose>
 																			<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																				<a href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																				<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${fileOther.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -551,7 +551,7 @@
 																	<c:when test="${projectReportRecord.uploadMode == 2}">
 																		<c:choose>
 																			<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																				<a href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																				<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${fileAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -708,7 +708,7 @@
 																	<c:when test="${projectReportRecord.uploadMode == 2}">
 																		<c:choose>
 																			<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																				<a href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																				<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${fileGistdata.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -866,7 +866,7 @@
 																	<c:when test="${projectReportRecord.uploadMode == 2}">
 																		<c:choose>
 																			<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																				<a href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																				<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${fileOther.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -365,7 +365,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -537,7 +537,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -709,7 +709,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -379,7 +379,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
                                                         <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                            <a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -553,7 +553,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
                                                         <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                            <a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -727,7 +727,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
                                                         <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-                                                            <a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -375,7 +375,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -532,7 +532,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -688,7 +688,7 @@
 												<c:when test="${projectReportRecord.uploadMode == 2}">
 													<c:choose>
 														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
-															<a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -713,7 +713,7 @@
 															<c:when test="${projectcontentinfo.uploadMode == 2}">
 																<c:choose>
 																	<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																		<a href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																		<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																	</c:when>
 																	<c:otherwise>
 																		<a href="${fileAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -869,7 +869,7 @@
 															<c:when test="${projectcontentinfo.uploadMode == 2}">
 																<c:choose>
 																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																		<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																	</c:when>
 																	<c:otherwise>
 																		<a href="${fileGistdata.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1027,7 +1027,7 @@
 															<c:when test="${projectcontentinfo.uploadMode == 2}">
 																<c:choose>
 																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																	</c:when>
 																	<c:otherwise>
 																		<a href="${fileOther.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1392,7 +1392,7 @@
 																	<c:when test="${workContractInfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -673,7 +673,7 @@
 															<c:when test="${projectcontentinfo.uploadMode == 2}">
 																<c:choose>
 																	<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																		<a href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																		<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																	</c:when>
 																	<c:otherwise>
 																		<a href="${fileAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -809,7 +809,7 @@
 															<c:when test="${projectcontentinfo.uploadMode == 2}">
 																<c:choose>
 																	<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																		<a href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																		<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																	</c:when>
 																	<c:otherwise>
 																		<a href="${fileGistdata.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -947,7 +947,7 @@
 															<c:when test="${projectcontentinfo.uploadMode == 2}">
 																<c:choose>
 																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																	</c:when>
 																	<c:otherwise>
 																		<a href="${fileOther.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1223,7 +1223,7 @@
 																	<c:when test="${workContractInfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -987,7 +987,7 @@
                                                 <c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1138,7 +1138,7 @@
                                                 <c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1289,7 +1289,7 @@
                                                 <c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -674,7 +674,7 @@
                                                 <c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -805,7 +805,7 @@
                                                 <c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -936,7 +936,7 @@
                                                 <c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -1320,7 +1320,7 @@
 												<c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1503,7 +1503,7 @@
 												<c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1685,7 +1685,7 @@
 												<c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -919,7 +919,7 @@
 												<c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1082,7 +1082,7 @@
 												<c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -1244,7 +1244,7 @@
 												<c:when test="${projectcontentinfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -540,7 +540,7 @@
 														<c:when test="${projectcontentinfo.uploadMode == 2}">
 															<c:choose>
 																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																	<a href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																	<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																</c:when>
 																<c:otherwise>
 																	<a href="${fileAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -695,7 +695,7 @@
 													<c:when test="${projectcontentinfo.uploadMode == 2}">
 														<c:choose>
 															<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																<a href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 															</c:when>
 															<c:otherwise>
 																<a href="${fileGistdata.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -851,7 +851,7 @@
 													<c:when test="${projectcontentinfo.uploadMode == 2}">
 														<c:choose>
 															<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																<a href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 															</c:when>
 															<c:otherwise>
 																<a href="${fileOther.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -635,7 +635,7 @@
 														<c:when test="${projectcontentinfo.uploadMode == 2}">
 															<c:choose>
 																<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																	<a href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																	<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																</c:when>
 																<c:otherwise>
 																	<a href="${fileAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -792,7 +792,7 @@
 													<c:when test="${projectcontentinfo.uploadMode == 2}">
 														<c:choose>
 															<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																<a href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 															</c:when>
 															<c:otherwise>
 																<a href="${fileGistdata.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -950,7 +950,7 @@
 													<c:when test="${projectcontentinfo.uploadMode == 2}">
 														<c:choose>
 															<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																<a href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 															</c:when>
 															<c:otherwise>
 																<a href="${fileOther.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedAudit.jsp

@@ -1574,7 +1574,7 @@
                                                 <c:when test="${ruralProjectRecordsReported.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp

@@ -1578,7 +1578,7 @@
                                                 <c:when test="${ruralProjectRecordsReported.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedView.jsp

@@ -555,7 +555,7 @@
                                                 <c:when test="${ruralProjectRecordsReported.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                         </c:when>
                                                         <c:otherwise>
                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

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

@@ -218,7 +218,7 @@
 													<c:when test="${projectcontentinfo.uploadMode == 2}">
 														<c:choose>
 															<c:when test="${fn:containsIgnoreCase(fileAttachment.attachName,'pdf')}">
-																<a href="javascript:void(0)" onclick="openPreview('${fileAttachment.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																<a href="${fileAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 															</c:when>
 															<c:otherwise>
 																<a href="${fileAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -374,7 +374,7 @@
 													<c:when test="${projectcontentinfo.uploadMode == 2}">
 														<c:choose>
 															<c:when test="${fn:containsIgnoreCase(fileGistdata.attachName,'pdf')}">
-																<a href="javascript:void(0)" onclick="openPreview('${fileGistdata.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																<a href="${fileGistdata.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 															</c:when>
 															<c:otherwise>
 																<a href="${fileGistdata.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
@@ -529,7 +529,7 @@
 															<c:when test="${projectcontentinfo.uploadMode == 2}">
 																<c:choose>
 																	<c:when test="${fn:containsIgnoreCase(fileOther.attachName,'pdf')}">
-																		<a href="javascript:void(0)" onclick="openPreview('${fileOther.temporaryUrl}',1)" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																		<a href="${fileOther.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																	</c:when>
 																	<c:otherwise>
 																		<a href="${fileOther.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -1007,7 +1007,7 @@
                                             <c:when test="${workClientInfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                     </c:when>
                                                     <c:otherwise>
                                                         <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workclientinfo/workClientInfoFormDetail.jsp

@@ -272,7 +272,7 @@
                                             <c:when test="${workClientInfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                     </c:when>
                                                     <c:otherwise>
                                                         <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workcontractinfo/workContractAudit.jsp

@@ -321,7 +321,7 @@
                                                                 <c:when test="${workContractInfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                                         </c:when>
                                                                         <c:otherwise>
                                                                             <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormAdd.jsp

@@ -988,7 +988,7 @@
 														<c:when test="${workContractInfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																</c:when>
 																<c:otherwise>
 																	<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormEdit.jsp

@@ -930,7 +930,7 @@
 												<c:when test="${workContractInfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 														</c:when>
 														<c:otherwise>
 															<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForm.jsp

@@ -533,7 +533,7 @@
 																	<c:when test="${workContractInfo.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 																			</c:when>
 																			<c:otherwise>
 																				<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp

@@ -413,7 +413,7 @@
 										<c:when test="${workContractRecord.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:when>
 												<c:otherwise>
 													<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp

@@ -433,7 +433,7 @@
 											<c:when test="${workContractRecord.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 													</c:when>
 													<c:otherwise>
 														<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workcontractrecord/workContractView.jsp

@@ -364,7 +364,7 @@
 										<c:when test="${workContractRecord.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:when>
 												<c:otherwise>
 													<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceAudit.jsp

@@ -339,7 +339,7 @@
 										<c:when test="${workInvoice.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:when>
 												<c:otherwise>
 													<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workinvoice/conditionWorkInvoiceModify.jsp

@@ -575,7 +575,7 @@
 											<c:when test="${workInvoice.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 													</c:when>
 													<c:otherwise>
 														<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllForm.jsp

@@ -786,7 +786,7 @@
 											<c:when test="${workInvoice.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 													</c:when>
 													<c:otherwise>
 														<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllReceiptForm.jsp

@@ -438,7 +438,7 @@
 											<c:when test="${workInvoice.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 													</c:when>
 													<c:otherwise>
 														<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workinvoice/workInvoiceAuditEnd.jsp

@@ -741,7 +741,7 @@
 										<c:when test="${workInvoice.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 												</c:when>
 												<c:otherwise>
 													<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workinvoice/workInvoiceForm.jsp

@@ -785,7 +785,7 @@
 											<c:when test="${workInvoice.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 													</c:when>
 													<c:otherwise>
 														<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workinvoice/workInvoiceModify.jsp

@@ -808,7 +808,7 @@
 											<c:when test="${workInvoice.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 													</c:when>
 													<c:otherwise>
 														<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workinvoice/workInvoiceView.jsp

@@ -296,7 +296,7 @@
 											<c:when test="${workInvoice.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 													</c:when>
 													<c:otherwise>
 														<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAllFormAdd.jsp

@@ -997,7 +997,7 @@
                                         <c:when test="${workReimbursement.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                 </c:when>
                                                 <c:otherwise>
                                                     <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAllModifyApply.jsp

@@ -1088,7 +1088,7 @@
                                         <c:when test="${workReimbursement.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                 </c:when>
                                                 <c:otherwise>
                                                     <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementAudit.jsp

@@ -474,7 +474,7 @@
 											<c:when test="${workReimbursement.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
 													</c:when>
 													<c:otherwise>
 														<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementCWAudit.jsp

@@ -793,7 +793,7 @@
                                         <c:when test="${workReimbursement.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                 </c:when>
                                                 <c:otherwise>
                                                     <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp

@@ -1073,7 +1073,7 @@
                                         <c:when test="${workReimbursement.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                 </c:when>
                                                 <c:otherwise>
                                                     <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormDetail.jsp

@@ -529,7 +529,7 @@
                                     <c:when test="${workReimbursement.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                             </c:when>
                                             <c:otherwise>
                                                 <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>

src/main/webapp/webpage/modules/workreimbursement/workReimbursementModifyApply.jsp

@@ -1160,7 +1160,7 @@
                                         <c:when test="${workReimbursement.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="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
                                                 </c:when>
                                                 <c:otherwise>
                                                     <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>