diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index c82eb09dd..811f5d5b1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -327,7 +327,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :on-remove="importFileRemove" @@ -476,10 +476,10 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { - this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index bb5f72f62..6c38bb7cb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -342,7 +342,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :on-remove="importFileRemove" @@ -489,10 +489,10 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { - this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 3a573f99c..028661cc1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -255,14 +255,7 @@ export default { }) }, updataFj (item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 5dc8a02c7..e0062beed 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -464,14 +464,7 @@ }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 8a5edbd2d..6cbadc4ec 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -365,14 +365,7 @@ }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index 5caae05e7..7eaad4088 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -357,14 +357,7 @@ }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 9ec1b19d8..1468ea86b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -550,14 +550,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 995ed952d..5e1e6bcca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -473,14 +473,7 @@ }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index b95419445..884d04912 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -364,14 +364,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 6e959ee91..3fe206cb5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -361,14 +361,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 31006296c..b3d4a40f9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -361,14 +361,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 95c0b267d..6055e3d72 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -361,14 +361,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index 40e39f1ab..09b62375f 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -290,7 +290,7 @@ align="center">