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/loc/locDetl/index.vue | 65 +++++++++++++++++++++++--------- 1 files changed, 47 insertions(+), 18 deletions(-) diff --git a/zy-asrs-admin/src/views/loc/locDetl/index.vue b/zy-asrs-admin/src/views/loc/locDetl/index.vue index 4c50d66..d15f07e 100644 --- a/zy-asrs-admin/src/views/loc/locDetl/index.vue +++ b/zy-asrs-admin/src/views/loc/locDetl/index.vue @@ -15,6 +15,12 @@ let currentPage = 1; let pageSize = 10; const searchInput = ref("") +const searchParam = ref({ + locNo: null, + matnr: null, + orderNo: null, + batch: null, +}) const editChild = ref(null) const state = reactive({ @@ -48,13 +54,13 @@ }; state.columns = [ - { - title: formatMessage('db.man_loc_detl.loc_id', '搴撲綅'), - dataIndex: 'locId$', - width: 140, - ellipsis: true, - ...getColumnSearchProps('locId$'), - }, + // { + // title: formatMessage('db.man_loc_detl.loc_id', '搴撲綅'), + // dataIndex: 'locId$', + // width: 140, + // ellipsis: true, + // ...getColumnSearchProps('locId$'), + // }, { title: formatMessage('db.man_loc_detl.loc_no', '搴撲綅鍙�'), dataIndex: 'locNo', @@ -96,6 +102,13 @@ width: 140, ellipsis: true, ...getColumnSearchProps('anfme'), + }, + { + title: formatMessage('db.man_loc_detl.freeze', '鏄惁鍐荤粨'), + dataIndex: 'freeze$', + width: 140, + ellipsis: true, + ...getColumnSearchProps('freeze$'), }, { title: formatMessage('db.man_loc_detl.status', '鐘舵��'), @@ -162,13 +175,13 @@ }) }) - tmp.push({ - title: formatMessage('common.operation', '鎿嶄綔'), - name: 'oper', - dataIndex: 'oper', - key: 'oper', - width: 140, - }) + // tmp.push({ + // title: formatMessage('common.operation', '鎿嶄綔'), + // name: 'oper', + // dataIndex: 'oper', + // key: 'oper', + // width: 140, + // }) state.columns = tmp; } else if (result.code === 401) { @@ -184,7 +197,8 @@ post('/api/locDetl/page', { current: currentPage, pageSize: pageSize, - condition: searchInput.value + condition: searchInput.value, + _param: searchParam.value, }).then((resp) => { let result = resp.data; if (result.code == 200) { @@ -233,7 +247,10 @@ } const handleExport = async (intl) => { - postBlob('/api/locDetl/export', {}).then(result => { + postBlob('/api/locDetl/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; @@ -267,8 +284,20 @@ <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.locDetl.locNo.input', '璇疯緭鍏ュ簱浣嶅彿')" + style="width: 140px;margin-right: 10px;" /> + <a-input v-model:value="searchParam.matnr" :placeholder="formatMessage('page.locDetl.matnr.input', '璇疯緭鍏ュ晢鍝佺紪鍙�')" + style="width: 140px;margin-right: 10px;" /> + <a-input v-model:value="searchParam.orderNo" + :placeholder="formatMessage('page.locDetl.orderNo.input', '璇疯緭鍏ヨ鍗曞彿')" + style="width: 140px;margin-right: 10px;" /> + <a-input v-model:value="searchParam.batch" :placeholder="formatMessage('page.locDetl.batch.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> -- Gitblit v1.9.1