diff --git a/src/components/table/CnDataList.vue b/src/components/table/CnDataList.vue index 2d8ee620..443792b5 100644 --- a/src/components/table/CnDataList.vue +++ b/src/components/table/CnDataList.vue @@ -69,9 +69,6 @@ export default { tableId: { type: String }, - builtinId: { - type: Number - }, tableTitle: { type: Array }, @@ -99,8 +96,7 @@ export default { }, onsearch () { const params = { - q: this.keyWord, - id: this.builtinId + q: this.keyWord } this.$emit('search', params) } diff --git a/src/mixins/data-list.js b/src/mixins/data-list.js index ddbacd0f..fa20b9a4 100644 --- a/src/mixins/data-list.js +++ b/src/mixins/data-list.js @@ -76,8 +76,10 @@ export default { getTableData (params) { if (params) { this.searchLabel = { ...this.searchLabel, ...params } + } else { + this.searchLabel = {} } - this.searchLabel = { ...this.searchLabel, ...this.pageObj} + this.searchLabel = { ...this.searchLabel, ...this.pageObj } this.tools.loading = true delete this.searchLabel.total let listUrl = this.url diff --git a/src/views/report/builtinReport.vue b/src/views/report/builtinReport.vue index 3c8e0e02..fe5ff8e6 100644 --- a/src/views/report/builtinReport.vue +++ b/src/views/report/builtinReport.vue @@ -17,7 +17,6 @@ :tableId="tableId" v-model:custom-table-title="tools.customTableTitle" :api="url" - :builtinId="builtinId" :from="fromRoute.builtinReport" :layout="['search']" @search="search"