Merge branch 'develop' into devTee

src/modules/06_retirement/components/ExitInterview/EditQuestion.vue

@@ -177,8 +177,8 @@ const getData = async () => {
   showLoader();
   await http
     .get(config.API.questionExitInterview())
-    .then((res: any) => {
+    .then(async (res) => {
-      const data = res.data.result;
+      const data = await res.data.result;
       question1Score.value = data.question1Score ?? 0;
       question2Score.value = data.question2Score ?? 0;
       question3Score.value = data.question3Score ?? 0;
@@ -269,14 +269,15 @@ const putData = () => {
   showLoader();
   http
     .put(config.API.questionExitInterview(), body)
-    .then((res) => {
+    .then(() => {
+      router.push(`/retirement/exit-interview`);
       success($q, "บันทึกข้อมูลสำเร็จ");
     })
     .catch((e) => {
       messageError($q, e);
     })
-    .finally(async () => {
+    .finally(() => {
-      router.push(`/retirement/exit-interview`);
+      hideLoader();
     });
 };
 </script>

src/modules/06_retirement/components/ExitInterview/exitMain.vue

@@ -170,8 +170,8 @@ const fecthlist = async () => {
   showLoader();
   await http
     .get(config.API.listExitInterview())
-    .then((res: any) => {
+    .then(async (res) => {
-      const data = res.data.result;
+      const data = await res.data.result;
       let list: ResponseItems[] = [];
       data.map((r: ResponseItems) => {
         list.push({
@@ -215,7 +215,8 @@ const saveAppoint = async () => {
         showLoader();
         await http
           .put(config.API.AppointInterview(id.value), body)
-          .then((res: any) => {
+          .then(async () => {
+            await fecthlist();
             success($q, "วันนัดหมายเพื่อทําการสัมภาษณ์การลาออกสำเร็จ");
             closeModal();
           })
@@ -223,7 +224,6 @@ const saveAppoint = async () => {
             messageError($q, e);
           })
           .finally(async () => {
-            await fecthlist();
             hideLoader();
           });
       });
@@ -378,7 +378,10 @@ const openModalCalendar = (rows: any) => {
                     <q-tooltip>รายละเอียด</q-tooltip>
                   </q-btn>
                   <q-btn
-                  v-if="checkPermission($route)?.attrIsGet && checkPermission($route)?.attrIsUpdate"
+                    v-if="
+                      checkPermission($route)?.attrIsGet &&
+                      checkPermission($route)?.attrIsUpdate
+                    "
                     flat
                     dense
                     round
@@ -393,7 +396,11 @@ const openModalCalendar = (rows: any) => {
                     <q-tooltip>แก้ไขข้อมูล</q-tooltip>
                   </q-btn>
                   <q-btn
-                    v-if="!props.row.appointDate && checkPermission($route)?.attrIsGet && checkPermission($route)?.attrIsUpdate"
+                    v-if="
+                      !props.row.appointDate &&
+                      checkPermission($route)?.attrIsGet &&
+                      checkPermission($route)?.attrIsUpdate
+                    "
                     icon="mdi-calendar"
                     color="blue-7"
                     flat
@@ -407,63 +414,36 @@ const openModalCalendar = (rows: any) => {
                 <q-td key="no" :props="props">
                   {{ props.rowIndex + 1 }}
                 </q-td>
-                <q-td
+                <q-td key="fullname" :props="props">
-                  key="fullname"
-                  :props="props"
-                >
                   {{ props.row.fullname }}
                 </q-td>
-                <q-td
+                <q-td key="realReason" :props="props">
-                  key="realReason"
-                  :props="props"
-                >
                   {{ props.row.realReason }}
                 </q-td>
-                <q-td
+                <q-td key="notExitFactor" :props="props">
-                  key="notExitFactor"
-                  :props="props"
-                >
                   {{ props.row.notExitFactor }}
                 </q-td>
-                <q-td
+                <q-td key="futureWork" :props="props">
-                  key="futureWork"
-                  :props="props"
-                >
                   {{ props.row.futureWork ? "ใช่" : "ไม่" }}
                 </q-td>
-                <q-td
+                <q-td key="futureWorkReason" :props="props">
-                  key="futureWorkReason"
-                  :props="props"
-                >
                   {{ props.row.futureWorkReason }}
                 </q-td>
-                <q-td
+                <q-td key="havejob" :props="props">
-                  key="havejob"
-                  :props="props"
-                >
                   {{ props.row.havejob ? "ใช่" : "ไม่" }}
                 </q-td>
 
-                <q-td
+                <q-td key="havejobReason" :props="props">
-                  key="havejobReason"
-                  :props="props"
-                >
                   <div class="table_ellipsis">
                     {{ props.row.havejobReason }}
                   </div>
                 </q-td>
-                <q-td
+                <q-td key="appointDate" :props="props">
-                  key="appointDate"
-                  :props="props"
-                >
                   {{
                     props.row.appointDate == null ? "-" : props.row.appointDate
                   }}
                 </q-td>
-                <q-td
+                <q-td key="datetext" :props="props">
-                  key="datetext"
-                  :props="props"
-                >
                   {{ props.row.datetext }}
                 </q-td>
               </q-tr>

src/modules/06_retirement/components/resign/DetailDeceased.vue

@@ -101,13 +101,13 @@ const fileDownload = async (type: string) => {
       class="q-mr-sm"
       @click="router.push(`/retirement/deceased`)"
     />
-    รายละเอียดบันทึกเวียนแจ้งการถึงแก่กรรม {{ fullName }}
+    รายละเอียดบันทึกเวียนแจ้งการถึงแก่กรรม{{ fullName }}
   </div>
 
   <CardProfile :data="dataProfile as DataProfile" />
 
-  <q-card bordered class="row col-12 text-dark q-mt-sm">
+  <q-card bordered class="q-mt-sm">
-    <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+    <div class="bg-grey-1 q-pa-sm col-12 row items-center">
       <div class="q-pl-sm text-weight-bold text-dark">ข้อมูลการถึงแก่กรรม</div>
       <q-space />
       <div class="q-gutter-x-sm">
@@ -132,8 +132,8 @@ const fileDownload = async (type: string) => {
       </div>
     </div>
     <div class="col-12"><q-separator /></div>
-    <div class="row col-12 q-pa-md">
+    <q-card-section>
-      <div class="col-12 row bg-white q-col-gutter-md">
+      <div class="col-12 row q-col-gutter-md">
         <div class="col-xs-6 col-sm-3 row items-center">
           <div class="col-12">
             <div class="col-12 text-top">เลขที่ใบมรณบัตร</div>
@@ -179,18 +179,16 @@ const fileDownload = async (type: string) => {
           </div>
         </div>
       </div>
-
+    </q-card-section>
-      <div class="col-12" v-if="checkPermission($route)?.attrIsUpdate">
+    <q-separator />
-        <div class="row">
+    <q-card-actions align="right">
-          <q-space />
+      <q-btn
-          <q-btn
+        v-if="checkPermission($route)?.attrIsUpdate"
-            color="public"
+        color="public"
-            label="ส่งหนังสือเวียน"
+        label="ส่งหนังสือเวียน"
-            @click="openDeceased(profileId)"
+        @click="openDeceased(profileId)"
-          />
+      />
-        </div>
+    </q-card-actions>
-      </div>
-    </div>
   </q-card>
 </template>