updated retirement field

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

@@ -6,7 +6,6 @@ import DialogFooter from "@/modules/05_placement/components/PersonalList/DialogF
 import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
 import { useCounterMixin } from "@/stores/mixin";
 import { useRetirementDataStore } from "@/modules/06_retirement/store";
-import CurrencyInput from "@/components/CurruncyInput.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import axios from "axios";
@@ -306,7 +305,7 @@ const onSubmitConditions = () => {
     showLoader();
     http
       .put(config.API.resignConditions(id.value), {
-        IsNoDebt: checkboxGroup.value[0] ? true : false,
+        isNoDebt: checkboxGroup.value[0] ? true : false,
       })
       .then(() => {
         fetchData(id.value);
@@ -549,65 +548,6 @@ function removeFile(fileName: string) {
 
   <CardProfile :data="dataProfile as DataProfile" />
 
-  <!-- <q-card bordered class="row col-12 text-dark">
-    <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
-      <div class="q-pl-sm text-weight-bold text-subtitle2">
-        {{ dataDetail.firstName + "  " + dataDetail.lastName }}
-      </div>
-      <q-space />
-      <q-btn
-        outline
-        color="blue"
-        dense
-        icon-right="mdi-open-in-new"
-        class="q-px-sm"
-        label="ดูข้อมูลทะเบียนประวัติ"
-        @click="onclickViewinfo(dataDetail.profileId)"
-      />
-    </div>
-    <div class="col-12"><q-separator /></div>
-    <div class="row col-12 q-pa-md">
-      <div class="col-12 row bg-white q-col-gutter-md">
-        <div class="col-xs-3 col-sm-2 col-md-1 row">
-          <q-img :src="avatar" v-if="avatar !== '' && avatar !== null" />
-          <q-img src="@/assets/avatar_user.jpg" v-else />
-        </div>
-        <div class="col-xs-6 col-sm-3 row items-center">
-          <div class="col-12 q-pl-md">
-            <div class="col-12 text-top">ตำแหน่งในสายงาน</div>
-            <div class="col-12 text-detail">
-              {{ dataDetail.positionTypeOld }}
-            </div>
-          </div>
-        </div>
-        <div class="col-xs-6 col-sm-2 row items-center">
-          <div class="col-12">
-            <div class="col-12 text-top">ระดับ</div>
-            <div class="col-12 text-detail">
-              {{ dataDetail.positionLevelOld }}
-            </div>
-          </div>
-        </div>
-        <div class="col-xs-6 col-sm-3 row items-center">
-          <div class="col-12">
-            <div class="col-12 text-top">สังกัด</div>
-            <div class="col-12 text-detail">
-              {{ dataDetail.organizationPositionOld }}
-            </div>
-          </div>
-        </div>
-        <div class="col-xs-6 col-sm-3 row items-center">
-          <div class="col-12">
-            <div class="col-12 text-top">สถานะ</div>
-            <div class="col-12 text-detail">
-              {{ statusText(dataDetail.status) }}
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </q-card> -->
-
   <q-card bordered class="row col-12 text-dark q-mt-sm">
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
       <div class="q-pl-sm text-weight-bold text-dark">ข้อมูลการลาออก</div>
@@ -615,14 +555,14 @@ function removeFile(fileName: string) {
       <div
         class="q-gutter-x-sm"
         v-if="
+          (roleUser === 'officer' && dataDetail.officerReject === null) ||
           (roleUser === 'commander' &&
             dataDetail.commanderReject === null &&
-            dataDetail.officerReject === null) ||
+            dataDetail.officerReject !== null) ||
           (roleUser === 'oligarch' &&
             dataDetail.oligarchReject === null &&
             dataDetail.commanderReject !== null &&
-            dataDetail.officerReject === null) ||
-          (roleUser === 'officer' && dataDetail.officerReject === null)
+            dataDetail.officerReject !== null)
         "
       >
         <q-btn
@@ -1122,9 +1062,9 @@ function removeFile(fileName: string) {
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="organizationPositionOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัด'}`]"
+                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัดเดิม'}`]"
                 hide-bottom-space
-                :label="`${'ตำแหน่ง/สังกัด'}`"
+                :label="`${'ตำแหน่ง/สังกัดเดิม'}`"
                 type="textarea"
               />
             </div>
@@ -1139,9 +1079,9 @@ function removeFile(fileName: string) {
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="positionTypeOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกประเภทตำแหน่ง'}`]"
+                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
                 hide-bottom-space
-                :label="`${'ประเภทตำแหน่ง'}`"
+                :label="`${'ตำแหน่งประเภท'}`"
               />
             </div>
           </div>
@@ -1155,9 +1095,9 @@ function removeFile(fileName: string) {
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="positionLevelOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกระดับ'}`]"
+                :rules="[(val) => !!val || `${'กรุณากรอกระดับตำแหน่ง'}`]"
                 hide-bottom-space
-                :label="`${'ระดับ'}`"
+                :label="`${'ระดับตำแหน่ง'}`"
               />
             </div>
           </div>
@@ -1179,13 +1119,19 @@ function removeFile(fileName: string) {
           </div>
           <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
-              <CurrencyInput
+              <q-input
                 v-model="salary"
-                :edit="edit"
-                :options="{
-                  currency: 'THB',
-                }"
+                :outlined="edit"
+                dense
+                :readonly="!edit"
+                :borderless="!edit"
+                hide-bottom-space
                 :label="`${'เงินเดือน'}`"
+                :rules="[(val:number) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
+                lazy-rules
+                class="inputgreen"
+                mask="###,###,###,###"
+                reverse-fill-mask
               />
             </div>
           </div>