diff --git a/public/static/pdf/pdf-js.md b/public/static/pdf/pdf-js.md new file mode 100644 index 000000000..5c80b8ff4 --- /dev/null +++ b/public/static/pdf/pdf-js.md @@ -0,0 +1,4 @@ +# PDF.JS + ## version:2.16.105 + ## updateTime:2022年9月20日 + ## version FROM:1.9.426 TO 2.16.105 \ No newline at end of file diff --git a/public/static/pdf/web/viewer.js b/public/static/pdf/web/viewer.js index 1994141c8..4ca3a3026 100644 --- a/public/static/pdf/web/viewer.js +++ b/public/static/pdf/web/viewer.js @@ -1766,9 +1766,9 @@ var PDFViewerApplication = { eventBus.on('namedaction', webViewerNamedAction); eventBus.on('presentationmodechanged', webViewerPresentationModeChanged); eventBus.on('presentationmode', webViewerPresentationMode); - eventBus.on('openfile', webViewerOpenFile); - eventBus.on('print', webViewerPrint); - eventBus.on('download', webViewerDownload); + // eventBus.on('openfile', webViewerOpenFile); + // eventBus.on('print', webViewerPrint); + // eventBus.on('download', webViewerDownload); eventBus.on('firstpage', webViewerFirstPage); eventBus.on('lastpage', webViewerLastPage); eventBus.on('nextpage', webViewerNextPage); @@ -1919,6 +1919,14 @@ function loadAndEnablePDFBug(enabledTabs) { } function webViewerInitialized() { var appConfig = PDFViewerApplication.appConfig; + appConfig.toolbar.openFile.hidden = true; + appConfig.secondaryToolbar.openFileButton.hidden = true; + appConfig.toolbar.print.hidden = true; + appConfig.secondaryToolbar.printButton.hidden = true; + appConfig.toolbar.download.hidden = true; + appConfig.secondaryToolbar.downloadButton.hidden = true; + appConfig.toolbar.viewBookmark.hidden = true; + appConfig.secondaryToolbar.viewBookmarkButton.hidden = true; var file = void 0; var queryString = document.location.search.substring(1); var params = (0, _ui_utils.parseQueryString)(queryString); @@ -2401,8 +2409,8 @@ function webViewerKeyDown(evt) { if (cmd === 1 || cmd === 8) { switch (evt.keyCode) { case 83: - PDFViewerApplication.download(); - handled = true; + // PDFViewerApplication.download(); + // handled = true; break; } } @@ -3834,16 +3842,16 @@ function renderProgress(index, total, l10n) { var hasAttachEvent = !!document.attachEvent; window.addEventListener('keydown', function (event) { if (event.keyCode === 80 && (event.ctrlKey || event.metaKey) && !event.altKey && (!event.shiftKey || window.chrome || window.opera)) { - window.print(); - if (hasAttachEvent) { - return; - } - event.preventDefault(); - if (event.stopImmediatePropagation) { - event.stopImmediatePropagation(); - } else { - event.stopPropagation(); - } + // window.print(); + // if (hasAttachEvent) { + // return; + // } + // event.preventDefault(); + // if (event.stopImmediatePropagation) { + // event.stopImmediatePropagation(); + // } else { + // event.stopPropagation(); + // } return; } }, true); diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue index 47b4d66dd..f8add1ece 100644 --- a/src/pages/details/complianceDetails/index.vue +++ b/src/pages/details/complianceDetails/index.vue @@ -22,7 +22,7 @@ diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index c2b806b82..31272db5e 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -369,7 +369,6 @@ v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"> @@ -2543,14 +2542,30 @@ export default { }) }, downloadFileByWater (attId, fileSuffix) { - if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { - this.$message.error('水印下载仅支持PDF,pdf格式文件') - } else { + if(fileSuffix !== undefined && fileSuffix !== null){ + fileSuffix = fileSuffix.toUpperCase() + } + if (fileSuffix === 'PDF' ||fileSuffix === 'DOC' ||fileSuffix === 'DOCX') { if (attId != null && attId !== '') { - window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId + this.$http.get('lawss/sarBussStandFile/queryConvertAtt', { + attId: attId + }, { + _this: this + }, res => { + if (res.data) { + let fileObj = {} + window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + res.data.attId + '&userId=' + this.$store.getters.userInfo.userId + } else { + this.$message.error('当前暂时无法下载，请稍后重试') + } + }, e => { + this.$message.error('当前暂时无法下载，请稍后重试') + }) } else { this.$message.error('请选择要下载的文件') } + } else { + this.$message.error('水印下载仅支持PDF、DOC、DOCX格式文件') } this.$http.get('lawss/sarBussionessStand/logBussDownload2', { standCode: this.sarStandardsInfoEO.standCode, diff --git a/src/pages/details/otherBussStandardExternalDetails/index.vue b/src/pages/details/otherBussStandardExternalDetails/index.vue index 5d685618b..401bf998b 100644 --- a/src/pages/details/otherBussStandardExternalDetails/index.vue +++ b/src/pages/details/otherBussStandardExternalDetails/index.vue @@ -369,7 +369,6 @@ /> { + if (res.data) { + let fileObj = {} + window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + res.data.attId + '&userId=' + this.$store.getters.userInfo.userId + } else { + this.$message.error('当前暂时无法下载，请稍后重试') + } + }, e => { + this.$message.error('当前暂时无法下载，请稍后重试') + }) } else { this.$message.error('请选择要下载的文件') } + } else { + this.$message.error('水印下载仅支持PDF、DOC、DOCX格式文件') } this.$http.get('lawss/sarBussionessStand/logBussDownload2', { standCode: this.sarStandardsInfoEO.standCode, diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 7d031c6eb..5b5806656 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -898,20 +898,20 @@ label="责任工程师" width="100"> - - - - - + + + + + + + + + + + + + +

@@ -224,12 +212,6 @@ class="icon-download" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'WGJP2VRZSJ77EGH2447M' : '44KKMQHU3CNRRPNNF8VN'" /> - 上传时间：{{ dateFormat(file.modifyTime) }}

diff --git a/src/pages/knowledgeGraph/index.vue b/src/pages/knowledgeGraph/index.vue index d9fcaf62d..166dce40f 100644 --- a/src/pages/knowledgeGraph/index.vue +++ b/src/pages/knowledgeGraph/index.vue @@ -2241,18 +2241,6 @@ export default { this.$message.error('请选择要下载的文件') } }, - downloadFileByWater (attId, fileSuffix) { - if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { - this.$message.error('水印下载仅支持PDF,pdf格式文件') - } else { - if (attId != null && attId !== '') { - window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId - } else { - this.$message.error('请选择要下载的文件') - } - } - }, - // 查看详情 getMenuDetail(menuId) { return new Promise((resolve, reject) => { diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index c1306b4b9..e72d17826 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -2073,17 +2073,6 @@ export default { this.$message.error('请选择要下载的文件') } }, - downloadFileByWater (attId, fileSuffix) { - if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { - this.$message.error('水印下载仅支持PDF,pdf格式文件') - } else { - if (attId != null && attId !== '') { - window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId - } else { - this.$message.error('请选择要下载的文件') - } - } - }, showReferStandDetials (standNum) { // 验证标准号在系统中是否存在 this.$http.post('lawss/sarTestItem/validateStandNumber', { diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue index c880fcc99..cdfb2da31 100644 --- a/src/pages/phone/domesticDetails.vue +++ b/src/pages/phone/domesticDetails.vue @@ -85,24 +85,12 @@ {{ file.oldFileName | ellipsis50}} - - @@ -2786,36 +2774,6 @@ } }, - downloadFileByWater(attId, fileSuffix) { - if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { - this.$message.error('水印下载仅支持PDF,pdf格式文件') - } else { - if (attId != null && attId !== '') { - window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId - } else { - this.$message.error('请选择要下载的文件') - } - } - if(this.$route.query.pageType === 'INLAND_STAND'){ - let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber - this.$http.get('sarStandardsInfo/sar-standards-info/logInvalidDownload2',{ - standNumber: standNumber, - standName: this.sarStandardsInfoEO.standName - }, { - _this: this - }, res => { - }) - }else{ - let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber - this.$http.get('sarStandardsInfo/sar-standards-info/logForeignDownload2',{ - standNumber: standNumber, - standName: this.sarStandardsInfoEO.standEnName - }, { - _this: this - }, res => { - }) - } - }, /** * @Description: 跳转流程 */ diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 0e21d53a6..82015cf43 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -25,14 +25,14 @@
- - - + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + @@ -475,14 +475,14 @@ v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0" disabled v-model="batchEditForm.noCompliance" - placeholder="请输入不合规项目" + placeholder="请输入不合规项" > diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index d0b7b6d47..69e392176 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -610,18 +610,6 @@ export default { this.$message.error("请选择要下载的文件"); } }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, // 删除上传的文件 delFileInfo (file, fileList) { this.fileInfoList.forEach((item, index) => { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue index d4522ff59..83b708f13 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue @@ -47,12 +47,6 @@ class="icon-download" v-btn-permission="''" /> -

@@ -423,18 +417,6 @@ export default { this.$message.error("请选择要下载的文件"); } }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, // 驳回事件 beforeBack() { if(!this.commentText){ diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 713b63ed1..7626f1a8c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -47,12 +47,6 @@ class="icon-download" v-btn-permission="''" /> -

@@ -383,17 +377,6 @@ export default { this.$message.error("请选择要下载的文件"); } }, - downloadFileByWater(attId, fileSuffix) { - if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { - this.$message.error('水印下载仅支持PDF,pdf格式文件') - } else { - if (attId != null && attId !== '') { - window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId - } else { - this.$message.error('请选择要下载的文件') - } - } - }, //确认转办 checkedRole (data) { this.assigneeNewLoading = true diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 430df404d..347ba59f3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -724,18 +724,6 @@ export default { this.$message.error("请选择要下载的文件"); } }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, // 删除上传的文件 delFileInfo (file, fileList) { this.fileInfoList.forEach((item, index) => { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 3e9deaa1d..c633a4a85 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -47,12 +47,6 @@ class="icon-download" v-btn-permission="''" /> -

@@ -452,17 +446,6 @@ export default { this.$message.error("请选择要下载的文件"); } }, - downloadFileByWater(attId, fileSuffix) { - if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { - this.$message.error('水印下载仅支持PDF,pdf格式文件') - } else { - if (attId != null && attId !== '') { - window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId - } else { - this.$message.error('请选择要下载的文件') - } - } - }, // 驳回事件 beforeBack() { if(!this.commentText){ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue index c5702479f..cf88d25e8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue @@ -91,27 +91,51 @@ previewShow(attId) { this.iframeLoading = true return new Promise((resolve, reject) => { - getBusStandFileByAttId({ - attId - }).then(res => { - if(res){ - const history = res; - const editFileInfo = res.data - if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){ - this.iframeUrl = 'book://ssreader/e0?url='+editFileInfo.downLoadUrl - }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){ - this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id) - }else { - const nowTime = new Date().getTime() - // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) - this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)); + this.$http.get('lawss/sarStandFile/queryConvertAtt', { + attId: attId + }, { + _this: this + }, res => { + if (res.data) { + let fileObj = {} + fileObj.fileId = res.data.attId + fileObj.fileName = res.data.fileOldName + let fileList = [] + let repeatData = 0 + if (sessionStorage.getItem('fileInfo')) { + fileList = JSON.parse(sessionStorage.getItem('fileInfo')) + if (fileList != null && fileList.length > 0) { + for (let i = 0; i < fileList.length; i++) { + if (fileList[i].fileId === res.data.attId) { + repeatData = 1 + break + } + } + if (repeatData === 0) { + fileList.push(fileObj) + fileList = JSON.stringify(fileList) + sessionStorage.setItem('fileInfo', fileList) + } + } + } else { + fileList.push(fileObj) + fileList = JSON.stringify(fileList) + sessionStorage.setItem('fileInfo', fileList) } - this.iframeLoading = false - this.$forceUpdate() - resolve(history) + this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId) + } else { + this.$message.error('文档未转换成功或该文档无法读取') } - }).catch(e => { + this.iframeLoading = false + this.$forceUpdate() + resolve(history) + }, e => { + this.iframeLoading = false + this.$forceUpdate() + resolve(history) + this.$message.error('文档未转换成功或该文档无法读取') }) + }) console.log(this.iframeUrl); }, diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue index 4621b42c9..adfb9110a 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue @@ -86,12 +86,6 @@ class="icon-download" v-btn-permission="''" /> -

@@ -536,18 +530,6 @@ export default { this.$message.error("请选择要下载的文件"); } }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, //流程转办 handleTransfer(){ this.drawerModal = true diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue index 42a0c9d01..40c626c42 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue @@ -86,12 +86,6 @@ class="icon-download" v-btn-permission="''" /> -

@@ -522,18 +516,6 @@ export default { this.$message.error("请选择要下载的文件"); } }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, //流程转办 handleTransfer(){ this.drawerModal = true diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step1-4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step1-4.vue index aed710cce..95efe54a6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step1-4.vue @@ -117,12 +117,6 @@ class="icon-download" v-btn-permission="''" /> -

@@ -473,18 +467,6 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } } }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step3.vue index c2182e2ff..acbb33043 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step3.vue @@ -104,12 +104,6 @@ class="icon-download" v-btn-permission="''" /> -

@@ -414,19 +408,7 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, + } }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step4.vue index 10347be3a..260f9eb71 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step4.vue @@ -117,12 +117,6 @@ class="icon-download" v-btn-permission="''" /> -

@@ -484,18 +478,6 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } } }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 338236879..17d9a9777 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -1335,19 +1335,7 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, + } }, }; diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue index 00062b106..b2144efa6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue @@ -449,19 +449,7 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, + } }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index a622f08c0..980ac5463 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -695,19 +695,7 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, + } }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue index 986ba6957..e96e8d428 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue @@ -665,19 +665,7 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, + } }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue index 1b3b8b2e2..ddb5bde49 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue @@ -760,19 +760,7 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, + } }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue index 567354376..4018200c7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue @@ -661,18 +661,6 @@ export default { this.$message.error("请选择要下载的文件"); } }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue index 21e7a5fdd..a61ba966a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue @@ -756,19 +756,7 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, + } }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue index a165acbef..1aab62d48 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue @@ -447,18 +447,6 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } } }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index 9a59c20f2..672d41100 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -810,19 +810,7 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, + } }, }; diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue index 8ae1189b9..43e6fa471 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue @@ -448,18 +448,6 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } } }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue index 58919b48d..eb65e7b48 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue @@ -478,18 +478,6 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } } }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue index da472f3ef..89e699c28 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue @@ -476,18 +476,6 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } } }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue index 5e5b20554..e45012b6b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue @@ -476,18 +476,6 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } } }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index cd94b7a5b..1f7099b5c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -1071,9 +1071,9 @@ QCRBUSS: [ { required: true, message: '请选择起草人', trigger: 'change' } ], - DTQBBHBUSS: [ - { required: true, message: '请选择代替企标编号', trigger: 'change' } - ], + // DTQBBHBUSS: [ + // { required: true, message: '请选择代替企标编号', trigger: 'change' } + // ], }, zrUserIds: [], // 选择多个会签责任人 userType:'', // 选择用户ID判断 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 31617d72c..1ac758a7a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -1334,9 +1334,9 @@ QCRBUSS: [ { required: true, message: '请选择起草人', trigger: 'change' } ], - DTQBBHBUSS: [ - { required: true, message: '请选择代替企标编号', trigger: 'change' } - ], + // DTQBBHBUSS: [ + // { required: true, message: '请选择代替企标编号', trigger: 'change' } + // ], }, zrUserIds: [], // 选择多个会签责任人 userType:'', // 选择用户ID判断 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index d3f938922..5ffbb93b8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -82,7 +82,8 @@ - + + @@ -105,7 +106,8 @@ - + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index 9b110521f..69e207330 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -91,7 +91,8 @@ - + + @@ -114,7 +115,8 @@ - + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 629b29244..7925669ed 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -1334,9 +1334,9 @@ QCRBUSS: [ { required: true, message: '请选择起草人', trigger: 'change' } ], - DTQBBHBUSS: [ - { required: true, message: '请选择代替企标编号', trigger: 'change' } - ], + // DTQBBHBUSS: [ + // { required: true, message: '请选择代替企标编号', trigger: 'change' } + // ], }, zrUserIds: [], // 选择多个会签责任人 userType:'', // 选择用户ID判断 diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-2.vue index 49c8cf357..d56d47375 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-2.vue @@ -33,12 +33,6 @@ class="icon-download" v-btn-permission="''" /> -

@@ -959,17 +953,6 @@ export default { this.$message.error("请选择要下载的文件"); } }, - downloadFileByWater(attId, fileSuffix) { - if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { - this.$message.error('水印下载仅支持PDF,pdf格式文件') - } else { - if (attId != null && attId !== '') { - window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId - } else { - this.$message.error('请选择要下载的文件') - } - } - }, choiceLeader(){ this.workModel = true }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 499c12b36..679ec4c32 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -458,6 +458,16 @@ export default { dutyPeopleId: '', dutyPeople: '', firstDraftTime: '', + draftTime: '', + releaseTime: '', + bussSort: '', + drafter: '', + drafterName: '', + resPerson: '', + resPersonName: '', + wgLeader: '', + wgLeaderName: '', + reviseStatus: '', planTime: '', endTime: '', }, @@ -845,7 +855,17 @@ export default { dutyPeople: '', firstDraftTime: '', planTime: '', - endTime : '' + endTime : '', + draftTime: '', + releaseTime: '', + bussSort: '', + drafter: '', + drafterName: '', + resPerson: '', + resPersonName: '', + wgLeader: '', + wgLeaderName: '', + reviseStatus: '', } } }) @@ -854,6 +874,7 @@ export default { closeDrawer() { if (this.btnType === 'edit') { let Items = JSON.parse(localStorage.getItem('obj')) + console.log(Items) this.addQblxData.esName = Items.esName this.addQblxData.unit = Items.unit this.addQblxData.unitName = Items.unitName @@ -862,7 +883,18 @@ export default { this.addQblxData.dutyPeople = Items.dutyPeople this.addQblxData.firstDraftTime = Items.firstDraftTime this.addQblxData.planTime = Items.planTime + this.addQblxData.draftTime = Items.draftTime + this.addQblxData.releaseTime = Items.releaseTime + this.addQblxData.bussSort = Items.bussSort + this.addQblxData.drafter = Items.drafter + this.addQblxData.resPerson = Items.resPerson + this.addQblxData.resPersonName = Items.resPersonName this.addQblxData.endTime = Items.endTime + this.addQblxData.drafterName = Items.drafterName + this.addQblxData.wgLeader = Items.wgLeader + this.addQblxData.wgLeaderName = Items.wgLeaderName + this.addQblxData.reviseStatus = Items.reviseStatus + console.log(this.qblx_pageData.qblxData,'表格数据') } else { this.addQblxData = {} } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 79b565e5b..ae6d37c89 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -33,12 +33,6 @@ class="icon-download" v-btn-permission="''" /> -

@@ -996,17 +990,6 @@ export default { this.$message.error("请选择要下载的文件"); } }, - downloadFileByWater(attId, fileSuffix) { - if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { - this.$message.error('水印下载仅支持PDF,pdf格式文件') - } else { - if (attId != null && attId !== '') { - window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId - } else { - this.$message.error('请选择要下载的文件') - } - } - }, choiceLeader(){ this.workModel = true }, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index f09e79f29..a50cbe1de 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -96,42 +96,42 @@ - - - -

责任工程师

-
- - - -
- - - - - - -

产品工程经理/项目经理

-
- - - -
- - - - - - -

标准法规部高级经理

-
- - - -
- - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 42ee1da51..4007f8371 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -261,6 +261,12 @@ export default { this.passInfo = JSON.parse(JSON.stringify(item)).passInfo let fileData = JSON.parse(JSON.stringify(item)).dockUserList this.dataList = fileData[0].standardInfoList + fileData.forEach( filedata => { + // console.log(filedata) + if (filedata.id === this.userId){ + this.dataList = filedata.standardInfoList + } + }) this.standardInfoList = this.dataList this.textarea = JSON.parse(JSON.stringify(item)).textarea /* 注释掉的代码 是因为后端已经分配过数据 前端不需要再做处理*/ @@ -274,6 +280,12 @@ export default { } else { let fileData = JSON.parse(JSON.stringify(item)).dockUserList this.dataList = fileData[0].standardInfoList + fileData.forEach( filedata => { + // console.log(filedata) + if (filedata.id === this.userId){ + this.dataList = filedata.standardInfoList + } + }) this.standardInfoList = this.dataList // for (let i = 0; i + label="不合规项"> + label="不合规项"> @@ -406,20 +406,20 @@ > - + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 89dc03251..6fa6f3872 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -140,7 +140,7 @@ prop="noCompliance" align="center" width="170" - label="不合规项目"> + label="不合规项"> + label="不合规项"> { + data.title = data.standSort + data.standNumber + data.standYear + let isReal = "" + // if (titleList !== []){ + titleList.forEach(tl => { + if (tl === data.title){ + isReal = data.title + } + }) + // } + if (isReal === ""){ + titleList.push(data.title); + } + }) + console.log(titleList,"titleList!!!!") + console.log(this.dataList,"dataList 进入方法前 !!!!") + titleList.forEach(tl => { + this.dataList.forEach(data=>{ + if (data.title === tl){ + console.log(data.title,"方法中的title !!!!") + ordelTitleList.push(data) + } + }) + }) + this.dataList = ordelTitleList + + this.dataList.forEach(item =>{ if(item.children){ item.children.forEach(items =>{ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue index 0e6f8e884..40748bebc 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue @@ -125,7 +125,7 @@ prop="noCompliance" align="center" width="170" - label="不合规项目"> + label="不合规项"> + label="不合规项"> + label="不合规项"> + label="不合规项"> + label="不合规项"> @@ -363,19 +363,19 @@ > - + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index c7685672f..a45d42d0f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -127,7 +127,7 @@ prop="noCompliance" align="center" width="170" - label="不合规项目"> + label="不合规项"> + label="不合规项"> + label="不合规项"> + + + + + + { this.energyKindOptions = res.data.ENERGYTYPES; //适用车型 + this.syzdSelect = res.data.SYRZCLASS; //认证类型 this.setMap(res.data.WBZTCLASS);// 文本状态 this.setMap(res.data.TEXTSTATUSBUSS);//企标文本状态 this.textState = res.data.WBZTCLASS // 文本状态 diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index eaf8cca6e..2c1f546ef 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -845,14 +845,25 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.id || item.standId, - pageType: item.standType + '_STAND' - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standType ==='BUSINESS_STAND'){ + let routeUrl = this.$router.resolve({ + name: 'OtherBussStandardDetails', + params: { + id: item.id || item.standId, + pageType: 'BUSINESS_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }else{ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id || item.standId, + pageType: item.standType + '_STAND' + } + }); + window.open(routeUrl.href, "_blank"); + } }, //获取数据 getData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index f8f41520f..ae2429a23 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -845,14 +845,25 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.id || item.standId, - pageType: item.standType + '_STAND' - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standType ==='BUSINESS_STAND'){ + let routeUrl = this.$router.resolve({ + name: 'OtherBussStandardDetails', + params: { + id: item.id || item.standId, + pageType: 'BUSINESS_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }else{ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id || item.standId, + pageType: item.standType + '_STAND' + } + }); + window.open(routeUrl.href, "_blank"); + } }, //获取数据 getData() { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index 72de88509..25433dd42 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -836,14 +836,25 @@ export default { }, // 点击查看 handlePreview(item) { - let routeUrl = this.$router.resolve({ - name: "OtherStandardDetails", - params: { - id: item.id || item.standId, - pageType: item.standType + '_STAND' - } - }); - window.open(routeUrl.href, "_blank"); + if(item.standType ==='BUSINESS_STAND'){ + let routeUrl = this.$router.resolve({ + name: 'OtherBussStandardDetails', + params: { + id: item.id || item.standId, + pageType: 'BUSINESS_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }else{ + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: item.id || item.standId, + pageType: item.standType + '_STAND' + } + }); + window.open(routeUrl.href, "_blank"); + } }, //获取数据 getData() { diff --git a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue index 360f12f5f..75436910f 100644 --- a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue @@ -34,12 +34,6 @@ class="icon-download" v-btn-permission="''" /> -

@@ -385,18 +379,6 @@ export default { this.$message.error("请选择要下载的文件"); } }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, // 驳回事件 beforeBack() { if(!this.commentText){ diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue index 7fa401832..ad5ac4a2a 100644 --- a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue +++ b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue @@ -86,12 +86,6 @@ class="icon-download" v-btn-permission="''" /> -

@@ -472,18 +466,6 @@ export default { this.$message.error("请选择要下载的文件"); } }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, //转办按钮 handleTransfer() { this.phoneshowflag = true; diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue index b40f6e246..1be4fd3b4 100644 --- a/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue +++ b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue @@ -86,12 +86,6 @@ class="icon-download" v-btn-permission="''" /> -

@@ -458,18 +452,6 @@ export default { this.$message.error("请选择要下载的文件"); } }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, //转办按钮 handleTransfer(){ this.phoneshowflag = true diff --git a/src/pages/processCenter/pages/phone/qbfs/step5.vue b/src/pages/processCenter/pages/phone/qbfs/step5.vue index 7019aa0ea..6fe93cb5f 100644 --- a/src/pages/processCenter/pages/phone/qbfs/step5.vue +++ b/src/pages/processCenter/pages/phone/qbfs/step5.vue @@ -779,19 +779,7 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } - }, + } }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/phone/qbfz/step5.vue b/src/pages/processCenter/pages/phone/qbfz/step5.vue index ada4237d9..2818ba22b 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step5.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step5.vue @@ -339,18 +339,6 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } } }, computed: { diff --git a/src/pages/processCenter/pages/phone/qbfz/step6.vue b/src/pages/processCenter/pages/phone/qbfz/step6.vue index a2da67b4e..cc62aefce 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step6.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step6.vue @@ -333,18 +333,6 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } } }, computed: { diff --git a/src/pages/processCenter/pages/phone/qbfz/step7.vue b/src/pages/processCenter/pages/phone/qbfz/step7.vue index da1b70ed8..ea608ebff 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step7.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step7.vue @@ -339,18 +339,6 @@ export default { } else { this.$message.error("请选择要下载的文件"); } - }, - downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); - } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId; - } else { - this.$message.error("请选择要下载的文件"); - } - } } }, computed: { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 47db002e0..0897869ac 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -167,7 +167,7 @@ :label="standLabelNum">