diff --git a/src/api/workCenter.js b/src/api/workCenter.js index 88f26282..c862470e 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -429,6 +429,8 @@ const queryStandardComplianceEvaluateDetail = (params) => getAction('/process/pr // 在线编辑-生成空白模板 const generateEmptyFileTemplate = (params) => getAction('/onlyOffice/saveEditFile', params) +// 在线编辑-通过在线编辑的文件id获取文件信息 +const queryFileInfoByEditId = (params) => getAction('/onlyOffice/queryById', params) export { getProcessNodeList, @@ -646,5 +648,6 @@ export { queryStandardComplianceResult, queryStandardComplianceEvaluateDetail, - generateEmptyFileTemplate + generateEmptyFileTemplate, + queryFileInfoByEditId } diff --git a/src/utils/onlyOfficeUtils.js b/src/utils/onlyOfficeUtils.js index b4b00501..3fde92b3 100644 --- a/src/utils/onlyOfficeUtils.js +++ b/src/utils/onlyOfficeUtils.js @@ -1,5 +1,4 @@ -import { getFileInfo } from '../api/api' -import { generateEmptyFileTemplate } from '../api/workCenter' +import { generateEmptyFileTemplate, queryFileInfoByEditId } from '../api/workCenter' import { USER_INFO } from '../store/mutation-types' import Vue from 'vue' @@ -11,7 +10,7 @@ import Vue from 'vue' const queryFileInfo = (fileId) => { return new Promise(resolve => { let fileInfo - getFileInfo({ id: fileId }).then(res => { + queryFileInfoByEditId({ id: fileId }).then(res => { if (res.success) { fileInfo = res.result } @@ -67,7 +66,7 @@ export const onlineEditor = async (params, fileId) => { // 截取文件后缀名 const fileSuffix = (fileInfo.fileName ? fileInfo.fileName.split('.')[fileInfo.fileName.split('.').length - 1] : '').toLowerCase() // Q/ZZ 部分截取 - const standardNumberPrefix = params.standard_number.split(' ')[0] + const standardNumberPrefix = params.standard_number ? params.standard_number.split(' ')[0] : null const businessParams = { standCode: params.standard_number, dtqbbhbuss: params.substitute_standard_number, @@ -79,4 +78,5 @@ export const onlineEditor = async (params, fileId) => { } const url = `${window._CONFIG.onlyOfficeUrl}/editorPage?filePath=${fileInfo.editFilePath}&fileName=${fileInfo.fileName}&fileType=${fileSuffix}&fileId=${fileInfo.id}&key=${fileInfo.id}&userId=${userInfo.id}&userName=${userInfo.realname}&business=${JSON.stringify(businessParams)}` window.open(url, '_blank') + return fileInfo.id } diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue index 33b65d73..dc522699 100644 --- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterSentBaseInfo.vue @@ -209,14 +209,14 @@ export default { /** * 跳转在线编辑 */ - toOnlineEditor () { + async toOnlineEditor () { // 获取参数(用于自动生成封面) const params = this.$refs.baseInfoForm.getOnlineEditorParams() // 校验必填字段(最后一个字段是企标编号) const requiredField = ['implementation_date', 'release_date', 'standard_name', 'standard_number', 'espId'] const validateResult = this.$refs.baseInfoForm.validateFormByFields(requiredField) if (validateResult) { - onlineEditor(params, this.onEditFile) + this.onEditFile = await onlineEditor(params, this.onEditFile) } } }