diff --git a/web-admin/src/api/storage-release-review.ts b/web-admin/src/api/storage-release-review.ts index 4250ca14..17ffaf9d 100644 --- a/web-admin/src/api/storage-release-review.ts +++ b/web-admin/src/api/storage-release-review.ts @@ -145,6 +145,7 @@ export function fetchStorageReleaseReviewList(params?: { storageStatus?: string keyword?: string reviewPhase?: 'pending' | 'reviewed' + qcWorkOrderCompleted?: boolean }) { return request.get>({ url: '/web/admin/storage-release-reviews', diff --git a/web-admin/src/views/quality-inspection/storage-release-review/index.vue b/web-admin/src/views/quality-inspection/storage-release-review/index.vue index 66de8564..0b90d91b 100644 --- a/web-admin/src/views/quality-inspection/storage-release-review/index.vue +++ b/web-admin/src/views/quality-inspection/storage-release-review/index.vue @@ -79,6 +79,20 @@ /> + + + + +
@@ -386,11 +400,19 @@ { value: 'yrk', label: '已入库' } ] + /** '' = 全部;'true'/'false' 避免 el-select 对 boolean 的歧义 */ + const qcWorkOrderCompletedOptions = [ + { value: 'true', label: '是' }, + { value: 'false', label: '否' }, + { value: '', label: '全部' } + ] + const searchForm = reactive({ receptionSource: '', reviewConclusion: '', storageStatus: '', - keyword: '' + keyword: '', + qcWorkOrderCompleted: 'true' as '' | 'true' | 'false' }) const tableData = ref([]) const selectedRows = ref([]) @@ -412,6 +434,12 @@ async function loadData() { loading.value = true try { + const qcParam = + activeTab.value === 'pending' && searchForm.qcWorkOrderCompleted === 'true' + ? true + : activeTab.value === 'pending' && searchForm.qcWorkOrderCompleted === 'false' + ? false + : undefined const res = await fetchStorageReleaseReviewList({ page: pagination.page, pageSize: pagination.pageSize, @@ -419,7 +447,8 @@ reviewConclusion: searchForm.reviewConclusion || undefined, storageStatus: searchForm.storageStatus || undefined, keyword: searchForm.keyword || undefined, - reviewPhase: activeTab.value + reviewPhase: activeTab.value, + qcWorkOrderCompleted: qcParam }) tableData.value = res.list || [] pagination.total = res.total ?? 0 @@ -433,6 +462,9 @@ activeTab.value = name pagination.page = 1 selectedRows.value = [] + if (name === 'pending') { + searchForm.qcWorkOrderCompleted = 'true' + } loadData() } @@ -446,6 +478,7 @@ searchForm.reviewConclusion = '' searchForm.storageStatus = '' searchForm.keyword = '' + searchForm.qcWorkOrderCompleted = 'true' pagination.page = 1 loadData() }