From 52931b33493f47ff390ea2ba746e0264a0f06f14 Mon Sep 17 00:00:00 2001 From: gaoluyang <2820782392@qq.com> Date: 星期一, 03 三月 2025 15:33:10 +0800 Subject: [PATCH] 路由调整 --- src/components/Table/lims-table.vue | 9 ++++++--- src/views/business/productOrder/index.vue | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue index abe65a0..dcfa7cc 100644 --- a/src/components/Table/lims-table.vue +++ b/src/components/Table/lims-table.vue @@ -13,8 +13,7 @@ :filter-method="item.filterHandler" :filter-multiple="item.filterMultiple" :filtered-value="item.filteredValue" :filters="item.filters" :fixed="item.fixed" :label="item.label" :min-width="item.minWidth" :prop="item.prop" :show-overflow-tooltip="item.dataType === 'action' || item.dataType === 'slot' ? false : true" - :sortable="item.sortable ? true : false" :type="item.type" :width="item.dataType === 'action' ? getWidth(item.operation) : item.width - " align="center"> + :sortable="item.sortable ? true : false" :type="item.type" :width="item.dataType === 'action' ? getWidth(item.operation) : item.width" align="center"> <!-- <div class="123" v-if="item.type == ''"> --> <template v-if="item.hasOwnProperty('colunmTemplate')" :slot="item.colunmTemplate" slot-scope="scope"> <slot v-if="item.theadSlot" :index="index" :name="item.theadSlot" :row="scope.row" /> @@ -266,7 +265,11 @@ getWidth(row) { let count = 0; row.forEach((a) => { - count += a.name.length; + if (a.showHide!==undefined && a.showHide()) { + count += a.name.length; + } else if(!a.showHide) { + count += a.name.length; + } }); return count * 15 + 70 + "px"; }, diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue index 135973f..8fd2812 100644 --- a/src/views/business/productOrder/index.vue +++ b/src/views/business/productOrder/index.vue @@ -64,7 +64,7 @@ <div class="table"> <lims-table :tableData="tableData" :column="column" :isSelection="true" :handleSelectionChange="selectMethod" - @pagination="pagination" :height="'calc(100vh - 280px)'" key="tableData" + @pagination="pagination" :height="'calc(100vh - 280px)'" :key="upIndex" :page="page" :tableLoading="tableLoading"></lims-table> </div> <div> @@ -329,6 +329,7 @@ orderType: '', state: '', }, + upIndex: 0, tableData: [], tableLoading: false, column: [ @@ -753,6 +754,7 @@ const params = {...this.entity, state: this.tabList[this.tabIndex].value} this.tableLoading = true selectInsOrderParameter(params).then(res => { + this.upIndex++ this.tableLoading = false if (res.code === 200) { this.tableData = res.data.records -- Gitblit v1.9.3