From 26a370d32cf8478f4c037f76f5037e0e560401c1 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 9 Feb 2023 14:54:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=8D=95=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=B5=81=E8=BD=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IoCreateOrder.vue           |  2 +-
 src/views/system/param/busTypePre.vue       |  8 ++++----
 src/views/system/param/busTypePreModify.vue | 20 ++++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 342d9827..7b7dbe1f 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -130,7 +130,7 @@
               </el-select>
 
             </el-form-item>
-            <el-form-item prop="fromCorp"
+            <el-form-item prop="fromCorp" label="往来信息:"
                           v-if="curAction.corpType ==1 && curAction.genUnit">
               <el-input v-model="orderFormData.fromCorp" auto-complete="off"
                         clearable
diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index 7215cc59..7f9ca058 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/src/views/system/param/busTypePre.vue
@@ -192,10 +192,10 @@ export default {
         this.$message.error("目标所在仓库不能为空！")
         return;
       }
-      if (isBlank(this.inputQuery.defaultInvCode)) {
-        this.$message.error("目标往来仓库不能为空");
-        return;
-      }
+      // if (isBlank(this.inputQuery.defaultInvCode)) {
+      //   this.$message.error("目标往来仓库不能为空");
+      //   return;
+      // }
 
       if (this.formName === "add") {
         let numRegExp = '^[0-9]*$';
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index 22c29cc2..a19fa0aa 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -107,7 +107,7 @@
 <script>
 
 import {getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
-import {filterSubByInv, filterSubAll} from "@/api/system/invSubWarehouse";
+import {filterSubByInv, filterSubAll, findByFrom} from "@/api/system/invSubWarehouse";
 
 export default {
   name: "BusTypePreModify",
@@ -151,13 +151,13 @@ export default {
             trigger: "blur"
           }
         ],
-        defaultInvCode: [
-          {
-            required: true,
-            message: "目标往来仓库不能为空",
-            trigger: "blur"
-          }
-        ],
+        // defaultInvCode: [
+        //   {
+        //     required: true,
+        //     message: "目标往来仓库不能为空",
+        //     trigger: "blur"
+        //   }
+        // ],
       },
     }
   },
@@ -206,10 +206,10 @@ export default {
 
     getFromInv() {
       let params = {
-        code: this.inputQuery.invCode,
+        locInvCode: this.inputQuery.invCode,
         filter: 2
       };
-      filterSubByInv(params).then((res) => {
+      findByFrom(params).then((res) => {
         if (res.code === 20000) {
           this.fromInvs = res.data;
         }