diff --git a/src/views/purchase/cert/supCertAddDialog.vue b/src/views/purchase/cert/supCertAddDialog.vue index d41aad3..67daa72 100644 --- a/src/views/purchase/cert/supCertAddDialog.vue +++ b/src/views/purchase/cert/supCertAddDialog.vue @@ -112,10 +112,9 @@ :action="this.uploadUrl" :on-preview="uploadHandlePreview" :on-remove="uploadHandleRemove" - :limit="1" :headers="headers" :on-exceed="uploadHandleExceed" - accept=".jpg,.png,.pdf,.doc" + accept=".jpg,.png,.doc" :on-change="uploadOnchange" :on-success="uploadHandleSuccess" :on-error="uploadHandleError" @@ -146,6 +145,7 @@ import draggable from "vuedraggable"; import store from "../../../store"; import {insertCompanyCert, updateCompanyCert} from "../../../api/purchase/companyCert"; +import ElImageViewer from "element-ui/packages/image/src/image-viewer" export default { name: "supCompanyCertAdd", @@ -172,6 +172,7 @@ export default { return { BASE_URL: process.env.VUE_APP_BASE_API, code: "", + isCleck:false, formData: { type: 0, vailDate: null, @@ -200,6 +201,7 @@ export default { }, components: { draggable, + ElImageViewer }, methods: { submitUpload() { @@ -296,15 +298,15 @@ export default { console.log(this.fileList); }, uploadHandleExceed(files, fileList) { - this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); + }, uploadOnchange(file, fileList) { let fileName = file.name; let uid = file.uid let pos = fileName.lastIndexOf("."); let lastName = fileName.substring(pos, fileName.length); - if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png" && lastName.toLowerCase() !== ".doc" && lastName.toLowerCase() !== ".pdf") { - this.$message.error("上传文件只能是 jpg,png,doc,pdf 格式"); + if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png" && lastName.toLowerCase() !== ".doc") { + this.$message.error("上传文件只能是 jpg,png,doc格式"); for (let i = 0; i < fileList.length; i++) {//从list删除 if (fileList[i].uid === uid) { fileList.splice(i, 1) @@ -326,7 +328,12 @@ export default { }, uploadHandleSuccess(response, file, fileList) { if (response.code === 20000) { - this.formData.filePath = response.data.name; + if(this.formData.filePath==null || this.isCleck==true){ + this.formData.filePath=response.data.name+","; + this.isCleck=false; + }else{ + this.formData.filePath+=response.data.name+","; + } } else { this.$message.error("文件上传失败：" + response.message); } @@ -363,6 +370,7 @@ export default { } if (this.formData.filePath != null) { this.choiceFile = "更换文件"; + this.isCleck=true; } else { this.choiceFile = "选取文件"; } diff --git a/src/views/purchase/company/supCompanyAduditDialog.vue b/src/views/purchase/company/supCompanyAduditDialog.vue index dec4e1c..f3a5fb0 100644 --- a/src/views/purchase/company/supCompanyAduditDialog.vue +++ b/src/views/purchase/company/supCompanyAduditDialog.vue @@ -274,7 +274,7 @@
确认 - 取消 +
@@ -525,29 +525,18 @@ export default { return [ 'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1; }, - showImgViewer(row) { - var varindex = row.filePath.lastIndexOf("."); - var varext = row.filePath.substring(varindex + 1); - var isImage = this.isAssetTypeAnImage(varext); - if (isImage == true) { - this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; - this.imgList = []; - previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => { - if (response.code === 20000) { - this.imgList.push(response.data); - } - }); - this.imgViewerVisible = true; - const m = (e) => { - e.preventDefault() - }; - document.body.style.overflow = 'hidden'; - document.addEventListener("touchmove", m, false); // 禁止页面滑动 - } else { - this.toViewCompanyCert(row); - } - - + showImgViewer(row){ + this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; + this.imgList=[]; + previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => { + if (response.code === 20000) { + this.imgList=response.data; + } + }); + this.imgViewerVisible = true; + const m = (e) => { e.preventDefault() }; + document.body.style.overflow = 'hidden'; + document.addEventListener("touchmove", m, false); // 禁止页面滑动 }, closeImgViewer() { this.imgViewerVisible = false; diff --git a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue index a3031f4..047d717 100644 --- a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue +++ b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue @@ -545,15 +545,12 @@ export default { 'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1; }, showImgViewer(row) { - var varindex = row.filePath.lastIndexOf("."); - var varext = row.filePath.substring(varindex + 1); - var isImage = this.isAssetTypeAnImage(varext); - if (isImage == true) { + this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; this.imgList = []; previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => { if (response.code === 20000) { - this.imgList.push(response.data); + this.imgList=response.data; } }); this.imgViewerVisible = true; @@ -562,11 +559,6 @@ export default { }; document.body.style.overflow = 'hidden'; document.addEventListener("touchmove", m, false); // 禁止页面滑动 - } else { - this.toViewCompanyCert(row); - } - - }, closeImgViewer() { this.imgViewerVisible = false; diff --git a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue index 35c2fdc..389b803 100644 --- a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue +++ b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue @@ -228,13 +228,14 @@ + + { if (response.code === 20000) { - this.imgList.push(response.data); + this.imgList=response.data; } }); this.imgViewerVisible = true; const m = (e) => { e.preventDefault() }; document.body.style.overflow = 'hidden'; document.addEventListener("touchmove", m, false); // 禁止页面滑动 - }else{ - this.toViewCompanyCert(row); - } - - }, closeImgViewer(){ this.imgViewerVisible = false; diff --git a/src/views/purchase/product/supProductAuditDialog.vue b/src/views/purchase/product/supProductAuditDialog.vue index c9a1f35..cbb9aaf 100644 --- a/src/views/purchase/product/supProductAuditDialog.vue +++ b/src/views/purchase/product/supProductAuditDialog.vue @@ -555,26 +555,17 @@ export default { indexOf(ext.toLowerCase()) !== -1; }, showImgViewer(row){ - var varindex= row.filePath.lastIndexOf("."); - var varext = row.filePath.substring(varindex+1); - var isImage=this.isAssetTypeAnImage(varext); - if(isImage==true){ this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; this.imgList=[]; previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => { if (response.code === 20000) { - this.imgList.push(response.data); + this.imgList=response.data; } }); this.imgViewerVisible = true; const m = (e) => { e.preventDefault() }; document.body.style.overflow = 'hidden'; document.addEventListener("touchmove", m, false); // 禁止页面滑动 - }else{ - this.toViewCompanyCert(row); - } - - }, closeImgViewer(){ this.imgViewerVisible = false; diff --git a/src/views/purchase/product/supProductEditDialog.vue b/src/views/purchase/product/supProductEditDialog.vue index 42dc0c3..1206c50 100644 --- a/src/views/purchase/product/supProductEditDialog.vue +++ b/src/views/purchase/product/supProductEditDialog.vue @@ -307,8 +307,6 @@ 预览 - - + { if (response.code === 20000) { - this.imgList.push(response.data); + this.imgList=response.data; } }); this.imgViewerVisible = true; @@ -684,11 +679,6 @@ export default { }; document.body.style.overflow = 'hidden'; document.addEventListener("touchmove", m, false); // 禁止页面滑动 - } else { - this.toViewCompanyCert(row); - } - - }, closeImgViewer() { this.imgViewerVisible = false; diff --git a/src/views/supplier/company/basicCompany.vue b/src/views/supplier/company/basicCompany.vue index 0cf6395..fa0fcd2 100644 --- a/src/views/supplier/company/basicCompany.vue +++ b/src/views/supplier/company/basicCompany.vue @@ -193,17 +193,13 @@ + + { if (response.code === 20000) { - this.imgList.push(response.data); + this.imgList=response.data; } + console.log(this.imgList) + this.imgViewerVisible = true; }); - this.imgViewerVisible = true; const m = (e) => { e.preventDefault() }; document.body.style.overflow = 'hidden'; document.addEventListener("touchmove", m, false); // 禁止页面滑动 - }else{ - this.toViewCompanyCert(row); - } }, closeImgViewer(){ this.imgViewerVisible = false;