diff --git a/src/views/inventory/DialogInvProduct.vue b/src/views/inventory/DialogInvProduct.vue index bbc4ab2..f3965a1 100644 --- a/src/views/inventory/DialogInvProduct.vue +++ b/src/views/inventory/DialogInvProduct.vue @@ -71,7 +71,6 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" - :current-page="filterQuery.page" > @@ -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(); }, diff --git a/src/views/thrsys/ThrOrdedrReceiveAdd.vue b/src/views/thrsys/ThrOrdedrReceiveAdd.vue index a50f295..da6b460 100644 --- a/src/views/thrsys/ThrOrdedrReceiveAdd.vue +++ b/src/views/thrsys/ThrOrdedrReceiveAdd.vue @@ -74,6 +74,7 @@ +