From d56def6d896c965dcb4ad80b785101d3d4d3cef1 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, 29 Nov 2022 09:34:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/stockOrderNewDistribution.vue      |  5 ++++-
 src/views/inout/IOAddOrder.vue                  | 17 +++++++++++------
 src/views/inventory/InvPreInProductsDetail.vue  |  4 +++-
 src/views/thrsys/thrOrderNew.vue                |  6 +-----
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue
index 302eaf1..549ba37 100644
--- a/src/views/business/stockOrderNewDistribution.vue
+++ b/src/views/business/stockOrderNewDistribution.vue
@@ -1214,7 +1214,10 @@ export default {
         //         });
         // },
         getBusType() {
+          
+           if( this.formData.id==null){
             this.formData.billType=null;
+           }
             let query = {
                 code: this.formData.invWarehouseCode,
                 enabled: true,
@@ -1289,7 +1292,7 @@ export default {
                 this.formData.fromSubInvCode = '';
             }
             // '';
-            this.locInChange();
+            // this.locInChange();
             this.findMethod();
         },
         locInChange() {
diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue
index 6f2fdd2..6d93cca 100644
--- a/src/views/inout/IOAddOrder.vue
+++ b/src/views/inout/IOAddOrder.vue
@@ -700,6 +700,7 @@ export default {
             });
         },
         addCode(event) {
+        
             this.originCode = "";
             this.sictomText = "";
             this.formData.corpOrderId = this.formData.corpOrderId.trim();
@@ -764,6 +765,7 @@ export default {
 
         },
         addCodeSubmit(tQuery) {
+          
             addOrderWeb(tQuery).then((response) => {
                 if (response.code === 20000) {
                     this.idQuery.id = response.data.orderId;
@@ -928,7 +930,7 @@ export default {
             }
             getLocalJoinByUser(query)
                 .then((response) => {
-                    
+                        
                         this.busTypes = response.data.list || [];
                         if (this.formData.action != null) {
                             this.curAction = this.getActionItem(this.formData.action);
@@ -966,6 +968,7 @@ export default {
         }
         ,
         findMethod(query) {
+          
             this.fromOptions = [];
             let cQuery = {
                 key: query,
@@ -977,7 +980,7 @@ export default {
                 this.formData.fromCorpId = this.curAction.defaultUnit;
             } else if (this.curAction.corpType == 2)//客户
             {
-                cQuery.corpType = 4;
+                cQuery.corpType = 1;
                 cQuery.outType = 2;
 
             } else if (this.curAction.corpType == 0) {
@@ -987,6 +990,7 @@ export default {
 
             getBasicUnitMaintains(cQuery)
                 .then((response) => {
+                    debugger
                     this.loading = false;
                     this.fromOptions = response.data.page.list || [];
                     if (this.curAction.corpType == 3) {
@@ -1095,6 +1099,7 @@ export default {
         }
         ,
         actionChange(item) {
+    
             this.curAction = this.getActionItem(item);
             this.findMethod();
 
@@ -1222,9 +1227,7 @@ export default {
         this.formData.code = '';
         this.formData.actDate = new Date();
         this.codeArray = [];
-        if(this.formData.invWarehouseCode!=null){
-        this.getBusType();
-       }
+       
         this.getStorage(this.formData.action);
 
         if (this.$isNotBlank(this.idQuery.id)) {
@@ -1267,7 +1270,9 @@ export default {
             }
         }
         this.findSubInvByInv(this.formData.locStorageCode);
-
+        if(this.formData.invWarehouseCode!=null){
+        this.getBusType();
+       }
         //查询是否启用多级仓库，判断是否启用部门
         selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
             if (res.code === 20000) {
diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue
index c8f40f5..707241a 100644
--- a/src/views/inventory/InvPreInProductsDetail.vue
+++ b/src/views/inventory/InvPreInProductsDetail.vue
@@ -185,8 +185,10 @@ export default {
         getCodeList() {
             this.loading = true;
             this.query.orderIdFk = this.idQuery.orderIdFk;
+            debugger
             let query = {
-                orderIdFk: this.idQuery.orderIdFk
+                orderIdFk: this.idQuery.orderIdFk,
+                code:this.query.code
             }
             filterDetailProducts(query) //查找该单号下的所有条码
                 .then((response) => {
diff --git a/src/views/thrsys/thrOrderNew.vue b/src/views/thrsys/thrOrderNew.vue
index 7a9c134..a98bd8f 100644
--- a/src/views/thrsys/thrOrderNew.vue
+++ b/src/views/thrsys/thrOrderNew.vue
@@ -476,11 +476,7 @@ export default {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');
                             }
-                            if (this.$isBlank(this.codeArray[i].batchNo)) {
-                                return this.$message.error('批次号不能为空');
-                            }
-
-
+                           
                         }
                     }
                     if (status === '0') {