From 52f10c3575cf074f5eb047b3b146acdfad488f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 8 Feb 2023 10:39:49 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9onlyoffice=E4=BC=A0?= =?UTF-8?q?=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/onlineEdit/index.js | 15 +++++++++++++-- src/common/onlineEditPreview/index.js | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/common/onlineEdit/index.js b/src/common/onlineEdit/index.js index 19fd86a0f..aabaca67a 100644 --- a/src/common/onlineEdit/index.js +++ b/src/common/onlineEdit/index.js @@ -4,7 +4,7 @@ import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig' import { processEditFile } from 'api/process' let Base64 = require('js-base64').Base64; -export default (id,nodeName,userId,userName) => { +export default (id,nodeName,userId,userName,query) => { processEditFile({ id }).then(res => { @@ -20,7 +20,18 @@ export default (id,nodeName,userId,userName) => { editFileInfo.pId = editFileInfo.pid } const nowTime = new Date().getTime() - window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id +'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName) + if (query){ + window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+ + '&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + + '&key=' + editFileInfo.id +'&filePath='+editFileInfo.filePath+ '&fileName='+editFileInfo.fileName+ + '&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName+'&standName='+query.standName+ + '&standEnName='+query.standEnName+'&standCode='+query.standCode+'&putTime='+query.putTime+ + '&issueTime='+query.issueTime+'&dtqbbhbuss='+query.DTQBBHBUSS) + }else{ + window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id +'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName) + + } } }).catch(e => { }) diff --git a/src/common/onlineEditPreview/index.js b/src/common/onlineEditPreview/index.js index ce790d2cb..9cb38f551 100644 --- a/src/common/onlineEditPreview/index.js +++ b/src/common/onlineEditPreview/index.js @@ -4,7 +4,7 @@ import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig' import { processEditFile } from 'api/process' let Base64 = require('js-base64').Base64; -export default (id,nodeName,userId,userName) => { +export default (id,nodeName,userId,userName,query) => { processEditFile({ id }).then(res => { From cd1125e34999a23d0911c4418e0f5345a84a9985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 15 Feb 2023 10:23:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9onlyoffice=E4=BC=A0?= =?UTF-8?q?=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/onlineEdit/index.js | 2 +- .../pages/creatProcess/qbrk/step1-2.vue | 6970 +++++++++-------- .../pages/creatProcess/qbrk/step1.vue | 81 +- 3 files changed, 3665 insertions(+), 3388 deletions(-) diff --git a/src/common/onlineEdit/index.js b/src/common/onlineEdit/index.js index aabaca67a..3de68bc98 100644 --- a/src/common/onlineEdit/index.js +++ b/src/common/onlineEdit/index.js @@ -24,7 +24,7 @@ export default (id,nodeName,userId,userName,query) => { window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+ '&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + - '&key=' + editFileInfo.id +'&filePath='+editFileInfo.filePath+ '&fileName='+editFileInfo.fileName+ + '&key=' + editFileInfo.id+nowTime +'&filePath='+editFileInfo.filePath+ '&fileName='+editFileInfo.fileName+ '&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName+'&standName='+query.standName+ '&standEnName='+query.standEnName+'&standCode='+query.standCode+'&putTime='+query.putTime+ '&issueTime='+query.issueTime+'&dtqbbhbuss='+query.DTQBBHBUSS) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 107e91e89..408efda1e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -1,3416 +1,3620 @@ -