Merge branch 'develop' of github.com:Frappet/BMA-EHR-USER into develop

src/components/Workflow/Main.vue

@@ -161,7 +161,6 @@ defineExpose({
                         >{{
                           `${item.prefix}${item.firstName} ${item.lastName}`
                         }}
-                        <!-- {{ `(${item.position})` }} -->
                       </q-item-label>
                       <q-item-label caption lines="2">{{
                         item.isReasonSetting ? item.reason : ""
@@ -169,19 +168,23 @@ defineExpose({
                     </q-item-section>
 
                     <q-item-section side top>
-                      <q-item-label class="text-green">
+                      <q-item-label
+                        :class="!item.isApprove ? 'text-red' : 'text-green'"
+                      >
                         {{
                           item.isAcceptSetting
                             ? item.isAccept
                               ? "รับทราบ"
                               : ""
                             : item.isApproveSetting
-                            ? item.isApprove
-                              ? "อนุมันติ"
+                            ? item.isApprove === true
+                              ? "อนุมัติ"
+                              : item.isApprove === false
+                              ? "ไม่อนุมัติ"
                               : ""
                             : ""
-                        }}</q-item-label
-                      >
+                        }}
+                      </q-item-label>
                     </q-item-section>
                   </q-item>
                 </q-list>