From c97bbc7a78cd386dd78afa526f67a20810dd84a6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 24 Jul 2024 16:58:07 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=81=E0=B8=B3=E0=B8=AB=E0=B8=99=E0=B8=94?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B4=E0=B8=97=E0=B8=98=E0=B8=B4=E0=B9=8C=20=3D>?=
 =?UTF-8?q?=20=E0=B8=9A=E0=B8=97=E0=B8=9A=E0=B8=B2=E0=B8=97=E0=B8=97?=
 =?UTF-8?q?=E0=B8=B5=E0=B9=88=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81?=
 =?UTF-8?q?=E0=B9=84=E0=B8=9B=E0=B9=81=E0=B8=A5=E0=B9=89=E0=B8=A7=E0=B9=84?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=88=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../02_users/components/Permissions/DialogAdd.vue   | 13 ++++++++++---
 src/modules/02_users/views/permissionsView.vue      | 10 +++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/modules/02_users/components/Permissions/DialogAdd.vue b/src/modules/02_users/components/Permissions/DialogAdd.vue
index 10c87a95..21cc041e 100644
--- a/src/modules/02_users/components/Permissions/DialogAdd.vue
+++ b/src/modules/02_users/components/Permissions/DialogAdd.vue
@@ -79,6 +79,12 @@ function fetchListRoles() {
     .then((res) => {
       const data = res.data.result;
       rows.value = data;
+      const findRole = data.find(
+        (e: Roles) => e.id === props.dataPosMaster.authRoleId
+      );
+      if (findRole) {
+        selected.value.push(findRole);
+      }
     })
     .catch((err) => {
       messageError($q, err);
@@ -100,13 +106,14 @@ function onSubmit() {
           authRoleId: arrayId[0],
           posMasterId: props.dataPosMaster.id,
         })
-        .then(() => {
-          closeDialog();
-          props.fetchDataTable(
+        .then(async () => {
+          await props.fetchDataTable(
             reqMaster.value.id,
             reqMaster.value.revisionId,
             reqMaster.value.type
           );
+          await success($q, "บันทึกข้อมูลสำเร็จ");
+          await closeDialog();
         })
         .catch((err) => {
           messageError($q, err);
diff --git a/src/modules/02_users/views/permissionsView.vue b/src/modules/02_users/views/permissionsView.vue
index be8355c5..ef500ae1 100644
--- a/src/modules/02_users/views/permissionsView.vue
+++ b/src/modules/02_users/views/permissionsView.vue
@@ -321,9 +321,13 @@ function onDeleteRole(id: string) {
           authRoleId: "",
           posMasterId: id,
         })
-        .then(() => {
-          fetchDataTable(reqMaster.id, reqMaster.revisionId, reqMaster.type);
-          success($q, "ลบข้อมูลสำเร็จ");
+        .then(async () => {
+          await fetchDataTable(
+            reqMaster.id,
+            reqMaster.revisionId,
+            reqMaster.type
+          );
+          await success($q, "ลบข้อมูลสำเร็จ");
         })
         .catch((err) => {
           messageError($q, err);