From 7fcd4968c55a013fb70d381bbe82fe8e81908b7c Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Mon, 28 Oct 2024 17:04:55 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../02_users/views/03_permissionsView.vue     | 22 +++++++++++++++++--
 .../02_users/views/04_roleOrganization.vue    | 10 +++++++--
 .../02_users/views/05_responsIbilities.vue    | 22 +++++++++++++++++--
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/src/modules/02_users/views/03_permissionsView.vue b/src/modules/02_users/views/03_permissionsView.vue
index 7c8090dc..0f81ecd2 100644
--- a/src/modules/02_users/views/03_permissionsView.vue
+++ b/src/modules/02_users/views/03_permissionsView.vue
@@ -470,8 +470,26 @@ onMounted(() => {
                           class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
                         >
                           <div>
-                            <div class="text-weight-medium">
-                              {{ prop.node.orgTreeName }}
+                            <div
+                              :class="
+                                prop.node.isOfficer
+                                  ? 'text-weight-medium text-blue'
+                                  : 'text-weight-medium'
+                              "
+                            >
+                              <div
+                                v-if="
+                                  prop.node.isDeputy == true &&
+                                  prop.node.orgLevel == 0
+                                "
+                                class="text-info"
+                              >
+                                {{ prop.node.orgTreeName }}
+                              </div>
+                              <div v-else>
+                                {{ prop.node.orgTreeName }}
+                              </div>
+                              {{ prop.node.isOfficer ? "(สกจ.)" : "" }}
                             </div>
                             <div class="text-weight-light text-grey-8">
                               {{
diff --git a/src/modules/02_users/views/04_roleOrganization.vue b/src/modules/02_users/views/04_roleOrganization.vue
index 85812836..ec09d354 100644
--- a/src/modules/02_users/views/04_roleOrganization.vue
+++ b/src/modules/02_users/views/04_roleOrganization.vue
@@ -260,7 +260,13 @@ onMounted(async () => {
                 @click.stop="selectedOrg(prop.node.id)"
               >
                 <div>
-                  <div class="text-weight-medium">
+                  <div
+                    v-if="prop.node.isDeputy == true"
+                    class="text-info text-weight-medium"
+                  >
+                    {{ prop.node.orgRootName }}
+                  </div>
+                  <div v-else class="text-weight-medium">
                     {{ prop.node.orgRootName }}
                   </div>
                   <div class="text-weight-light text-grey-8">
@@ -436,7 +442,7 @@ onMounted(async () => {
 <style scoped>
 .tree-container {
   overflow: auto;
-  height: 74vh;
+  height: 70vh;
   border: 1px solid #e6e6e7;
   border-radius: 10px;
 }
diff --git a/src/modules/02_users/views/05_responsIbilities.vue b/src/modules/02_users/views/05_responsIbilities.vue
index d2164ac5..3f6b1524 100644
--- a/src/modules/02_users/views/05_responsIbilities.vue
+++ b/src/modules/02_users/views/05_responsIbilities.vue
@@ -407,8 +407,26 @@ onMounted(() => {
                           class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
                         >
                           <div>
-                            <div class="text-weight-medium">
-                              {{ prop.node.orgTreeName }}
+                            <div
+                              :class="
+                                prop.node.isOfficer
+                                  ? 'text-weight-medium text-blue'
+                                  : 'text-weight-medium'
+                              "
+                            >
+                              <div
+                                v-if="
+                                  prop.node.isDeputy == true &&
+                                  prop.node.orgLevel == 0
+                                "
+                                class="text-info"
+                              >
+                                {{ prop.node.orgTreeName }}
+                              </div>
+                              <div v-else>
+                                {{ prop.node.orgTreeName }}
+                              </div>
+                              {{ prop.node.isOfficer ? "(สกจ.)" : "" }}
                             </div>
                             <div class="text-weight-light text-grey-8">
                               {{