From af3c6ba6e6ae0f1b80d8cc37534629d35a9dec9a Mon Sep 17 00:00:00 2001 From: liufumingren Date: Fri, 26 Jun 2026 17:14:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E9=94=AE=E8=99=9A?= =?UTF-8?q?=E6=8B=9F=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/BindReceivingToEntryDialog.vue | 11 ++- src/views/storage/entry/entry-config.ts | 2 +- src/views/storage/entry/index.vue | 94 ++++++++----------- 3 files changed, 49 insertions(+), 58 deletions(-) diff --git a/src/views/storage/entry/component/BindReceivingToEntryDialog.vue b/src/views/storage/entry/component/BindReceivingToEntryDialog.vue index c51ea9e3..1b870030 100644 --- a/src/views/storage/entry/component/BindReceivingToEntryDialog.vue +++ b/src/views/storage/entry/component/BindReceivingToEntryDialog.vue @@ -635,7 +635,7 @@ async function loadReceivingList() { receivingListLoading.value = true try { - const res = await getReceivingList({ + const params: Record = { pagination: { page: pagination.currentPage, pageSize: pagination.pageSize }, filterDepleted: true, where: { @@ -643,7 +643,14 @@ async function loadReceivingList() { is_review: { operator: 'eq', value: 1, type: 'number' }, storage_status: { operator: 'in', value: ['none', 'partial'], type: 'text' }, }, - }) + } + + // 传入入库单 ID,按商品交集过滤,只拉取有交集产品的收货单 + if (entryOrderId.value) { + params.entry_order_id = entryOrderId.value + } + + const res = await getReceivingList(params) if (!isApiSuccess(res)) { receivingList.value = [] pagination.total = 0 diff --git a/src/views/storage/entry/entry-config.ts b/src/views/storage/entry/entry-config.ts index 3227a409..ccb92f00 100644 --- a/src/views/storage/entry/entry-config.ts +++ b/src/views/storage/entry/entry-config.ts @@ -211,7 +211,7 @@ export const entryColums = [ { prop: 'remark',label:'备注',width:'160' }, // { prop: '',label:'',width:'160',fixed: 'left' }, // { prop: '',label:'',width:'160',fixed: 'left' }, - { prop: 'row_action', label: '操作', width: '80', fixed: 'right' }, + { prop: 'row_action', label: '操作', width: '300', fixed: 'right' }, ] const entryInventoryTypeLabelMap: Record = { diff --git a/src/views/storage/entry/index.vue b/src/views/storage/entry/index.vue index 2f768eeb..be99e5d4 100644 --- a/src/views/storage/entry/index.vue +++ b/src/views/storage/entry/index.vue @@ -19,14 +19,6 @@
刷新 - - 快捷直入 - 完成入库 批量作废 @@ -55,6 +47,7 @@ default-align="center" table-id="storage-entry-list" :enable-column-config="true" + :column-config-schema-version="2" :data="list" :columns="columns" :table-size="tableSize" @@ -117,6 +110,15 @@