Merge remote-tracking branch 'origin/dev' into dev

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-VUE_APP_BASE_API = 'http://192.168.0.43:9991'
+VUE_APP_BASE_API = 'http://192.168.0.166:9991'
 
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 

.env.production

@@ -17,7 +17,7 @@ ENV = 'production'
 
 
 # 林淑波
-VUE_APP_BASE_API = 'http://192.168.0.231: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/'
@@ -28,16 +28,18 @@ VUE_APP_BASE_API = 'http://192.168.0.231:9150/UDI_WMS_MC/'
 # 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/'
 
 # 漳州中医院
-# 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/'
 
 # 片仔癀诊断
-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/'
+# 协调平台测试（片仔癀诊断）
+# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
 
 
 # 应用访问路径 例如使用前缀 /admin/

src/views/inout/DialogCreateOrder.vue

@@ -1048,6 +1048,7 @@ export default {
       );
       tQuery.code = this.codeFormData.code;
       tQuery.orderType = this.viewType;
+      debugger
       this.addCodeSubmit(tQuery);
       this.$refs.inputRef.select();
     },
@@ -1462,7 +1463,6 @@ export default {
       this.corpOrderIdDisabled = true;
       this.orderFormData = this.orderQuery;
       this.actionEnable = true;
-      this.orderFormData.fromCorp=this.orderFormData.fromCorpName;
       if (this.$isNotBlank(this.orderFormData.checkPreInOrders)) {
         this.checkPreInArray = this.orderFormData.split(",");
       }