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

# Conflicts:
#	.env.production

.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"
 

.env.production

@@ -15,6 +15,10 @@ 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

src/views/inout/DialogCreateOrder.vue

@@ -102,6 +102,7 @@
                 placeholder="请选择单据类型"
                 :disabled="corpOrderIdDisabled"
                 style="width: 90%"
+                filterable
                 @change="actionChange"
               >
                 <el-option
@@ -791,7 +792,6 @@ export default {
         page: 1,
         limit: 20,
       };
-      debugger
       if (this.curAction.corpType == 3) {
         //内部科室
         cQuery.corpType = 3;
@@ -1093,6 +1093,11 @@ 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) {
             //该产品绑定多个供应商处理

src/views/inout/DialogSelectRl.vue

@@ -860,6 +860,9 @@ export default {
   components: {}
   ,
   created() {
+    if(this.curRow.selectSupId!=null){
+      this.fromCorp=this.curRow.selectSupId
+    }
     this.getList();
   }
   ,