From 8051c11c546e7a51e01aa78aa9edfcae577e54cf Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 22 Feb 2024 11:13:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=86=8D=E6=AC=A1=E5=88=86=E9=85=8D?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/DialogCreateOrder.vue | 5 ++++- src/views/inout/IoReturnedSearchOrder.vue | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 0afa31f..ca84416 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -277,7 +277,10 @@ export default { type: Object, required: true, }, - + isSupVesion: { + type: Object, + required: true, + }, }, data() { return { diff --git a/src/views/inout/IoReturnedSearchOrder.vue b/src/views/inout/IoReturnedSearchOrder.vue index 7c0a233..6a74e60 100644 --- a/src/views/inout/IoReturnedSearchOrder.vue +++ b/src/views/inout/IoReturnedSearchOrder.vue @@ -1141,6 +1141,7 @@ :closeDialog="closeDialog" :orderQuery="returnData" :viewType="viewType" + :isSupVesion="isSupVesion" > @@ -1331,6 +1332,7 @@ export default { addOrderVisible: false, returnData: null, viewType: 3, + isSupVesion: false, }; }, components: {AcceptOrder, addOrder}, @@ -1451,6 +1453,7 @@ export default { if (response.code == 20000) { _this.returnData = response.data; _this.addOrderVisible = true; + _this.isSupVesion = true; } }) From 6e1eaeb96f8e1840b56526a363696cdcf90b31f1 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 22 Feb 2024 11:25:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=9F=A5=E7=9C=8B=E5=B8=AE=E5=8A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/DialogCreateOrder.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index ca84416..9080d82 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -284,6 +284,7 @@ export default { }, data() { return { + BASE_URL: process.env.VUE_APP_BASE_API, //查看帮助相关 ioCreateOrderHelp500:{}, // ioCreateOrderHelp502:{}, @@ -417,6 +418,9 @@ export default { //为url类型 if (helpType == 1) { window.open(this["ioCreateOrderHelp"+code].urlPath, '_blank') + }else if(helpType == 0 ||helpType == null){ + let certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; + window.open(certFileUrl + this["ioCreateOrderHelp"+code].filePath); } },