From 60d3ff70cbb7dc2ecc47f8d74c92ce1523afafa9 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 8 Mar 2023 15:18:10 +0800
Subject: [PATCH 1/2] =?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/inventory/InvCountOrderAudit.vue     | 2 +-
 src/views/inventory/InvCountOrderCompleted.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/inventory/InvCountOrderAudit.vue b/src/views/inventory/InvCountOrderAudit.vue
index 47801adc..1f6b032d 100644
--- a/src/views/inventory/InvCountOrderAudit.vue
+++ b/src/views/inventory/InvCountOrderAudit.vue
@@ -51,7 +51,7 @@
             <span>{{ countTypeMap[scope.row.countType] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="盘点人" prop="createUserName" width="200"></el-table-column>
+        <el-table-column label="盘点人" prop="createUser" width="200"></el-table-column>
         <el-table-column label="盘点时间" prop="createTime"></el-table-column>
         <el-table-column label="状态" prop="status" width="120">
           <template slot-scope="scope">
diff --git a/src/views/inventory/InvCountOrderCompleted.vue b/src/views/inventory/InvCountOrderCompleted.vue
index 2b6d1573..e3fa4a3f 100644
--- a/src/views/inventory/InvCountOrderCompleted.vue
+++ b/src/views/inventory/InvCountOrderCompleted.vue
@@ -105,7 +105,7 @@
         :total="detailTotal"
         :limit.sync="detailQuery.limit"
         :page.sync="detailQuery.page"
-        @pagination="getList"
+        @pagination="getCountOrderDetailList"
       ></pagination>
     </el-card>
 

From 15541f11a9a3e585afd87d7a440040bdf3919c36 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 8 Mar 2023 16:17:07 +0800
Subject: [PATCH 2/2] =?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/inventory/DeviceReceiveOrderAudit.vue     | 2 +-
 src/views/inventory/DeviceReceiveOrderCompleted.vue | 2 +-
 src/views/inventory/DeviceReceiveOrderNew.vue       | 2 +-
 src/views/inventory/InvCountOrderAudit.vue          | 1 +
 src/views/inventory/InvCountOrderCompleted.vue      | 1 +
 src/views/inventory/InvCountOrderNew.vue            | 1 +
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/inventory/DeviceReceiveOrderAudit.vue b/src/views/inventory/DeviceReceiveOrderAudit.vue
index 05f1c318..907d4fc3 100644
--- a/src/views/inventory/DeviceReceiveOrderAudit.vue
+++ b/src/views/inventory/DeviceReceiveOrderAudit.vue
@@ -240,7 +240,7 @@ export default {
         });
     },
     getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
+      let params = {invWarehouseCode: this.filterQuery.fromInvCode,invStorageCode:this.filterQuery.fromInvCode.fromDeptCode, status: 1};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
         this.getList();
diff --git a/src/views/inventory/DeviceReceiveOrderCompleted.vue b/src/views/inventory/DeviceReceiveOrderCompleted.vue
index 9a053a6d..a4424f90 100644
--- a/src/views/inventory/DeviceReceiveOrderCompleted.vue
+++ b/src/views/inventory/DeviceReceiveOrderCompleted.vue
@@ -222,7 +222,7 @@ export default {
         });
     },
     getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
+      let params = {invWarehouseCode: this.filterQuery.fromInvCode,invStorageCode:this.filterQuery.fromInvCode.fromDeptCode, status: 1};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
         this.getList();
diff --git a/src/views/inventory/DeviceReceiveOrderNew.vue b/src/views/inventory/DeviceReceiveOrderNew.vue
index e1839c46..dfd84d00 100644
--- a/src/views/inventory/DeviceReceiveOrderNew.vue
+++ b/src/views/inventory/DeviceReceiveOrderNew.vue
@@ -231,7 +231,7 @@ export default {
         });
     },
     getSpaceList() {
-      let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
+      let params = {invWarehouseCode: this.filterQuery.fromInvCode,invStorageCode:this.filterQuery.fromInvCode.fromDeptCode, status: 1};
       getInvSpaceList(params).then((res) => {
         this.spaceList = res.data.list || [];
         this.getList();
diff --git a/src/views/inventory/InvCountOrderAudit.vue b/src/views/inventory/InvCountOrderAudit.vue
index 1f6b032d..6704ee0d 100644
--- a/src/views/inventory/InvCountOrderAudit.vue
+++ b/src/views/inventory/InvCountOrderAudit.vue
@@ -259,6 +259,7 @@ export default {
         })
         .catch(() => {
         });
+      this.getSpaceList();
     },
     getSpaceList() {
       let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
diff --git a/src/views/inventory/InvCountOrderCompleted.vue b/src/views/inventory/InvCountOrderCompleted.vue
index e3fa4a3f..1db7e7d6 100644
--- a/src/views/inventory/InvCountOrderCompleted.vue
+++ b/src/views/inventory/InvCountOrderCompleted.vue
@@ -241,6 +241,7 @@ export default {
         })
         .catch(() => {
         });
+      this.getSpaceList();
     },
     getSpaceList() {
       let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};
diff --git a/src/views/inventory/InvCountOrderNew.vue b/src/views/inventory/InvCountOrderNew.vue
index 988bee6f..fffebbfd 100644
--- a/src/views/inventory/InvCountOrderNew.vue
+++ b/src/views/inventory/InvCountOrderNew.vue
@@ -227,6 +227,7 @@ export default {
         })
         .catch(() => {
         });
+      this.getSpaceList();
     },
     getSpaceList() {
       let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};