From d043396010fec9f763490f734b00b39b7541fe0f Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 2 Dec 2024 13:41:32 +0700 Subject: [PATCH] =?UTF-8?q?fix=20filter=20=E0=B8=97=E0=B8=94=E0=B8=A5?= =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../05_placement/components/probation/DialogOrder.vue | 2 +- .../probation/DialogOrder/DialogSendToCommand.vue | 2 +- .../components/probation/FormAppoint/FormAppoint.vue | 2 +- .../05_placement/components/probation/MainAppoint.vue | 2 +- .../05_placement/components/probation/MainProbation.vue | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/05_placement/components/probation/DialogOrder.vue b/src/modules/05_placement/components/probation/DialogOrder.vue index 8f1735150..5af556315 100644 --- a/src/modules/05_placement/components/probation/DialogOrder.vue +++ b/src/modules/05_placement/components/probation/DialogOrder.vue @@ -201,7 +201,7 @@ async function getList() { commandType.value ? (commandType.value == "C-PM-11" ? 2 : 3) : "" }&page=${pagination.value.page}&pageSize=${ pagination.value.rowsPerPage - }&keyword=${filter.value}` + }&keyword=${filter.value.trim()}` ) .then(async (res) => { const data = await res.data.result.data; diff --git a/src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue b/src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue index 8a924175f..5464124b1 100644 --- a/src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue +++ b/src/modules/05_placement/components/probation/DialogOrder/DialogSendToCommand.vue @@ -179,7 +179,7 @@ watchEffect(() => { { const data = await res.data.result.data; diff --git a/src/modules/05_placement/components/probation/MainAppoint.vue b/src/modules/05_placement/components/probation/MainAppoint.vue index 0653421ca..1e9e3c6c3 100644 --- a/src/modules/05_placement/components/probation/MainAppoint.vue +++ b/src/modules/05_placement/components/probation/MainAppoint.vue @@ -214,7 +214,7 @@ onMounted(async () => { ref="table" :columns="columns" :rows="rows" - :filter="filterKeyword" + :filter="filterKeyword.trim()" row-key="Order" flat :visible-columns="visibleColumns" diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue index f714f0964..e0ae168f0 100644 --- a/src/modules/05_placement/components/probation/MainProbation.vue +++ b/src/modules/05_placement/components/probation/MainProbation.vue @@ -246,9 +246,9 @@ async function getpersonalList() { config.API.probationPersonalList() + `?status=${!fillter.value ? "" : fillter.value}&page=${ pagination.value.page - }&pageSize=${pagination.value.rowsPerPage}&keyword=${ - filterKeyword.value - }` + }&pageSize=${ + pagination.value.rowsPerPage + }&keyword=${filterKeyword.value.trim()}` ) .then(async (res) => { const data = await res.data.result.data;