diff --git a/.env.production b/.env.production
index d4bcb835..4405b8bc 100644
--- a/.env.production
+++ b/.env.production
@@ -18,14 +18,14 @@ 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_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/'
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 135a7c10..b2090e8b 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -8,52 +8,56 @@
label-width="110px"
style="margin-bottom: -15px"
>
-
- 选入预验收库单
-
- 草稿保存
-
- 立即提交
-
-
- 校验结果提交
-
- 扫码结果提交
-
-
- 撤回单据
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 选入预验收库单
+
+ 草稿保存
+
+ 立即提交
+
+
+ 校验结果提交
+
+ 扫码结果提交
+
+
+ 撤回单据
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1254,6 +1258,7 @@ export default {
.then((response) => {
if (response.code == 20000) {
this.$message.success("撤回成功！");
+ this.closeDialog();
} else {
this.$message.error(response.message);
}
@@ -1353,9 +1358,8 @@ export default {
this.$message.error(response.message);
}
});
- }
- if (this.viewType = 7) { //待校验提交
- if (val = 1) {
+ } else if (this.viewType == 7) { //待校验提交
+ if (val == 1) {
this.$confirm("此操作将以校验的正确结果重新生成业务单并提交，是否继续？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
diff --git a/src/views/inout/PanelCreateOrderCodes.vue b/src/views/inout/PanelCreateOrderCodes.vue
index 99c69382..00510b12 100644
--- a/src/views/inout/PanelCreateOrderCodes.vue
+++ b/src/views/inout/PanelCreateOrderCodes.vue
@@ -15,6 +15,18 @@
width="280"
show-overflow-tooltip
>
+
+
-
-
-
- 红色:多余条码
-
-
-
- 黄色:包含多余条码
+
+
+
+
+
+ |
+
红色:多余条码 |
+
+
+ |
+
+ 黄色:包含多余条码
+ |
+
+