From 3411c92ad5bb920469edaa49aced7cc04fe1c6f1 Mon Sep 17 00:00:00 2001 From: ck-chenkang Date: Thu, 18 Jun 2026 15:00:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=AB=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/equipmentMaintenance/index.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pages_function/pages/equipmentMaintenance/index.vue b/src/pages_function/pages/equipmentMaintenance/index.vue index 33e1989..be1046e 100644 --- a/src/pages_function/pages/equipmentMaintenance/index.vue +++ b/src/pages_function/pages/equipmentMaintenance/index.vue @@ -244,11 +244,13 @@ async function fetchList(reset) { try { const keyword = searchKeyword.value.trim() + const machineryId = parseMachineryIdKeyword(keyword) const params = { pageNo: pageNo.value, pageSize: pageSize.value, - repairCode: keyword || undefined, - machineryCode: keyword || undefined, + repairCode: machineryId ? undefined : keyword || undefined, + machineryCode: machineryId ? undefined : keyword || undefined, + machineryId: machineryId || undefined, deviceLine: selectedLineId.value === '' ? undefined : selectedLineId.value, repairStatus: selectedStatus.value === '' ? undefined : selectedStatus.value } @@ -266,6 +268,11 @@ async function fetchList(reset) { } } +function parseMachineryIdKeyword(keyword) { + const match = String(keyword || '').trim().match(/-(\d+)$/) + return match ? Number(match[1]) : undefined +} + function onFetchResult(result) { const data = result || { list: [], total: 0 } if (pageNo.value === 1) {