diff --git a/src/views/inout/DialogCheck.vue b/src/views/inout/DialogCheck.vue index 4912f56..6d19592 100644 --- a/src/views/inout/DialogCheck.vue +++ b/src/views/inout/DialogCheck.vue @@ -455,6 +455,10 @@ export default { return isJPG || isPNG; }, showImgViewer(row) { + if(this.inputQuery.filePath.substr(-1) == ','){ + this.inputQuery.filePath=this.inputQuery.filePath.slice(0, this.inputQuery.filePath.length-1); + } + this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.filePath; @@ -493,6 +497,9 @@ export default { }, showImgViewerCold(row){ + if(this.inputQuery.coldFilePath.substr(-1) == ','){ + this.inputQuery.coldFilePath=this.inputQuery.coldFilePath.slice(0, this.inputQuery.coldFilePath.length-1); + } this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.coldFilePath; diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue index 12d687d..a7fbf59 100644 --- a/src/views/inout/IoDeliverySearchOrder.vue +++ b/src/views/inout/IoDeliverySearchOrder.vue @@ -820,6 +820,9 @@ export default { this.getList(); }, showImgViewer(row){ + if(row.filePath.substr(-1) == ','){ + row.filePath=row.filePath.slice(0, row.filePath.length-1); + } this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath; @@ -859,6 +862,9 @@ export default { showImgViewerCold(row){ + if(row.coldFilePath.substr(-1) == ','){ + row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1); + } this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath; diff --git a/src/views/inout/IoSupAduitOrder.vue b/src/views/inout/IoSupAduitOrder.vue index 8d5af76..dc57cdf 100644 --- a/src/views/inout/IoSupAduitOrder.vue +++ b/src/views/inout/IoSupAduitOrder.vue @@ -441,7 +441,7 @@ import AcceptOrder from "@/views/inout/DialogThrReviewOrder"; import {getDeptListByUser} from "@/api/auth/authDept"; import DialogCheck from "@/views/inout/DialogCheck"; import { getBizDetailList } from '@/api/inout/orderDetailBiz' -import { previewImage } from '@/api/purchase/supCompany' +import { previewFile, previewImage } from '@/api/purchase/supCompany' import ElImageViewer from "element-ui/packages/image/src/image-viewer"; @@ -639,35 +639,85 @@ export default { }); }, - showImgViewer(row){ - this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; - console.log(this.certFileUrl+"========"); - this.imgList=[]; - previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => { - if (response.code === 20000) { - this.imgList=response.data; - } - console.log(this.imgList) - this.imgViewerVisible = true; - }); - const m = (e) => { e.preventDefault() }; - document.body.style.overflow = 'hidden'; + showImgViewer(row) { + if(row.filePath.substr(-1) == ','){ + row.filePath=row.filePath.slice(0, row.filePath.length-1); + } + this.certFileUrl = + this.BASE_URL + + "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath; + this.imgList = []; + this.imgList.push(this.certFileUrl) + let index = row.filePath.lastIndexOf('.'); + if(index===-1){ + this.$message.error("文件名异常!") + return false + } + if(row.filePath.substr(index+1)==='pdf'){ + let pdf = "application/pdf" + let binaryData = []; + previewFile(this.certFileUrl).then(res=>{ + binaryData.push(res); + let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf})); + window.open(URL); + }) + // window.open(this.imgList[0]) + return false + } + this.imgViewerVisible = true; + // previewImage({ + // imageUrl: this.inputQuery.licenseUrl, + // certFileUrl: this.certFileUrl, + // }).then((response) => { + // if (response.code === 20000) { + // } + // console.log(this.imgList); + // }); + const m = (e) => { + e.preventDefault(); + }; + document.body.style.overflow = "hidden"; document.addEventListener("touchmove", m, false); // 禁止页面滑动 }, - showImgViewerCold(row){ - this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; - console.log(this.certFileUrl+"========"); - this.imgListCold=[]; - previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => { - if (response.code === 20000) { - this.imgListCold=response.data; - } - console.log(this.imgListCold) - this.imgViewerVisibleCold = true; - }); - const m = (e) => { e.preventDefault() }; - document.body.style.overflow = 'hidden'; + showImgViewerCold(row) { + if(row.coldFilePath.substr(-1) == ','){ + row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1); + } + this.certFileUrl = + this.BASE_URL + + "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath; + this.imgList = []; + this.imgList.push(this.certFileUrl) + let index = row.coldFilePath.lastIndexOf('.'); + if(index===-1){ + this.$message.error("文件名异常!") + return false + } + if(row.coldFilePath.substr(index+1)==='pdf'){ + let pdf = "application/pdf" + let binaryData = []; + previewFile(this.certFileUrl).then(res=>{ + binaryData.push(res); + let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf})); + window.open(URL); + }) + // window.open(this.imgList[0]) + return false + } + this.imgViewerVisible = true; + // previewImage({ + // imageUrl: this.inputQuery.licenseUrl, + // certFileUrl: this.certFileUrl, + // }).then((response) => { + // if (response.code === 20000) { + // } + // console.log(this.imgList); + // }); + const m = (e) => { + e.preventDefault(); + }; + document.body.style.overflow = "hidden"; document.addEventListener("touchmove", m, false); // 禁止页面滑动 }, diff --git a/src/views/inout/IoSupSearchOrder.vue b/src/views/inout/IoSupSearchOrder.vue index 9b169c2..e3079ac 100644 --- a/src/views/inout/IoSupSearchOrder.vue +++ b/src/views/inout/IoSupSearchOrder.vue @@ -695,6 +695,9 @@ export default { }, showImgViewer(row) { + if(row.filePath.substr(-1) == ','){ + row.filePath=row.filePath.slice(0, row.filePath.length-1); + } this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath; @@ -734,6 +737,9 @@ export default { showImgViewerCold(row) { + if(row.coldFilePath.substr(-1) == ','){ + row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1); + } this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath; diff --git a/src/views/inout/IoSupSecAuditOrder.vue b/src/views/inout/IoSupSecAuditOrder.vue index 3ad10ef..483d649 100644 --- a/src/views/inout/IoSupSecAuditOrder.vue +++ b/src/views/inout/IoSupSecAuditOrder.vue @@ -478,7 +478,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder"; import {getDeptListByUser} from "@/api/auth/authDept"; import DialogCheck from "@/views/inout/DialogCheck"; import {getBizDetailList} from "@/api/inout/orderDetailBiz"; -import {previewImage} from '@/api/purchase/supCompany' +import { previewFile, previewImage } from '@/api/purchase/supCompany' import ElImageViewer from "element-ui/packages/image/src/image-viewer"; @@ -673,36 +673,84 @@ export default { this.showSearch = !this.showSearch; }, showImgViewer(row) { - this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; - console.log(this.certFileUrl + "========"); + if(row.filePath.substr(-1) == ','){ + row.filePath=row.filePath.slice(0, row.filePath.length-1); + } + this.certFileUrl = + this.BASE_URL + + "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath; this.imgList = []; - previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => { - if (response.code === 20000) { - this.imgList = response.data; - } - console.log(this.imgList) - this.imgViewerVisible = true; - }); + this.imgList.push(this.certFileUrl) + let index = row.filePath.lastIndexOf('.'); + if(index===-1){ + this.$message.error("文件名异常!") + return false + } + if(row.filePath.substr(index+1)==='pdf'){ + let pdf = "application/pdf" + let binaryData = []; + previewFile(this.certFileUrl).then(res=>{ + binaryData.push(res); + let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf})); + window.open(URL); + }) + // window.open(this.imgList[0]) + return false + } + this.imgViewerVisible = true; + // previewImage({ + // imageUrl: this.inputQuery.licenseUrl, + // certFileUrl: this.certFileUrl, + // }).then((response) => { + // if (response.code === 20000) { + // } + // console.log(this.imgList); + // }); const m = (e) => { - e.preventDefault() + e.preventDefault(); }; - document.body.style.overflow = 'hidden'; + document.body.style.overflow = "hidden"; document.addEventListener("touchmove", m, false); // 禁止页面滑动 }, - showImgViewerCold(row){ - this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; - console.log(this.certFileUrl+"========"); - this.imgListCold=[]; - previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => { - if (response.code === 20000) { - this.imgListCold=response.data; - } - console.log(this.imgListCold) - this.imgViewerVisibleCold = true; - }); - const m = (e) => { e.preventDefault() }; - document.body.style.overflow = 'hidden'; + showImgViewerCold(row) { + if(row.coldFilePath.substr(-1) == ','){ + row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1); + } + this.certFileUrl = + this.BASE_URL + + "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath; + this.imgList = []; + this.imgList.push(this.certFileUrl) + let index = row.coldFilePath.lastIndexOf('.'); + if(index===-1){ + this.$message.error("文件名异常!") + return false + } + if(row.coldFilePath.substr(index+1)==='pdf'){ + let pdf = "application/pdf" + let binaryData = []; + previewFile(this.certFileUrl).then(res=>{ + binaryData.push(res); + let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf})); + window.open(URL); + }) + // window.open(this.imgList[0]) + return false + } + this.imgViewerVisible = true; + // previewImage({ + // imageUrl: this.inputQuery.licenseUrl, + // certFileUrl: this.certFileUrl, + // }).then((response) => { + // if (response.code === 20000) { + // } + // console.log(this.imgList); + // }); + const m = (e) => { + e.preventDefault(); + }; + document.body.style.overflow = "hidden"; document.addEventListener("touchmove", m, false); // 禁止页面滑动 },