Merge branch 'develop' into Nice

# Conflicts:
#	src/components/Dialogs/PopupPersonalNew.vue

src/components/Dialogs/PopupPersonalNew.vue

@@ -310,7 +310,12 @@ watch(modal, (newValue) => {
   <q-dialog v-model="modal" position="right" :maximized="true" persistent>
     <q-card style="width: 420px; overflow: visible">
       <q-toolbar>
-        <q-toolbar-title class="text-subtitle1 text-bold"
+        <q-toolbar-title
+          :class="
+            isLeave
+              ? 'text-subtitle1 text-bold text-red'
+              : 'text-subtitle1 text-bold'
+          "
           >ทะเบียนประวัติ{{ isLeave ? "ผู้พ้นจากราชการ" : "" }}
         </q-toolbar-title>
         <q-btn