From 695c43125ed183be8c586b384d201b9b8298e0c9 Mon Sep 17 00:00:00 2001
From: zhengmingliang <hongtianzai@126.com>
Date: Tue, 15 Nov 2022 17:41:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E6=8D=AE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E9=80=89=E5=8F=96=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/supCertificationAdd.vue        | 4 ----
 src/views/warehouse/addOrder.vue                  | 8 +++++---
 src/views/warehouse/stockOrderNewDistribution.vue | 6 ++++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/purchase/supCertificationAdd.vue b/src/views/purchase/supCertificationAdd.vue
index 600fe31..16aa531 100644
--- a/src/views/purchase/supCertificationAdd.vue
+++ b/src/views/purchase/supCertificationAdd.vue
@@ -472,10 +472,6 @@ export default {
             this.getRegistrationList();
         },
         onSubmit2() {
-            if(this.currentManufacturer==null){
-                this.$message.error("请先选中生产企业！");
-                return
-            }
             this.getRegistrationList();
         },
         registrationDialog(row) {
diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue
index 03d8f28..3783052 100644
--- a/src/views/warehouse/addOrder.vue
+++ b/src/views/warehouse/addOrder.vue
@@ -116,6 +116,7 @@
           <el-col :span="8">
             <el-form-item prop="locStorageCode">
               <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" clearable
+                          @change="getBusType"
                          :disabled="corpOrderIdDisabled">
                 <el-option
 
@@ -329,7 +330,7 @@ import {getBussinessType} from "../../api/basic/bussinessType";
 import {parseTime} from "../../filtres/index";
 import store from "../../store";
 import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
-import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType";
+import {getLocalBusType, getLocalJoinBusType,getLocalJoinByUser} from "../../api/basic/busLocalType";
 import DialogSelectUnit from "./DialogSelectUnit";
 import selectRlDialog from "./DialogSelectRl";
 import editCodeDialog from "./editCode";
@@ -778,8 +779,9 @@ export default {
     getBusType() {
       let query = {
         enabled: true,
+        invWarehouseCode: this.formData.invWarehouseCode
       };
-      getLocalJoinBusType(query)
+      getLocalJoinByUser(query)
           .then((response) => {
             this.busTypes = response.data.list || [];
             this.curAction = this.busTypes[0];
@@ -933,7 +935,6 @@ export default {
     this.formData.fromCorp = store.getters.companyName;// store.getters.customerId === 110 ? '医院' : store.getters.companyName;
     this.formData.fromCorpId = store.getters.customerId;
     this.formData.customerId = store.getters.customerId;
-    this.getBusType();
     this.getStorage();
     if (this.$isNotBlank(this.idQuery.id)) {
       this.formData.actDate = new Date(this.idQuery.actDate);
@@ -955,6 +956,7 @@ export default {
       this.findSubInvByInv(this.$store.getters.locInvCode);
       this.formData.invWarehouseCode = this.$store.getters.locSubInvCode;
       this.corpOrderIdDisabled = false;
+      this.getBusType();
       if (JSON.stringify(this.$route.query) === '{}') {
         // this.formData.corpOrderId = new Date().getTime() + (Math.ceil(Math.random() * 10 + 10) + '');
         let date = new Date();
diff --git a/src/views/warehouse/stockOrderNewDistribution.vue b/src/views/warehouse/stockOrderNewDistribution.vue
index a24693e..3b8566d 100644
--- a/src/views/warehouse/stockOrderNewDistribution.vue
+++ b/src/views/warehouse/stockOrderNewDistribution.vue
@@ -133,6 +133,7 @@
                         <el-form-item prop="invWarehouseCode">
                             <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
                                        :disabled="codeArray.length>0"
+                                       @change="getBusType"
                                        clearable>
                                 <el-option
                                     v-for="item in subInvList"
@@ -928,7 +929,7 @@ export default {
         getBusType() {
             let query = {
                 enabled: true,
-                code: this.formData.locStorageCode
+                invWarehouseCode: this.formData.invWarehouseCode
             };
             getLocalJoinByUser(query)
                 .then((response) => {
@@ -993,7 +994,7 @@ export default {
         };
     },
     created() {
-        this.getBusType();
+       
         this.formData = {};
         this.codeArray = [];
         this.closeConfirmFunction(false);
@@ -1022,6 +1023,7 @@ export default {
 
 
         }
+        this.getBusType();
         this.findSubInvs();
     },
 };