From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 14 二月 2025 10:08:32 +0800 Subject: [PATCH] # --- zy-asrs-admin/src/views/base/loc/index.vue | 50 ++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 40 insertions(+), 10 deletions(-) diff --git a/zy-asrs-admin/src/views/base/loc/index.vue b/zy-asrs-admin/src/views/base/loc/index.vue index 6aea9fc..e3cb67b 100644 --- a/zy-asrs-admin/src/views/base/loc/index.vue +++ b/zy-asrs-admin/src/views/base/loc/index.vue @@ -15,7 +15,19 @@ let currentPage = 1; let pageSize = 10; const searchInput = ref("") +const searchParam = ref({ + locNo: null, + row1: null, + bay1: null, + lev1: null, + barcode: null, +}) const editChild = ref(null) + +const state = reactive({ + selectedRowKeys: [], + loading: false, +}); let tableData = ref([]); getPage(); @@ -134,10 +146,7 @@ }, ]; -const state = reactive({ - selectedRowKeys: [], - loading: false, -}); + const hasSelected = computed(() => state.selectedRowKeys.length > 0); const start = () => { state.loading = true; @@ -153,15 +162,19 @@ }; function getPage() { + state.loading = true; post('/api/loc/page', { current: currentPage, pageSize: pageSize, - condition: searchInput.value + condition: searchInput.value, + _param: searchParam.value, }).then((resp) => { let result = resp.data; if (result.code == 200) { let data = result.data; tableData.value = data; + + state.loading = false; } else if (result.code === 401) { message.error(result.msg); logout() @@ -203,7 +216,10 @@ } const handleExport = async (intl) => { - postBlob('/api/loc/export', {}).then(result => { + postBlob('/api/loc/export', { + condition: searchInput.value, + _param: searchParam.value, + }).then(result => { const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' }); window.location.href = window.URL.createObjectURL(blob); return true; @@ -229,7 +245,7 @@ <script> export default { - name: '搴撲綅' + name: '搴撲綅绠$悊' } </script> @@ -237,8 +253,21 @@ <div> <EditView ref="editChild" @tableReload="handleTableReload" /> <div class="table-header"> - <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')" - style="width: 200px;" @search="onSearch" /> + <div> + <a-input v-model:value="searchParam.locNo" :placeholder="formatMessage('page.loc.locNo.input', '璇疯緭鍏ュ簱浣嶅彿')" + style="width: 140px;margin-right: 10px;" /> + <a-input v-model:value="searchParam.row1" :placeholder="formatMessage('page.loc.row1.input', '璇疯緭鍏ユ帓')" + style="width: 140px;margin-right: 10px;" /> + <a-input v-model:value="searchParam.bay1" :placeholder="formatMessage('page.loc.bay1.input', '璇疯緭鍏ュ垪')" + style="width: 140px;margin-right: 10px;" /> + <a-input v-model:value="searchParam.lev1" :placeholder="formatMessage('page.loc.lev1.input', '璇疯緭鍏ュ眰')" + style="width: 140px;margin-right: 10px;" /> + <a-input v-model:value="searchParam.barcode" :placeholder="formatMessage('page.loc.barcode.input', '璇疯緭鍏ユ潯鐮�')" + style="width: 140px;margin-right: 10px;" /> + + <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')" + style="width: 200px;" @search="onSearch" /> + </div> <div class="table-header-right"> <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button> <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button> @@ -247,7 +276,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