From 017a8a1c143b619ea501d3822df80423a1f4d881 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 28 Apr 2023 15:22:33 +0800 Subject: [PATCH 1/5] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/DialogCreateOrder.vue | 16 ++++++++------- src/views/sync/SysUdimsData.vue | 28 +++++++++++++-------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index c9d3ab8..f9d48d0 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -3,7 +3,8 @@ - + 草稿保存 - 立即提交 - + + 待配货提交 + 查询 - 同步单据 - - - - 同步单据类型 - - 同步基础信息 - - 同步国家库DI数据 - + + + + + + + + + + + + + + From a429a22628d9fab68cd89ab39db237092a54604b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 28 Apr 2023 17:37:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E5=85=B3=E9=97=AD=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/thirdSys/inv/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/thirdSys/inv/index.vue b/src/views/thirdSys/inv/index.vue index 327833d..650e182 100644 --- a/src/views/thirdSys/inv/index.vue +++ b/src/views/thirdSys/inv/index.vue @@ -453,8 +453,8 @@ export default { // 更改值 this.formVisible = false; this.subFormVisible = false; - let Item = JSON.parse(localStorage.getItem('obj')) - this.subData=Item; + // let Item = JSON.parse(localStorage.getItem('obj')) + // this.subData=Item; this.getSubList(); return true; }, From 2bd4195f23751e2e3749d3ef9dc5d59041a6b2d6 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 29 Apr 2023 11:16:43 +0800 Subject: [PATCH 3/5] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/InvSpaceManage.vue | 2 +- src/views/system/param/busTypeChange.vue | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/inventory/InvSpaceManage.vue b/src/views/inventory/InvSpaceManage.vue index a75c939..c7d9e28 100644 --- a/src/views/inventory/InvSpaceManage.vue +++ b/src/views/inventory/InvSpaceManage.vue @@ -75,7 +75,7 @@ - + diff --git a/src/views/system/param/busTypeChange.vue b/src/views/system/param/busTypeChange.vue index 95c618e..d060a2b 100644 --- a/src/views/system/param/busTypeChange.vue +++ b/src/views/system/param/busTypeChange.vue @@ -252,6 +252,8 @@ export default { this.cancelDialog(); this.loading = false; this.getList(); + } else { + this.$message.error(res.message); } }).catch((error) => { this.loading = false; From a2f288f0ad92252c88e0a9c6e17e7289995b0e68 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 1 May 2023 15:36:42 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/InvPreInProductsDetail.vue | 6 ++ src/views/inventory/InvPreProductsDetail.vue | 6 ++ src/views/inventory/InvProductsDetail.vue | 6 ++ src/views/sync/SysUdimsConfig.vue | 23 ++++++- src/views/sync/SysUdimsData.vue | 37 ++++++----- src/views/sync/SysUdimsDownloadData.vue | 64 ++++++++++--------- 6 files changed, 95 insertions(+), 47 deletions(-) diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue index 07e9e83..05b999b 100644 --- a/src/views/inventory/InvPreInProductsDetail.vue +++ b/src/views/inventory/InvPreInProductsDetail.vue @@ -83,6 +83,12 @@ width="120" show-overflow-tooltip > + + + - + @@ -291,6 +291,25 @@ + + + + + + + + + + + + + + + + + + + @@ -795,6 +814,8 @@ export default { scanChangeConfig: null, busChangeConfig: null, dbDiCompany: null, + udiCodeLost:null, + udiCodeRel:null, }, checkedBusTypes: [], checkedToInBusTypes: [], diff --git a/src/views/sync/SysUdimsData.vue b/src/views/sync/SysUdimsData.vue index f5b5171..1064962 100644 --- a/src/views/sync/SysUdimsData.vue +++ b/src/views/sync/SysUdimsData.vue @@ -29,7 +29,7 @@ 查询 - + @@ -48,7 +48,7 @@ - + @@ -72,9 +72,9 @@ - + - +