From f4f62e453f0694e1e36bc7f8cbd1f46256801129 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 14 Jul 2023 17:08:36 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.production b/.env.production index f54ba371..13382a18 100644 --- a/.env.production +++ b/.env.production @@ -37,7 +37,7 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/' # 片仔癀诊断 -# VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/' + VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/' # 应用访问路径 例如使用前缀 /admin/ From 4da4cc0ed4ba854dda54fbcc3a9bfb0f072a5fff Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 17 Jul 2023 09:14:44 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/views/inout/DialogSelectProduct.vue | 2 +- .../api/BasicThirdSysDetailModify.vue | 50 ++++++++++++------- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/.env.development b/.env.development index c29652c7..6289c6fa 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统 ENV = 'development' # 开发环境 -VUE_APP_BASE_API = 'http://192.168.0.166:9991' +VUE_APP_BASE_API = 'http://127.0.0.1:9991' VUE_APP_SYNC_API ="http://192.168.0.166:10001" diff --git a/src/views/inout/DialogSelectProduct.vue b/src/views/inout/DialogSelectProduct.vue index af02dc4f..22defdc1 100644 --- a/src/views/inout/DialogSelectProduct.vue +++ b/src/views/inout/DialogSelectProduct.vue @@ -282,7 +282,7 @@ export default { return; } let str = this.currentRow.zczbhhzbapzbh; - if (str.search(",") != -1) { + if (this.str.search(",") != -1) { this.currentCert = null; this.certList = str.split(','); this.dialogFormVisible = true; diff --git a/src/views/thirdSys/api/BasicThirdSysDetailModify.vue b/src/views/thirdSys/api/BasicThirdSysDetailModify.vue index 6f8a2cc0..962d6944 100644 --- a/src/views/thirdSys/api/BasicThirdSysDetailModify.vue +++ b/src/views/thirdSys/api/BasicThirdSysDetailModify.vue @@ -6,7 +6,7 @@
- 接口实时获取 + 接口实时获取 接口方式 第三方上传缓存 文件方式 @@ -20,33 +20,33 @@ - + - + - + + + + + + + + + - + From c913a1554c24837f3fb463f497ebef0dae97ee2c Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 18 Jul 2023 09:23:15 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/DialogSelectProduct.vue | 8 +- .../purOrder/purOrderOrderSelectProduct.vue | 780 +++++++++--------- .../purOrder/purOrderSelectProduct.vue | 3 +- .../purPlan/purOrderSelectProduct.vue | 3 +- .../purPlan/purPlanOrderSelectProduct.vue | 780 +++++++++--------- 5 files changed, 794 insertions(+), 780 deletions(-) diff --git a/src/views/inout/DialogSelectProduct.vue b/src/views/inout/DialogSelectProduct.vue index 22defdc1..2b771369 100644 --- a/src/views/inout/DialogSelectProduct.vue +++ b/src/views/inout/DialogSelectProduct.vue @@ -140,7 +140,10 @@ - {{ item }} + {{ + item + }} + @@ -170,6 +173,7 @@ import {addBizProduct} from "@/api/inout/orderDetailCode"; import {filterCompanyProductRelevance} from "@/api/basic/udiRlSuptRelevance"; import udiRlDetailDialog from "../purchase/purApply/purUdiRlDetailDialog"; +import {isBlank} from "@/utils/strUtil"; export default { name: "stockOrderNewSelectProduct",//选入耗材字典产品对话框 @@ -282,7 +286,7 @@ export default { return; } let str = this.currentRow.zczbhhzbapzbh; - if (this.str.search(",") != -1) { + if (!isBlank(str) && str.search(",") != -1) { this.currentCert = null; this.certList = str.split(','); this.dialogFormVisible = true; diff --git a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue index a6781b3c..4f639c5c 100644 --- a/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue +++ b/src/views/purchase/purOrder/purOrderOrderSelectProduct.vue @@ -1,440 +1,444 @@ diff --git a/src/views/purchase/purOrder/purOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderSelectProduct.vue index b7736608..ba88c9f3 100644 --- a/src/views/purchase/purOrder/purOrderSelectProduct.vue +++ b/src/views/purchase/purOrder/purOrderSelectProduct.vue @@ -137,6 +137,7 @@ import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevan import store from "../../../store"; import {addOrderDetail} from "@/api/purchase/purOrder" import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog"; +import {isBlank} from "@/utils/strUtil"; export default { name: "stockOrderNewSelectProduct", @@ -339,7 +340,7 @@ export default { } } let str = this.multipleSelection.zczbhhzbapzbh; - if (str.search(",") != -1) { + if (!isBlank(str) && str.search(",") != -1) { this.currentCert = null; this.certList = str.split(','); this.dialogFormVisible = true; diff --git a/src/views/purchase/purPlan/purOrderSelectProduct.vue b/src/views/purchase/purPlan/purOrderSelectProduct.vue index 17399f2d..4ac7d18f 100644 --- a/src/views/purchase/purPlan/purOrderSelectProduct.vue +++ b/src/views/purchase/purPlan/purOrderSelectProduct.vue @@ -122,6 +122,7 @@ import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevan import store from "../../../store"; import {addPlanDetail} from "@/api/purchase/purPlan" import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog"; +import {isBlank} from "@/utils/strUtil"; export default { name: "stockOrderNewSelectProduct", @@ -314,7 +315,7 @@ export default { } } let str = this.multipleSelection.zczbhhzbapzbh; - if (str.search(",") != -1) { + if (!isBlank(str) && str.search(",") != -1) { this.currentCert = null; this.certList = str.split(','); this.dialogFormVisible = true; diff --git a/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue b/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue index c223e99c..4feb2bc4 100644 --- a/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue +++ b/src/views/purchase/purPlan/purPlanOrderSelectProduct.vue @@ -1,158 +1,161 @@ From 35cc8ee9a656ce5880e3cb9b7460abbc45a82fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Tue, 18 Jul 2023 09:23:58 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sync/SysUdimsConfig.vue | 11 +++++++++++ src/views/system/dept/invWarehouse.vue | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue index 4d5baf31..00064657 100644 --- a/src/views/sync/SysUdimsConfig.vue +++ b/src/views/sync/SysUdimsConfig.vue @@ -824,6 +824,8 @@ export default { changeBusTypeTotal: 0, changeBusTypes: [], changeBusTypeSelection: [], + InBusTypesdirect: null, + BusTypesdirect: null }; }, methods: { @@ -935,6 +937,10 @@ export default { if (isPut) this.checkedToInBusTypes.push(obj); }); this.addBusToInDialogVisible = false; + this.checkedToInBusTypes.forEach((obj) => { + console.log("spms->udi:"+obj.direct) + //this.InBusTypesdirect = null + }) }, addBusType() { @@ -954,6 +960,11 @@ export default { if (isPut) this.checkedBusTypes.push(obj); }); this.addBusDialogVisible = false; + this.checkedBusTypes.forEach((obj) => { + console.log("udi->spms:"+obj.direct) + //this.BusTypesdirect = null + }) + }, remveBus(index, row) { this.checkedBusTypes.splice(index, 1); diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index c9e4a646..6f064617 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -563,7 +563,7 @@ export default { this.subData.advanceType = this.subData.advanceType.toString(); if (this.subData.parentCode != null && this.subData.parentCode != "") { this.isAdvanceTypeShow = true; - this.isShow = true; + this.isShow = false; } else { this.isAdvanceTypeShow = false; this.isShow = true From 5b7264f3e5d75b875c7f0bc826583e4d41cacf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Tue, 18 Jul 2023 09:40:15 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=90=8C=E6=AD=A5=E8=87=B3=E8=87=AA?= =?UTF-8?q?=E5=8A=A9=E5=B9=B3=E5=8F=B0=E6=88=96=E7=AE=A1=E7=90=86=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=9A=84=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E5=8D=95=E7=BA=BF=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sync/SysUdimsConfig.vue | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue index 00064657..e85f5467 100644 --- a/src/views/sync/SysUdimsConfig.vue +++ b/src/views/sync/SysUdimsConfig.vue @@ -824,8 +824,6 @@ export default { changeBusTypeTotal: 0, changeBusTypes: [], changeBusTypeSelection: [], - InBusTypesdirect: null, - BusTypesdirect: null }; }, methods: { @@ -937,10 +935,6 @@ export default { if (isPut) this.checkedToInBusTypes.push(obj); }); this.addBusToInDialogVisible = false; - this.checkedToInBusTypes.forEach((obj) => { - console.log("spms->udi:"+obj.direct) - //this.InBusTypesdirect = null - }) }, addBusType() { @@ -960,10 +954,6 @@ export default { if (isPut) this.checkedBusTypes.push(obj); }); this.addBusDialogVisible = false; - this.checkedBusTypes.forEach((obj) => { - console.log("udi->spms:"+obj.direct) - //this.BusTypesdirect = null - }) }, remveBus(index, row) { From c9fb1e04a71b99177f9e6ed82b860604a4672085 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, 18 Jul 2023 10:36:56 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/InvoiceRegByOrder.vue | 13 ++++- src/views/inout/InvoiceSelectRegByOrder.vue | 62 ++++++++++++--------- 2 files changed, 47 insertions(+), 28 deletions(-) diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue index b83cb418..fcf1d82d 100644 --- a/src/views/inout/InvoiceRegByOrder.vue +++ b/src/views/inout/InvoiceRegByOrder.vue @@ -5,7 +5,7 @@ - @@ -102,7 +102,13 @@ - + + + + + + +
@@ -169,6 +175,7 @@ + -