Merge remote-tracking branch 'origin/busUser' into busUser

# Conflicts:
#	src/views/inventory/DialogInvProduct.vue
#	src/views/thrsys/ThrOrdedrReceiveAdd.vue

src/views/inventory/DialogInvProduct.vue

@@ -71,7 +71,6 @@
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
             :total="total"
-            :current-page="filterQuery.page"
         ></el-pagination>
     </div>
 </template>
@@ -102,7 +101,7 @@ export default {
             type: Function,
             required: true,
         },
-        invQueryData: {
+        invQueryData:{
             type: Object,
             required: true,
         }
@@ -331,13 +330,13 @@ export default {
     created() {
         this.getBusType();
         let query = this.$route.query;
-
-        this.filterQuery = Object.assign(this.filterQuery, query);
-
-
         this.filterQuery.invStorageCode = this.invQueryData.locStorageCode;
         this.filterQuery.invWarehouseCode = this.invQueryData.invWarehouseCode;
+        this.filterQuery = Object.assign(this.filterQuery, query);
         this.filterQuery.limit = parseInt(this.filterQuery.limit);
+        if (!isBlank(this.invQueryData.corpId)) {
+            this.filterQuery.supId = this.invQueryData.corpId;
+        }
         // 加载表格数据
         this.getList();
     },

src/views/thrsys/ThrOrdedrReceiveAdd.vue

@@ -74,6 +74,7 @@
                 <el-table-column label="往来单位ID" prop="corpId"></el-table-column>
                 <el-table-column label="往来单位" prop="corpName"
                                  show-overflow-tooltip="true"></el-table-column>
+                <!--                <el-table-column label="单据状态" prop="billFlag"></el-table-column>-->
                 <el-table-column label="单据日期" prop="billdate"></el-table-column>
                 <el-table-column label="操作" fixed="right">
                     <template slot-scope="scope">