From 69fb56c08f9de90e1ab0997bf61b28cf3bb47465 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 11 Apr 2023 11:25:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=AE=E5=8A=A9?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/param/addhelpSettings.vue | 51 ++++++++++++++++------ 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/src/views/system/param/addhelpSettings.vue b/src/views/system/param/addhelpSettings.vue index 3fdc46a..4a49b1a 100644 --- a/src/views/system/param/addhelpSettings.vue +++ b/src/views/system/param/addhelpSettings.vue @@ -70,15 +70,14 @@ 状态： - - - - 启用 - 禁用 - - - - + + + + 启用 + 禁用 + + + @@ -113,14 +112,17 @@ {{ choiceFile }} - 文件预览
只能上传 jpg,png,pdf,doc 文件，且不超过 10 MB
+ + + @@ -136,6 +138,9 @@ import {insertCompanyCert, updateCompanyCert} from "@/api/purchase/companyCert"; import {insertMenuHelp,updateMenuHelp} from "@/api/system/sysMenuHelp"; import { updateInv } from '@/api/auth/authAdmin' import { isBlank } from '@/utils/strUtil' +import { previewImage } from '@/api/purchase/supCompany' +import ElImageViewer from "element-ui/packages/image/src/image-viewer"; + export default { name: "addhelpSettings", @@ -156,6 +161,8 @@ export default { }, data() { return { + imgList:[], + imgViewerVisible:false, BASE_URL: process.env.VUE_APP_BASE_API, code: "", formData: { @@ -184,7 +191,7 @@ export default { }; }, components: { - draggable, + draggable,ElImageViewer }, methods: { submitUpload() { @@ -268,10 +275,28 @@ export default { }, - toViewCompanyCert() { + showImgViewer(row){ this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; - window.open(this.certFileUrl + this.formData.filePath); + this.imgList=[]; + previewImage({imageUrl:this.formData.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'; + document.addEventListener("touchmove", m, false); // 禁止页面滑动 }, + + closeImgViewer(){ + this.imgViewerVisible = false; + const m = (e) => { e.preventDefault() }; + document.body.style.overflow = 'auto'; + document.removeEventListener("touchmove", m, true); + }, + }, filters: {}, mounted() { From 08b8d73bac9320b854f575c74e19567dada81c7f Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 11 Apr 2023 11:38:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=A5=E9=99=A2=E7=89=A9=E8=B5=84?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=20=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/supplier/company/basicCompanyProducts.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue index 8c6c932..0dc5da6 100644 --- a/src/views/supplier/company/basicCompanyProducts.vue +++ b/src/views/supplier/company/basicCompanyProducts.vue @@ -73,7 +73,7 @@ highlight-current-row> - + From efb3f4d7244f361f9083f8f00209f12f9866ad59 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 11 Apr 2023 11:55:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=88=86=E7=B1=BB=20=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=20=E8=80=97=E6=9D=90?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=89=A9=E5=93=81=E7=BC=96=E7=A0=81=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20=E9=80=89=E5=85=A5DI=E4=BF=A1=E6=81=AF=20=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=8E=89=E4=BA=A7=E5=93=81=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/product/UdiInfoSelectLocalUdi.vue | 2 +- src/views/basic/product/productUdiType.vue | 1 + src/views/basic/product/udiInfoselectErpUdi.vue | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue index a61c266..906175b 100644 --- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue +++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue @@ -164,7 +164,7 @@ /> - +
diff --git a/src/views/basic/product/productUdiType.vue b/src/views/basic/product/productUdiType.vue index 0a4e798..c64418c 100644 --- a/src/views/basic/product/productUdiType.vue +++ b/src/views/basic/product/productUdiType.vue @@ -28,6 +28,7 @@ +