diff --git a/Code/Fe/src/components/commonTabel-drawer/index.vue b/Code/Fe/src/components/commonTabel-drawer/index.vue index 0690fd9..da24323 100644 --- a/Code/Fe/src/components/commonTabel-drawer/index.vue +++ b/Code/Fe/src/components/commonTabel-drawer/index.vue @@ -67,8 +67,9 @@ :tableColumns="tableColumns" :setUTableHeight="showDetailColumnsSet && showDetailFilters ? 300 : 260" @rowDrop="rowDrop" + :searchOverallCoverHeight="'calc(100vh - 345px)'" :rowSource="'detail_api'" - :totalCount="totalCount" + :totalCount="totalCountForDetail" :MaxResultCount="MaxResultCount" @sortChange="sortChangeForDetail" @alertoldSkipCount="alertoldSkipCountForDetail" @@ -387,6 +388,7 @@ export default { SkipCount: 0, MaxResultCount: 20, }, + totalCountForDetail:0, //明细-查看主表的连接id URLOption_masterId:allUrlOption[this.$route.name].masterId || 'masterId', //明细-列表 @@ -411,11 +413,12 @@ export default { value: data ? data.id : this.propsData.id }) } + this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount this.Loading.tableLoading = true getPageListForDetail(this.PageListParams,this.URLOption_detailList) .then(result => { this.propsData.details = result.items - this.totalCount = result.totalCount + this.totalCountForDetail = result.totalCount this.Loading.tableLoading = false if(successFn)successFn() }) diff --git a/Code/Fe/src/components/searchOverall/index.vue b/Code/Fe/src/components/searchOverall/index.vue index 2a2d7e9..ac881f9 100644 --- a/Code/Fe/src/components/searchOverall/index.vue +++ b/Code/Fe/src/components/searchOverall/index.vue @@ -10,7 +10,11 @@ class="border-outer" > -
+