diff --git a/web-admin/src/api/storage-release-review.ts b/web-admin/src/api/storage-release-review.ts index 17ffaf9d..162b7cc9 100644 --- a/web-admin/src/api/storage-release-review.ts +++ b/web-admin/src/api/storage-release-review.ts @@ -146,6 +146,7 @@ export function fetchStorageReleaseReviewList(params?: { keyword?: string reviewPhase?: 'pending' | 'reviewed' qcWorkOrderCompleted?: boolean + readyForReviewOnly?: 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 88da41d7..95bf2ac0 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 @@ -26,15 +26,7 @@
-
+
- - - - -
+
重置 @@ -410,19 +400,12 @@ { 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: '', - qcWorkOrderCompleted: 'true' as '' | 'true' | 'false' + showAllPending: false }) const tableData = ref([]) const selectedRows = ref([]) @@ -444,12 +427,8 @@ 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 readyOnly = + activeTab.value === 'pending' && !searchForm.showAllPending ? true : undefined const res = await fetchStorageReleaseReviewList({ page: pagination.page, pageSize: pagination.pageSize, @@ -458,7 +437,7 @@ storageStatus: searchForm.storageStatus || undefined, keyword: searchForm.keyword || undefined, reviewPhase: activeTab.value, - qcWorkOrderCompleted: qcParam + readyForReviewOnly: readyOnly }) tableData.value = res.list || [] pagination.total = res.total ?? 0 @@ -473,7 +452,7 @@ pagination.page = 1 selectedRows.value = [] if (name === 'pending') { - searchForm.qcWorkOrderCompleted = 'true' + searchForm.showAllPending = false } loadData() } @@ -488,7 +467,7 @@ searchForm.reviewConclusion = '' searchForm.storageStatus = '' searchForm.keyword = '' - searchForm.qcWorkOrderCompleted = 'true' + searchForm.showAllPending = false pagination.page = 1 loadData() } @@ -565,16 +544,42 @@