แก้บัคทะเบียนประวัติ

src/modules/04_registry/components/Assessment.vue

@@ -44,8 +44,8 @@
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
               >
-            <q-tooltip>ประวัติแก้ไขผลการประเมินการปฏิบัติราชการ</q-tooltip>
+                <q-tooltip>ประวัติแก้ไขผลการประเมินการปฏิบัติราชการ</q-tooltip>
-            </q-btn>
+              </q-btn>
             </q-td>
           </q-tr>
         </template>
@@ -62,9 +62,7 @@
         />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
+          <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
             <div class="col-xs-12 col-sm-12 col-md-12">
               <datepicker
                 menu-class-name="modalfix"
@@ -626,7 +624,7 @@ const fetchData = async () => {
         messageError($q, e);
       })
       .finally(() => {
-        store.isLoad++
+        store.isLoad++;
       });
   }
 };
@@ -903,6 +901,7 @@ const clickEditRow = () => {
 const clickHistory = async (row: RequestItemsObject) => {
   tittleHistory.value = "ประวัติแก้ไขผลการประเมินการปฏิบัติราชการ";
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileAssessmentHisId(row.id))

src/modules/04_registry/components/Coin.vue

@@ -781,6 +781,7 @@ const clickHistory = async (row: RequestItemsObject) => {
       ? "ประวัติแก้ไขประกาศลูกจ้างดีเด่น"
       : "ประวัติแก้ไขประกาศเกียรติคุณ";
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileHonorHisId(row.id))

src/modules/04_registry/components/Discipline.vue

@@ -43,8 +43,8 @@
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
               >
-            <q-tooltip>ประวัติแก้ไขวินัย</q-tooltip>
+                <q-tooltip>ประวัติแก้ไขวินัย</q-tooltip>
-            </q-btn>
+              </q-btn>
             </q-td>
           </q-tr>
         </template>
@@ -58,9 +58,7 @@
         <DialogHeader tittle="วินัย" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
+          <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
-            class="row col-12  q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
@@ -617,7 +615,7 @@ const fetchData = async () => {
         messageError($q, e);
       })
       .finally(() => {
-        store.isLoad++
+        store.isLoad++;
       });
   }
 };
@@ -885,6 +883,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileDisHisId(row.id))

src/modules/04_registry/components/Education.vue

@@ -1495,6 +1495,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileEduHisId(row.id))

src/modules/04_registry/components/Information/top.vue

@@ -62,9 +62,9 @@
       >
         <q-tooltip>เพิ่มข้อมูล</q-tooltip>
       </q-btn>
-      <q-btn size="12px" flat round color="add" @click="add" :icon="iconAdd">
+      <!-- <q-btn size="12px" flat round color="add" @click="add" :icon="iconAdd">
         <q-tooltip>สรุปวันลา</q-tooltip>
-      </q-btn>
+      </q-btn> -->
     </div>
 
     <div class="q-pl-sm" v-else>

src/modules/04_registry/components/Insignia.vue

@@ -1279,6 +1279,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileInsignHisId(row.id))

src/modules/04_registry/components/Leave.vue

@@ -152,7 +152,7 @@
                 </template>
               </datepicker>
             </div>
-            <div class="col-xs-3 col-sm-3 col-md-3">
+            <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
                 :class="getClass(edit)"
                 :outlined="edit"
@@ -168,7 +168,7 @@
                 @update:modelValue="clickEditRow"
               />
             </div>
-            <div class="col-xs-3 col-sm-3 col-md-3">
+            <!-- <div class="col-xs-3 col-sm-3 col-md-3">
               <q-input
                 :class="getClass(false)"
                 :outlined="true"
@@ -184,7 +184,7 @@
                 :label="`${'จำนวนวันที่ลามาแล้ว'}`"
                 @update:modelValue="clickEditRow"
               />
-            </div>
+            </div> -->
             <div class="col-xs-6 col-sm-6 col-md-6">
               <selector
                 :class="getClass(edit)"
@@ -776,6 +776,7 @@ const filterSelector = (val: any, update: Function, filtername: string) => {
 
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileLeaveHisId(row.id))

src/modules/04_registry/components/Other.vue

@@ -570,6 +570,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileOtherHisId(row.id))

src/modules/04_registry/components/Record.vue

@@ -43,8 +43,10 @@
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
               >
-            <q-tooltip>ประวัติแก้ไขวันที่มิได้ปฏิบัติหน้าที่อยู่ในเขตที่ได้มีประกาศใช้กฎอัยการศึก</q-tooltip>
+                <q-tooltip
-            </q-btn>
+                  >ประวัติแก้ไขวันที่มิได้ปฏิบัติหน้าที่อยู่ในเขตที่ได้มีประกาศใช้กฎอัยการศึก</q-tooltip
+                >
+              </q-btn>
             </q-td>
           </q-tr>
         </template>
@@ -61,9 +63,7 @@
         />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
+          <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
@@ -507,7 +507,7 @@ const fetchData = async () => {
         messageError($q, e);
       })
       .finally(() => {
-        store.isLoad++
+        store.isLoad++;
       });
   }
 };
@@ -770,6 +770,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileNopaidHisId(row.id))

src/modules/04_registry/components/Salary.vue

@@ -2249,6 +2249,7 @@ const clickEditRowRef = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileSalaryHisId(row.id))

src/modules/04_registry/components/SalaryEmployee.vue

@@ -1989,6 +1989,7 @@ const clickEditRowRef = () => {
  */
 const clickHistory = async (row: RequestItemsEmployee) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileSalaryEmployeeHisId(row.id))

src/modules/04_registry/components/SalaryEmployeeTemp.vue

@@ -2017,6 +2017,7 @@ const clickEditRowRef = () => {
  */
 const clickHistory = async (row: RequestItemsEmployee) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileSalaryEmployeeHisId(row.id))

src/modules/04_registry/components/Talent.vue

@@ -37,9 +37,8 @@
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
               >
-            <q-tooltip>ประวัติแก้ไขความสามารถพิเศษ
+                <q-tooltip>ประวัติแก้ไขความสามารถพิเศษ </q-tooltip>
-</q-tooltip>
+              </q-btn>
-            </q-btn>
             </q-td>
           </q-tr>
         </template>
@@ -53,9 +52,7 @@
         <DialogHeader tittle="ความสามารถพิเศษ" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
+          <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
             <div class="col-6">
               <q-input
                 :class="getClass(edit)"
@@ -380,7 +377,7 @@ const fetchData = async () => {
         messageError($q, e);
       })
       .finally(() => {
-        store.isLoad++
+        store.isLoad++;
       });
   }
 };
@@ -636,6 +633,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileAbiliHisId(row.id))

src/modules/04_registry/components/Train.vue

@@ -1069,6 +1069,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileTrainHisId(row.id))

src/modules/04_registry/components/Work.vue

@@ -47,9 +47,8 @@
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
               >
-            <q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ
+                <q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ </q-tooltip>
-</q-tooltip>
+              </q-btn>
-            </q-btn>
             </q-td>
           </q-tr>
         </template>
@@ -63,9 +62,7 @@
         <DialogHeader tittle="ปฏิบัติราชการพิเศษ" :close="clickClose" />
         <q-separator />
         <q-card-section class="q-p-sm">
-          <div
+          <div class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs">
-            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
-          >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
                 menu-class-name="modalfix"
@@ -583,7 +580,7 @@ const fetchData = async () => {
         messageError($q, e);
       })
       .finally(() => {
-        store.isLoad++
+        store.isLoad++;
       });
   }
 };
@@ -851,6 +848,7 @@ const clickEditRow = () => {
  */
 const clickHistory = async (row: RequestItemsObject) => {
   modalHistory.value = true;
+  filterHistory.value = "";
   showLoader();
   await http
     .get(config.API.profileDutyHisId(row.id))