From a6a274f1520d026470698ef7e786db1171148e94 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 28 Jun 2023 09:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF=E5=A4=87?=
 =?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                       |  4 +--
 src/views/inout/DialogCreateOrder.vue | 35 ++++++++++++++++++++++-----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/.env.production b/.env.production
index 81573f8..c1b4d94 100644
--- a/.env.production
+++ b/.env.production
@@ -6,7 +6,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
 
 #林纪裕
-VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:82/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:82/UDI_SPMS_SERVER/'
 
 # VUE_APP_BASE_API =  'http://127.0.0.1:9150/UDI_SPMS_SERVER/'
 
@@ -14,7 +14,7 @@ VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:82/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
 
 # 平潭
-# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
 
 # 文明懂
 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 54294df..0482810 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -253,6 +253,7 @@ import codeDetailPanel from "./PanelCreateOrderCodeDetail"
 import bizDetailPanel from "./PanelCreateOrderBizDetail"
 import A from "../../plugins/KeyScaner"
 import {findByInvUser, getLocalJoinByUser} from '@/api/basic/busType'
+import {deleteRe} from "@/api/auth/register";
 
 export default {
   name: "ioCreateOrder",
@@ -501,6 +502,28 @@ export default {
 
     //添加条码
     addCode(event) {
+      // let regSpe = "{1}";
+      // let regExp = new RegExp(regSpe);
+      // let code = this.codeFormData.code.trim();
+      // code = code.replace("\u001d", "")
+      // if (!regExp.test(code)) {
+      //   this.$confirm("UDI码包含非法字符，是否继续添加?", "提示", {
+      //     confirmButtonText: "确定",
+      //     cancelButtonText: "取消",
+      //     type: "error",
+      //   })
+      //     .then(() => {
+      //       this.addCodeAfterCheck(event);
+      //     })
+      //     .catch(() => {
+      //     });
+      //
+      // } else {
+      //   this.addCodeAfterCheck(event);
+      // }
+      this.addCodeAfterCheck(event);
+    },
+    addCodeAfterCheck(event) {
       this.originCode = "";
       this.sictomText = "";
       this.orderFormData.corpOrderId = this.orderFormData.corpOrderId.trim();
@@ -742,9 +765,11 @@ export default {
         // 刷新表单
         this.$refs["dataForm"].resetFields();
       }
-    }
-    ,
-    enterKey(event) {
+    },
+
+    //校验UDI码格式是否正确
+
+    enterKey() {
       this.checkSuccess = true;
       let tQuery = {
         originCode: this.originCode,
@@ -796,8 +821,7 @@ export default {
         }
         this.loading = false;
       });
-    }
-    ,
+    },
 
 
     getInputFocus(event) {
@@ -930,7 +954,6 @@ export default {
 <style>
 
 
-
 </style>