diff --git a/src/common/onlineEdit/index.js b/src/common/onlineEdit/index.js index 19fd86a0f..9522950ea 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,33 @@ 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){ + if (!query.standEnName || query.standEnName == 'null'){ + query.standEnName = '' + } + if (!query.DTQBBHBUSS || query.DTQBBHBUSS == 'null'){ + query.DTQBBHBUSS = '' + } + if (!query.standName || query.standName == 'null'){ + query.standName = '' + } + if (!query.issueTime || query.issueTime == 'null'){ + query.issueTime = '' + } + if (!query.putTime || query.putTime == 'null'){ + query.putTime = '' + } + 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+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+'&isEdit=123') + }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 => { diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue index 3d423d214..32bdeecc4 100644 --- a/src/pages/phone/domesticDetails.vue +++ b/src/pages/phone/domesticDetails.vue @@ -1,282 +1,302 @@