Merge branch 'develop' into devTee

src/modules/01_masterdata/components/Indicators/indicatorByPlan/IndicatorByPlan.vue

@@ -327,6 +327,7 @@ onMounted(async () => {
               emit-value
               :readonly="checkRoute"
               class="inputgreen"
+              clearable
             />
           </div>
           <div class="col-4">

src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue

@@ -365,6 +365,7 @@ onMounted(() => {
               input-class="text-red"
               label="รอบการประเมิน"
               class="inputgreen"
+              clearable
             />
           </div>
           <div class="col-2" v-if="id">

src/modules/03_recruiting/views/03_editor/index.vue

@@ -562,7 +562,7 @@ async function sendDataAbout() {
 async function fetchProvince() {
   showLoader();
   await http
-    .get(config.API.province)
+    .get(config.API.orgProvince)
     .then((res) => {
       const data = res.data.result;
       let option: DataOption[] = [];
@@ -587,9 +587,9 @@ async function fetchDistrict(id: string | null) {
   if (id !== null && id != "") {
     showLoader();
     await http
-      .get(config.API.listDistrict(id))
+      .get(config.API.orgProvince + `/${id}`)
       .then((res) => {
-        const data = res.data.result;
+        const data = res.data.result.districts;
         let option: DataOption[] = [];
         data.map((r: any) => {
           option.push({ id: r.id.toString(), name: r.name.toString() });
@@ -613,9 +613,9 @@ async function fetchSubDistrict(id: string | null) {
   if (id !== null && id != "") {
     showLoader();
     await http
-      .get(config.API.listSubDistrict(id))
+      .get(config.API.orgDistrict + `/${id}`)
       .then((res) => {
-        const data = res.data.result;
+        const data = res.data.result.subDistricts;
         let option: zipCodeOption[] = [];
         data.map((r: any) => {
           option.push({

src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue

@@ -301,7 +301,7 @@ const historyColumns = ref<QTableProps["columns"]>([
     sortable: true,
     field: "endDate",
     format(val, row) {
-      row.isDate
+      return row.isDate
         ? date2Thai(row.endDate)
         : new Date(row.endDate).getFullYear() + 543;
     },

src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue

@@ -677,7 +677,6 @@ onMounted(() => {
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
                 <span class="text-weight-medium">{{ col.label }}</span>
               </q-th>
-              <q-th auto-width />
             </q-tr>
           </template>
           <template v-slot:body="props" v-if="mode === 'table'">
@@ -685,7 +684,6 @@ onMounted(() => {
               <q-td v-for="col in props.cols" :key="col.id">
                 <div>{{ col.value ? col.value : "-" }}</div>
               </q-td>
-              <q-td auto-width> </q-td>
             </q-tr>
           </template>
         </d-table>

src/modules/04_registryPerson/views/detailView.vue

@@ -497,6 +497,11 @@ function appointPost() {
  */
 function clickPassaway() {
   dialogPassaway.value = true;
+  filePassaway.value = null;
+  deathCertificateNo.value = "";
+  dateDeath.value = new Date();
+  placeDeathCertificate.value = "";
+  reasonDeath.value = "";
 }
 
 /**
@@ -1003,7 +1008,7 @@ onMounted(async () => {
         <q-separator />
         <q-card-section class="q-pa-md row q-col-gutter-sm">
           <q-file
-            class="col-12 col-sm-6 col-md-5"
+            class="col-12 col-sm-6 col-md-5 inputgreen"
             outlined
             dense
             v-model="filePassaway"
@@ -1018,7 +1023,7 @@ onMounted(async () => {
             </template>
           </q-file>
           <q-input
-            class="col-12 col-sm-6 col-md-7"
+            class="col-12 col-sm-6 col-md-7 inputgreen"
             dense
             outlined
             v-model="deathCertificateNo"
@@ -1026,7 +1031,7 @@ onMounted(async () => {
           />
 
           <datepicker
-            class="col-12 col-sm-6 col-md-5"
+            class="col-12 col-sm-6 col-md-5 inputgreen"
             menu-class-name="modalfix"
             v-model="dateDeath"
             :locale="'th'"
@@ -1064,14 +1069,14 @@ onMounted(async () => {
           </datepicker>
 
           <q-input
-            class="col-12 col-sm-6 col-md-7"
+            class="col-12 col-sm-6 col-md-7 inputgreen"
             dense
             outlined
             v-model="placeDeathCertificate"
             label="สถานที่ออกใบมรณบัตร"
           />
           <q-input
-            class="col-12"
+            class="col-12 inputgreen"
             dense
             outlined
             v-model="reasonDeath"
@@ -1083,11 +1088,8 @@ onMounted(async () => {
         <q-separator />
         <q-card-actions align="right">
           <q-btn
-            unelevated
             label="บันทึก"
-            dense
             color="public"
-            class="q-px-md"
             @click="clickSaveDeceased"
             :disable="
               filePassaway === null ||