From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期三, 25 九月 2024 15:02:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev --- zy-asrs-admin/src/views/in/waitPakin/index.vue | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/zy-asrs-admin/src/views/in/waitPakin/index.vue b/zy-asrs-admin/src/views/in/waitPakin/index.vue index 7e601a0..798f10b 100644 --- a/zy-asrs-admin/src/views/in/waitPakin/index.vue +++ b/zy-asrs-admin/src/views/in/waitPakin/index.vue @@ -23,6 +23,12 @@ let currentPage = 1; let pageSize = 10; const searchInput = ref("") +const searchParam = ref({ + orderNo: null, + barcode: null, + matnr: null, + batch: null, +}) const editChild = ref(null) const generateTaskChild = ref(null) @@ -63,17 +69,17 @@ }, { title: formatMessage('db.man_wait_pakin.matnr', '鍟嗗搧缂栧彿'), - dataIndex: ['detl$', 'mat$', 'matnr'], + dataIndex: 'matnr', width: 140, ellipsis: true, - ...getColumnSearchProps('detl$.matnr'), + ...getColumnSearchProps('matnr'), }, { title: formatMessage('db.man_wait_pakin.batch', '鎵瑰彿'), - dataIndex: ['detl$', 'batch'], + dataIndex: 'batch', width: 140, ellipsis: true, - ...getColumnSearchProps('detl$.matnr'), + ...getColumnSearchProps('batch'), }, { title: formatMessage('db.man_wait_pakin.anfme', '缁勬墭鏁伴噺'), @@ -161,7 +167,8 @@ post('/api/waitPakin/page', { current: currentPage, pageSize: pageSize, - condition: searchInput.value + condition: searchInput.value, + _param: searchParam.value, }).then((resp) => { let result = resp.data; if (result.code == 200) { @@ -287,8 +294,22 @@ <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.orderNo" + :placeholder="formatMessage('page.waitPakin.orderNo.input', '璇疯緭鍏ヨ鍗曠紪鍙�')" + style="width: 140px;margin-right: 10px;" /> + <a-input v-model:value="searchParam.barcode" + :placeholder="formatMessage('page.waitPakin.barcode.input', '璇疯緭鍏ユ墭鐩樼爜')" + style="width: 140px;margin-right: 10px;" /> + <a-input v-model:value="searchParam.matnr" + :placeholder="formatMessage('page.waitPakin.matnr.input', '璇疯緭鍏ュ晢鍝佺紪鍙�')" + style="width: 140px;margin-right: 10px;" /> + <a-input v-model:value="searchParam.batch" :placeholder="formatMessage('page.waitPakin.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-dropdown> <template #overlay> -- Gitblit v1.9.1