From c6025a5c4e6475cce846e9ec3f91b6684a2d2b39 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 27 Jun 2023 09:08:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.production b/.env.production index 41898042..d4bcb835 100644 --- a/.env.production +++ b/.env.production @@ -8,7 +8,7 @@ ENV = 'production' #林纪裕cd -VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' @@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/' # 平潭正式 -# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' # 吴总测试服务器 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/' From 53e1977b9017d52b0377fb978f9d2eb7e75c75e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 27 Jun 2023 15:38:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/purchase/purApply/purApplyEditDiaolog.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue index bf8ce623..a70d12ca 100644 --- a/src/views/purchase/purApply/purApplyEditDiaolog.vue +++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue @@ -114,7 +114,6 @@ @@ -127,6 +126,9 @@ 编辑 + 保存 + 删除 @@ -397,6 +399,7 @@ export default { tableCountChange(row) { if (this.$isNotBlank(row)) { updateDetail(this.currentRow); + this.selectedIndex="" } }, tableRowClassName({row, rowIndex}) { From 4f8397fcb908a52d0263f019bb2cf3cd810d2a62 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 27 Jun 2023 18:35:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A2=84=E8=A7=88bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 97de905cc96e123a48ed3304cf7ce5360d71f0c2) --- src/views/inout/DialogCheck.vue | 6 ++++++ src/views/inout/IoAuditedOrder.vue | 6 ++++++ src/views/inout/IoCheckAuditOrder.vue | 6 ++++++ src/views/inout/IoCheckSuccessOrder.vue | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/src/views/inout/DialogCheck.vue b/src/views/inout/DialogCheck.vue index 4912f568..fb8bf616 100644 --- a/src/views/inout/DialogCheck.vue +++ b/src/views/inout/DialogCheck.vue @@ -455,6 +455,9 @@ 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 +496,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/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue index b741b13b..621f5f75 100644 --- a/src/views/inout/IoAuditedOrder.vue +++ b/src/views/inout/IoAuditedOrder.vue @@ -654,6 +654,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; @@ -693,6 +696,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/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue index c8bf5c47..6e2bd66c 100644 --- a/src/views/inout/IoCheckAuditOrder.vue +++ b/src/views/inout/IoCheckAuditOrder.vue @@ -753,6 +753,9 @@ export default { this.showSearch = !this.showSearch; }, 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; @@ -791,6 +794,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/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue index b2eec70b..9d317f6e 100644 --- a/src/views/inout/IoCheckSuccessOrder.vue +++ b/src/views/inout/IoCheckSuccessOrder.vue @@ -620,6 +620,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; @@ -658,6 +661,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; From 9ff096566cfbd6ccee0b7e49ad1188de2c0232dc Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 28 Jun 2023 09:22:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/uploadManage/uploadSetting.vue | 4 ++++ src/views/thirdSys/api/DialogEditBusDown.vue | 2 +- src/views/thirdSys/api/DialogEditBusUpload.vue | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/inout/uploadManage/uploadSetting.vue b/src/views/inout/uploadManage/uploadSetting.vue index a346e122..a46515c8 100644 --- a/src/views/inout/uploadManage/uploadSetting.vue +++ b/src/views/inout/uploadManage/uploadSetting.vue @@ -330,6 +330,10 @@ export default { }, addBusType() { let selectedData = this.multipleSelection; + + selectedData.forEach(item => { + item.id = null + }); this.addBusDialogVisible = false; let query = { busTypes: selectedData, diff --git a/src/views/thirdSys/api/DialogEditBusDown.vue b/src/views/thirdSys/api/DialogEditBusDown.vue index 97837bec..44d8f451 100644 --- a/src/views/thirdSys/api/DialogEditBusDown.vue +++ b/src/views/thirdSys/api/DialogEditBusDown.vue @@ -35,7 +35,7 @@ :value="item.action"> {{ item.name }} {{ - item.remark + item.action }} diff --git a/src/views/thirdSys/api/DialogEditBusUpload.vue b/src/views/thirdSys/api/DialogEditBusUpload.vue index 2ff051db..3be68aee 100644 --- a/src/views/thirdSys/api/DialogEditBusUpload.vue +++ b/src/views/thirdSys/api/DialogEditBusUpload.vue @@ -35,7 +35,7 @@ :value="item.action"> {{ item.name }} {{ - item.remark + item.action }}