Merge remote-tracking branch 'origin/master'

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();

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();

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();

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">
@@ -259,6 +259,7 @@ export default {
         })
         .catch(() => {
         });
+      this.getSpaceList();
     },
     getSpaceList() {
       let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};

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>
 
@@ -241,6 +241,7 @@ export default {
         })
         .catch(() => {
         });
+      this.getSpaceList();
     },
     getSpaceList() {
       let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};

src/views/inventory/InvCountOrderNew.vue

@@ -227,6 +227,7 @@ export default {
         })
         .catch(() => {
         });
+      this.getSpaceList();
     },
     getSpaceList() {
       let params = {invWarehouseCode: this.filterQuery.invCode, status: 1};