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/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index 4755a6067..577de2829 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -1,1045 +1,1170 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index 35dc30415..33c7a694a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -131,10 +131,38 @@ clearable >
-
-
- {{ item.name }} - +
+
+ + {{ item.name }} + + + {{ item.name }} + + + + + + + +
+
+
+
+ + {{ item.name }} + +
@@ -702,6 +730,10 @@ export default { type: Boolean, default: false }, + isTrue: { + type: Boolean, + default: false + }, }, filters: { ellipsis (value) { @@ -905,6 +937,22 @@ export default { attId = file.id }else { attId = file.response.data.id + } + if (file.name == this.form.standName) { + let fileName = "" + let fileNam2 = "" + if (this.form.standName && this.form.standName !== '') { + fileName = this.form.standName + '-企业标准.docx' + fileNam2 = this.form.standName + } else { + fileName = '企业标准.docx' + fileNam2 = '企业标准' + } + let form = JSON.parse(JSON.stringify(this.form)) + form.standCode = '' + form.issueDate = '' + this.$onlineEditPreview(file.id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, form) + return } if (type === 'down') { if (attId) { @@ -916,6 +964,31 @@ export default { this.$preview(attId) } }, + handleFilePreviewOne(file, type) { + let id = "" + let fileName = "" + let fileNam2 = "" + if (this.form.standName && this.form.standName !== '') { + fileName = this.form.standName + '-企业标准.docx' + fileNam2 = this.form.standName + } else { + fileName = '企业标准.docx' + fileNam2 = '企业标准' + } + if (file && file.id) { + id = file.id + } else { + id = file.response.data.id + } + if (this.form.issueTime){ + this.form.issueTime = this.form.issueTime.slice(0,10) + } + if (type === 'preview') { + this.$onlineEditPreview(id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, this.form) + } else { + this.$onlineEdit(id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, this.form) + } + }, downloadFile (data) { //文件id中出现了','字符,去除掉 window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id @@ -1010,6 +1083,20 @@ export default { }, deep: true //对象的深度验证 }, + 'form.standName': { + handler: function (val) { + console.log(val); + if (val && val !== '') { + if (this.FBGBUSSFileList.length > 0) { + this.FBGBUSSFileList[0].name = val + } + } else { + if (this.FBGBUSSFileList.length > 0) { + this.FBGBUSSFileList[0].name = '企业标准' + } + } + } + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index 29da1d30b..03075ce3c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -1,715 +1,822 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 107e91e89..362774300 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 @@ -