From 12023546f7577a84f2574c6ddfbab6f5e394fcf3 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 16:09:07 +0800 Subject: [PATCH] =?UTF-8?q?bug=E9=97=AE=E9=A2=98=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 | 3 ++- Code/Fe/src/components/filterForDetailPage/index.vue | 2 +- Code/Fe/src/components/tablePagination/index.vue | 2 +- Code/Fe/src/components/umyTable/index.vue | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Code/Fe/src/components/commonTabel-drawer/index.vue b/Code/Fe/src/components/commonTabel-drawer/index.vue index da24323..0fabe3d 100644 --- a/Code/Fe/src/components/commonTabel-drawer/index.vue +++ b/Code/Fe/src/components/commonTabel-drawer/index.vue @@ -398,6 +398,7 @@ export default { methods: { // 明细列表 - 获取明细列表(后端分页) getDetailList(data,successFn,errorFn){ + if(data)this.PageListParams.condition.filters = [] // 获取明细分页信息 let _hasId = false this.PageListParams.condition.filters.forEach(item=>{ @@ -405,7 +406,7 @@ export default { _hasId = true } }) - if(!_hasId){ + if(!_hasId || data){ this.PageListParams.condition.filters.push({ logic: "And", column: this.URLOption_masterId, diff --git a/Code/Fe/src/components/filterForDetailPage/index.vue b/Code/Fe/src/components/filterForDetailPage/index.vue index 4fa0bbc..d98ad3d 100644 --- a/Code/Fe/src/components/filterForDetailPage/index.vue +++ b/Code/Fe/src/components/filterForDetailPage/index.vue @@ -162,7 +162,7 @@ props: { // 超出内容是否提示 showOverflowTooltip:{ type: Boolean, - default: true, + default: false, }, // 删除api diff --git a/Code/Fe/src/components/tablePagination/index.vue b/Code/Fe/src/components/tablePagination/index.vue index b861d2f..f850392 100644 --- a/Code/Fe/src/components/tablePagination/index.vue +++ b/Code/Fe/src/components/tablePagination/index.vue @@ -101,7 +101,7 @@ export default { // 超出内容是否提示 showOverflowTooltip:{ type: Boolean, - default: true, + default: false, }, // 显示搜索配置 quicklySearchOption:{ diff --git a/Code/Fe/src/components/umyTable/index.vue b/Code/Fe/src/components/umyTable/index.vue index 9b0ccab..1a4beb5 100644 --- a/Code/Fe/src/components/umyTable/index.vue +++ b/Code/Fe/src/components/umyTable/index.vue @@ -449,7 +449,7 @@ export default { // 超出内容是否提示 showOverflowTooltip:{ type: Boolean, - default: true, + default: false, }, // table是否有border tableBorder: {