From a54f85deb9d8c8778ec77ae115b8db4cabc934be Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期二, 10 九月 2024 15:24:29 +0800 Subject: [PATCH] # --- zy-asrs-admin/src/components/orderLog/index.vue | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/zy-asrs-admin/src/components/orderLog/index.vue b/zy-asrs-admin/src/components/orderLog/index.vue index a19313f..5290ed4 100644 --- a/zy-asrs-admin/src/components/orderLog/index.vue +++ b/zy-asrs-admin/src/components/orderLog/index.vue @@ -23,6 +23,11 @@ const editChild = ref(null) const showOrderDetlChild = ref(null) +const state = reactive({ + selectedRowKeys: [], + loading: false, +}); + let tableData = ref([]); getPage(); @@ -112,10 +117,7 @@ }, ]; -const state = reactive({ - selectedRowKeys: [], - loading: false, -}); + const hasSelected = computed(() => state.selectedRowKeys.length > 0); const start = () => { state.loading = true; @@ -131,6 +133,8 @@ }; function getPage() { + state.loading = true; + post(props.ioModel == 'in' ? '/api/orderLog/in/page' : '/api/orderLog/out/page', { current: currentPage, pageSize: pageSize, @@ -140,6 +144,8 @@ if (result.code == 200) { let data = result.data; tableData.value = data; + + state.loading = false; } else if (result.code === 401) { message.error(result.msg); logout() @@ -232,7 +238,8 @@ <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }" :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id" :pagination="{ total: tableData.total, onChange: onPageChange }" - :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn"> + :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn" + :loading="state.loading"> <template #bodyCell="{ column, text, record }"> <template v-if="column.dataIndex === 'oper'"> <div style="display: flex;justify-content: space-evenly;"> -- Gitblit v1.9.1