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/out/waveSeed/index.vue | 64 +++++++++++++++++++++++++++----- 1 files changed, 54 insertions(+), 10 deletions(-) diff --git a/zy-asrs-admin/src/views/out/waveSeed/index.vue b/zy-asrs-admin/src/views/out/waveSeed/index.vue index 3429c34..f44c9d0 100644 --- a/zy-asrs-admin/src/views/out/waveSeed/index.vue +++ b/zy-asrs-admin/src/views/out/waveSeed/index.vue @@ -15,6 +15,12 @@ let currentPage = 1; let pageSize = 10; const searchInput = ref("") +const searchParam = ref({ + siteNo: null, + orderNo: null, + matnr: null, + batch: null, +}) const editChild = ref(null) const state = reactive({ @@ -52,12 +58,26 @@ ...getColumnSearchProps('siteNo'), }, { - title: formatMessage('db.man_wave_seed.order_detl_id', '璁㈠崟鏄庣粏'), - dataIndex: 'orderDetlId$', + title: formatMessage('db.man_wave_seed.orderNo', '璁㈠崟缂栧彿'), + dataIndex: ['orderDetl$', 'orderNo'], width: 140, ellipsis: true, - ...getColumnSearchProps('orderDetlId$'), + ...getColumnSearchProps('orderNo'), }, + { + title: formatMessage('db.man_wave_seed.matnr', '鍟嗗搧缂栧彿'), + dataIndex: ['orderDetl$', 'mat$', 'matnr'], + width: 140, + ellipsis: true, + ...getColumnSearchProps('matnr'), + }, + // { + // title: formatMessage('db.man_wave_seed.order_detl_id', '璁㈠崟鏄庣粏'), + // dataIndex: 'orderDetlId$', + // width: 140, + // ellipsis: true, + // ...getColumnSearchProps('orderDetlId$'), + // }, { title: formatMessage('db.man_wave_seed.anfme', '鏁伴噺'), dataIndex: 'anfme', @@ -144,7 +164,8 @@ post('/api/waveSeed/page', { current: currentPage, pageSize: pageSize, - condition: searchInput.value + condition: searchInput.value, + _param: searchParam.value, }).then((resp) => { let result = resp.data; if (result.code == 200) { @@ -222,7 +243,19 @@ } const handleReviewOk = () => { - + post('/api/waveSeed/review', { + waveSeedId: reviewState.record.id, + reviewNum: reviewState.reviewNum, + }).then((resp) => { + let result = resp.data; + if (result.code === 200) { + message.success(result.msg); + reviewState.open = false; + handleTableReload() + } else { + message.error(result.msg); + } + }) } </script> @@ -237,8 +270,19 @@ <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.siteNo" :placeholder="formatMessage('page.waveSeed.siteNo.input', '璇疯緭鍏ョ珯鐐圭紪鍙�')" + style="width: 140px;margin-right: 10px;" /> + <a-input v-model:value="searchParam.orderNo" :placeholder="formatMessage('page.waveSeed.orderNo.input', '璇疯緭鍏ヨ鍗曠紪鍙�')" + style="width: 140px;margin-right: 10px;" /> + <a-input v-model:value="searchParam.matnr" :placeholder="formatMessage('page.waveSeed.matnr.input', '璇疯緭鍏ュ晢鍝佺紪鍙�')" + style="width: 140px;margin-right: 10px;" /> + <a-input v-model:value="searchParam.batch" :placeholder="formatMessage('page.waveSeed.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> @@ -263,11 +307,11 @@ </a-table> <a-modal v-model:open="reviewState.open" :title="formatMessage('page.review', '澶嶆牳')" @ok="handleReviewOk"> - <div> + <div style="margin-bottom: 20px;"> 鎾鏁伴噺锛歿{ reviewState.record.anfme }} </div> - <div> - 瀹為檯鏁伴噺锛�<a-input v-model:value="reviewState.reviewNum" /> + <div style="display: flex;justify-content: flex-start;align-items: center;"> + 瀹為檯鏁伴噺锛�<a-input-number v-model:value="reviewState.reviewNum" :min="1" :max="reviewState.record.anfme" /> </div> </a-modal> </div> -- Gitblit v1.9.1