From 406f25dd584d5194d9dedfa7beceea0664eea29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 18 Jul 2023 15:25:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=AD=9B=E9=80=89bug?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/Fe/src/components/commonTabel-drawer/index.vue   |  7 +++++--
 Code/Fe/src/components/searchOverall/index.vue        | 11 ++++++++++-
 Code/Fe/src/components/searchOverall/style/index.scss |  4 ++--
 Code/Fe/src/components/tablePagination/index.vue      |  6 ++++++
 4 files changed, 23 insertions(+), 5 deletions(-)

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" 
   >
     <!-- 整体背景遮罩 -->
-    <div v-if="isShow && isShowMoreList" class="fullPageCover"></div>
+    <div 
+      v-if="isShow && isShowMoreList" 
+      class="fullPageCover"
+      :style="{height:searchOverallCoverHeight}"
+    ></div>
     <div class="title" v-if="isShowMoreList">高级筛选</div>
     <!-- 普通筛选界面 -->
     <searchPrimary
@@ -233,6 +237,11 @@ export default {
     }
   },
   props: {
+    // 筛选遮罩高度
+    searchOverallCoverHeight:{
+      type: String,
+      default: 'calc(100vh - 200px)'
+    },
     // 禁用选择条件
     disabledAction:{
       type: Boolean,
diff --git a/Code/Fe/src/components/searchOverall/style/index.scss b/Code/Fe/src/components/searchOverall/style/index.scss
index 963723f..3a04134 100644
--- a/Code/Fe/src/components/searchOverall/style/index.scss
+++ b/Code/Fe/src/components/searchOverall/style/index.scss
@@ -17,7 +17,7 @@
     background: rgba(255, 255, 255, 0.2);
     left: 0;
     right: 0;
-    height: calc(100vh - 200px);
+    // height: calc(100vh - 200px);
     cursor: no-drop;
   }
 
@@ -31,7 +31,7 @@
     //  flex-direction: column;
     //  width: 100%;
     //  height: 100%;
-     max-height: 50vh;
+     max-height: 30vh;
      overflow: auto;
   
      .el-form {
diff --git a/Code/Fe/src/components/tablePagination/index.vue b/Code/Fe/src/components/tablePagination/index.vue
index d36d219..b861d2f 100644
--- a/Code/Fe/src/components/tablePagination/index.vue
+++ b/Code/Fe/src/components/tablePagination/index.vue
@@ -16,6 +16,7 @@
     <!-- 全面搜索（普通+高级整合） -->
     <searchOverall
       ref="searchOverallRef"
+      :searchOverallCoverHeight="searchOverallCoverHeight"
       :showSearchOverall="showSearchOverall"
       @getShowSearchOverall="getShowSearchOverall"
       :primarySearchOption="primarySearchOption"
@@ -87,6 +88,11 @@ export default {
     rowDrop
   },
   props: {
+    // 筛选高度
+    searchOverallCoverHeight:{
+      type: String,
+      default: 'calc(100vh - 200px)'
+    },
     // 已app-main高度为100%  需要减掉的高度
     setUTableHeight: {
       type: Number,