From 1ccb334d8640ac7491f75b83146a243aff5f3e90 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 10:52:57 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +-
.env.production | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.env.development b/.env.development
index eed92e7d..d6a9fa2a 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
ENV = 'development'
# 开发环境
-VUE_APP_BASE_API = 'http://127.0.0.1:9991'
+VUE_APP_BASE_API = 'http://192.168.0.43:9991'
VUE_APP_SYNC_API ="http://127.0.0.1:10001"
diff --git a/.env.production b/.env.production
index 21ea9a52..9de78aa4 100644
--- a/.env.production
+++ b/.env.production
@@ -16,9 +16,9 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
# 文明东1
-# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
# 文明东2
-# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_WMS_MC/'
# VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
刘恩典
@@ -31,7 +31,7 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
# 漳州中医院
-VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/
From 32245ac978fd565bfc9b643106202156ccc7e5b5 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 28 Jun 2023 10:42:28 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=86=E7=B1=BB?=
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 21ea9a52..8cc9d4c3 100644
--- a/.env.production
+++ b/.env.production
@@ -18,8 +18,8 @@ ENV = 'production'
# 文明东1
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
# 文明东2
-# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
-# VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
+ #VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
+ #VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
刘恩典
# VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
From f7b4e0b28ccbd186cacae06e954aa2cdab3c34be 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, 7 Jul 2023 16:42:30 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=8D=95=E5=A1=AB?=
=?UTF-8?q?=E5=86=99=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E6=97=B6=E5=A4=9A?=
=?UTF-8?q?=E4=B8=AA=E4=BA=A7=E5=93=81=E4=BC=A0=E9=94=99=E5=BE=80=E6=9D=A5?=
=?UTF-8?q?=E5=8D=95=E4=BD=8Did=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inout/DialogCreateOrder.vue | 8 ++++++++
src/views/inout/DialogSelectRl.vue | 6 ++++++
2 files changed, 14 insertions(+)
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index f7e1733e..1cd3bac0 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -102,6 +102,7 @@
placeholder="请选择单据类型"
:disabled="corpOrderIdDisabled"
style="width: 90%"
+ filterable
@change="actionChange"
>
<el-option
@@ -1070,6 +1071,7 @@ export default {
//添加条码后提交
addCodeSubmit(tQuery) {
addOrderWeb(tQuery).then((response) => {
+ debugger
if (response.code === 20000) {
this.orderFormData.billNo = response.data.orderId;
if (response.data.errMsg != null) {
@@ -1093,9 +1095,15 @@ export default {
this.refreshCodesPanel();
this.$message.error(response.message);
this.selectRlTitle = response.message;
+ //判断是出库需要选择供应商的时候把供应商值传过去
+ if(tQuery.selectSupId!=null){
+ this.codeFormData.selectSupId=tQuery.selectSupId
+ }
+
this.selectRlVisible = true;
} else if (response.code == 503) {
//该产品绑定多个供应商处理
+ debugger
this.curRow = response.data;
this.orderFormData.billNo = this.curRow.orderId;
this.codeFormData.relId = this.curRow.relId;
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index ed68ed0c..35f6e283 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -713,6 +713,8 @@ export default {
,
bindId(val) {
if (this.curRow.code != null || this.type == 1) {
+ debugger
+
this.$emit("selectBindRl", val);
} else {
let query = {
@@ -860,6 +862,10 @@ export default {
components: {}
,
created() {
+ debugger
+ if(this.curRow.selectSupId!=null){
+ this.fromCorp=this.curRow.selectSupId
+ }
this.getList();
}
,
From 58de2582ae9d7119f300dce95b5b09f8ea6ccfc5 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, 7 Jul 2023 16:45:22 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4debugger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/inout/DialogCreateOrder.vue | 3 ---
src/views/inout/DialogSelectRl.vue | 3 ---
2 files changed, 6 deletions(-)
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 1cd3bac0..ce65f167 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -792,7 +792,6 @@ export default {
page: 1,
limit: 20,
};
- debugger
if (this.curAction.corpType == 3) {
//内部科室
cQuery.corpType = 3;
@@ -1071,7 +1070,6 @@ export default {
//添加条码后提交
addCodeSubmit(tQuery) {
addOrderWeb(tQuery).then((response) => {
- debugger
if (response.code === 20000) {
this.orderFormData.billNo = response.data.orderId;
if (response.data.errMsg != null) {
@@ -1103,7 +1101,6 @@ export default {
this.selectRlVisible = true;
} else if (response.code == 503) {
//该产品绑定多个供应商处理
- debugger
this.curRow = response.data;
this.orderFormData.billNo = this.curRow.orderId;
this.codeFormData.relId = this.curRow.relId;
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index 35f6e283..e4dcf3ce 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -713,8 +713,6 @@ export default {
,
bindId(val) {
if (this.curRow.code != null || this.type == 1) {
- debugger
-
this.$emit("selectBindRl", val);
} else {
let query = {
@@ -862,7 +860,6 @@ export default {
components: {}
,
created() {
- debugger
if(this.curRow.selectSupId!=null){
this.fromCorp=this.curRow.selectSupId
}
From 23475c9b80bad61878110150ef4debd1b18bf737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 10 Jul 2023 10:14:33 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=B5=8B=E8=AF=95ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.production | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/.env.production b/.env.production
index d4bcb835..91adeb43 100644
--- a/.env.production
+++ b/.env.production
@@ -15,17 +15,21 @@ ENV = 'production'
# 测试服务器
# VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
+
+# 林淑波
+VUE_APP_BASE_API = 'http://192.168.0.231:9150/UDI_WMS_MC/'
+
# 文明东1
# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
# 文明东2
-# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
-# VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
+# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
+# VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
刘恩典
# 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/'