From 305f0e29651a7a81190a19c10c1cdac0fff73121 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 2 Mar 2023 15:19:49 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogSelectReceiveOrder.vue | 2 +-
 src/views/system/dept/invWarehouse.vue       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue
index da4d94e4..a6b47876 100644
--- a/src/views/inout/DialogSelectReceiveOrder.vue
+++ b/src/views/inout/DialogSelectReceiveOrder.vue
@@ -26,7 +26,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item class="query-form-item" label="领用类型">
-                <el-select v-model="listQuery.billAction" placeholder="请选择领用类型" clearable="true">
+                <el-select v-model="listQuery.billType" placeholder="请选择领用类型" clearable="true">
                   <el-option
                     v-for="item in originTypes"
                     :key="item.originAction"
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index 12c0c8e6..d8bc7ba6 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -565,6 +565,7 @@ export default {
     },
     //关联第三方仓库信息
     intentSubSelect(row) {
+
       if (row != null) {
         if (row.sysId != null && row.sysId != undefined) {
           this.thirdSubQuery.thirdSysFk = row.sysId;

From 66c85fb3748ccfdbaf8478a290f3c6082e41f305 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 2 Mar 2023 15:37:24 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogSelectReceiveOrder.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue
index a6b47876..98573ab0 100644
--- a/src/views/inout/DialogSelectReceiveOrder.vue
+++ b/src/views/inout/DialogSelectReceiveOrder.vue
@@ -86,7 +86,7 @@
           @current-change="handleDetail"
         >
           <el-table-column label="序号" type="index" width="60"></el-table-column>
-          <el-table-column label="领用类型" prop="billType"></el-table-column>
+          <el-table-column label="领用类型" prop="billTypeName"></el-table-column>
           <el-table-column label="单据号" prop="billNo"></el-table-column>
           <el-table-column label="领用仓库" prop="invName"></el-table-column>
           <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>

From 7e1d65258f21a9c3c29502d7155b98a00ade5e08 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 2 Mar 2023 16:02:20 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogSelectReceiveOrder.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue
index 98573ab0..21fc9ea1 100644
--- a/src/views/inout/DialogSelectReceiveOrder.vue
+++ b/src/views/inout/DialogSelectReceiveOrder.vue
@@ -283,11 +283,11 @@ export default {
     getList() {
       this.loading = true;
       if (this.actDateRange !== null) {
-        this.listQuery.startDate = this.actDateRange[0];
-        this.listQuery.endDate = this.actDateRange[1];
+        this.listQuery.startTime = this.actDateRange[0];
+        this.listQuery.endTime = this.actDateRange[1];
       } else {
-        this.listQuery.startDate = null;
-        this.listQuery.endDate = null;
+        this.listQuery.startTime = null;
+        this.listQuery.endTime = null;
       }
       this.listQuery.customerId = store.getters.customerId;
       getReceiveOrder(this.listQuery)

From 7fb8a2b343cc2cc86bfb2a5b00b9cf2f54a64716 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 2 Mar 2023 16:14:50 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogSelectReceiveOrder.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue
index 21fc9ea1..1b0725e8 100644
--- a/src/views/inout/DialogSelectReceiveOrder.vue
+++ b/src/views/inout/DialogSelectReceiveOrder.vue
@@ -363,7 +363,7 @@ export default {
     },
     getBusType() {
       let query = {
-        enabled: false,
+        enable: true,
       };
       getBusChange(query)
         .then((response) => {