From 2c42d978f116fca80d32893d8f0a8a5d0cf7c17d Mon Sep 17 00:00:00 2001 From: "STW_TTTY\\stwtt" Date: Thu, 26 Sep 2024 13:51:13 +0700 Subject: [PATCH 1/2] no message --- .../05_placement/components/PersonalList/PersonalListPage.vue | 3 +-- src/modules/05_placement/store.ts | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/05_placement/components/PersonalList/PersonalListPage.vue b/src/modules/05_placement/components/PersonalList/PersonalListPage.vue index ea93f23ab..aee589448 100644 --- a/src/modules/05_placement/components/PersonalList/PersonalListPage.vue +++ b/src/modules/05_placement/components/PersonalList/PersonalListPage.vue @@ -50,7 +50,7 @@ async function getStat() { contain: statCard.contain, disclaim: statCard.disclaim, }; - DataStore.checkLoad(1) + DataStore.checkLoad(1); }) .catch((e) => { messageError($q, e); @@ -65,7 +65,6 @@ async function fetchPlacementData() { .get(config.API.MainDetail(0)) .then(async (res) => { DataStore.DataMainOrig = await res.data.result; - DataStore.checkLoad(1) }) .catch((e) => { messageError($q, e); diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts index abb97afc1..f227a8934 100644 --- a/src/modules/05_placement/store.ts +++ b/src/modules/05_placement/store.ts @@ -188,7 +188,8 @@ export const usePlacementDataStore = defineStore("placement", () => { let count = 0; // ตัวแปรนับจำนวนค่าที่รับ function checkLoad(val: number) { count += val; - if (count >= 3) { + DataMainOrig.value.length == 0; + if (count >= 2) { hideLoader(); count = 0; } From c22dd56d19bf13e7f2f5a7ff0532540317edb375 Mon Sep 17 00:00:00 2001 From: "STW_TTTY\\stwtt" Date: Thu, 26 Sep 2024 13:58:30 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20disable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../05_placement/components/PersonalList/DialogOrders.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/05_placement/components/PersonalList/DialogOrders.vue b/src/modules/05_placement/components/PersonalList/DialogOrders.vue index 035135192..7f865df56 100644 --- a/src/modules/05_placement/components/PersonalList/DialogOrders.vue +++ b/src/modules/05_placement/components/PersonalList/DialogOrders.vue @@ -187,6 +187,7 @@ function saveOrder() { function filterSelectOrder() { const data = props.rows ? props.rows : []; + selected.value = []; rows.value = data.filter((v: any) => { switch (commandType.value) { case "C-PM-01": @@ -327,6 +328,7 @@ watch( keep-color color="primary" dense + :disable="commandType" v-model="scope.selected" /> @@ -337,6 +339,7 @@ watch( keep-color color="primary" dense + :disable="commandType" v-model="props.selected" />