liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '20220411-zjl-评审室-评审结果-评审报告处，编辑后保存，在打开，显示文件存取错误' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220418-zjl-报表打印另存为默认格式打开文件内容乱码

Browse Source
This commit is contained in:
jl-zhoujl2
2022-04-18 21:03:44 +08:00
parent 83a113036e 6a5d5a1ef5
commit 4c907686a6
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/Evaluation/ReportPrint/index.tsx
View File

@ -88,7 +88,9 @@ const ReportPrint: React.FC<{}> = () => {
const onClickLink = (url: string, name: string, type: string, data: any) => {
editLoading();
window.ntkoBrowser.openWindow('/Weboffice4Path.html?path=' + encodeURIComponent(url) + '&fileType=' + type + '&fileName=' + `${data.sectionName}-${data.sectionNum}-${data.roomType == 1 ? '预审' : ''}${name}${defId == 'recruit_multi' ? `第${data.roomSort}轮` : ''}${data.reviewMark == 1 ? `（第${data.reviewSort}次重新评审）` : ''}`);
const fileName: string = `${data.sectionName}-${data.sectionNum}-${data.roomType == 1 ? '预审' : ''}${name}${defId == 'recruit_multi' ? `第${data.roomSort}轮` : ''}${data.reviewMark == 1 ? `（第${data.reviewSort}次重新评审）` : ''}`;
const format = fileName.replace(/\//g, "-") //格式化文件名称
window.ntkoBrowser.openWindow('/Weboffice4Path.html?path=' + encodeURIComponent(url) + '&fileType=' + type + '&fileName=' + format);
};
return (

5
src/pages/webOffice/weboffice0609.tsx
View File

@ -2,7 +2,7 @@
* @Author: zhoujianlong
* @Date: 2021-06-09 15:29:07
* @Last Modified by: zhoujianlong
* @Last Modified time: 2022-03-07 10:51:39
* @Last Modified time: 2022-04-11 20:13:27
*/
import { Button, Modal } from 'antd';
import { LoadingOutlined } from '@ant-design/icons';
@ -259,7 +259,8 @@ const WebOffice0609: React.FC<WebOfficeProps> = (props) => {
}
openUrl += `.html?readonly=${readOnly}&DocfileCode=${docFileCode_}&PDFfileCode=${pdfFileCode_}&HTMLfileCode=${htmlFileCode_}&savePDF=${savePDF}&saveHTML=${saveHTML}`;
if (fileName != '') {
openUrl += `&fileName=${fileName}`
const format = fileName.replace(/\//g, "-") //格式化文件名称
openUrl += `&fileName=${format}`
}
window.ntkoBrowser.openWindow(openUrl);
}}