ปรับ fe sprint2

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

@@ -25,6 +25,18 @@
             :label="`${'สังกัด'}`"
           />
         </div>
+        <div class="col-xs-6 col-sm-3 col-md-3">
+          <q-input
+            :class="getClass(false)"
+            hide-bottom-space
+            dense
+            lazy-rules
+            readonly
+            borderless
+            :model-value="govermentData.numberId"
+            :label="`${'ตำแหน่งเลขที่'}`"
+          />
+        </div>
         <div class="col-xs-6 col-sm-3 col-md-3">
           <q-input
             :class="getClass(false)"
@@ -45,8 +57,8 @@
             lazy-rules
             readonly
             borderless
-            :model-value="govermentData.numberId"
-            :label="`${'เลขที่ตำแหน่ง'}`"
+            :model-value="govermentData.positionPathSide"
+            :label="`${'ด้าน/สาขา'}`"
           />
         </div>
         <div class="col-xs-6 col-sm-3 col-md-3">
@@ -57,7 +69,7 @@
             lazy-rules
             readonly
             borderless
-            :model-value="govermentData.workId"
+            :model-value="govermentData.positionLine"
             :label="`${'สายงาน'}`"
           />
         </div>
@@ -69,7 +81,7 @@
             lazy-rules
             readonly
             borderless
-            :model-value="govermentData.typeId"
+            :model-value="govermentData.positionType"
             :label="`${'ประเภท'}`"
           />
         </div>
@@ -81,7 +93,7 @@
             lazy-rules
             readonly
             borderless
-            :model-value="govermentData.levelId"
+            :model-value="govermentData.positionLevel"
             :label="`${'ระดับ'}`"
           />
         </div>
@@ -93,10 +105,22 @@
             lazy-rules
             readonly
             borderless
-            :model-value="govermentData.businessId"
+            :model-value="govermentData.positionExecutive"
             :label="`${'ตำแหน่งทางการบริหาร'}`"
           />
         </div>
+        <div class="col-xs-6 col-sm-3 col-md-3">
+          <q-input
+            :class="getClass(false)"
+            hide-bottom-space
+            dense
+            lazy-rules
+            readonly
+            borderless
+            :model-value="govermentData.positionExecutiveSide"
+            :label="`${'ด้านตำแหน่งทางการบริหาร'}`"
+          />
+        </div>
         <div class="col-12 q-py-md"><q-separator /></div>
         <div class="col-xs-6 col-sm-3 col-md-3">
           <datepicker
@@ -125,8 +149,8 @@
                 :readonly="!edit"
                 :borderless="!edit"
                 :model-value="date2Thai(new Date(govermentData.containDate))"
-                :rules="[(val) => !!val || `${'กรุณาเลือก วันที่สั่งบรรจุ'}`]"
-                :label="`${'วันที่สั่งบรรจุ'}`"
+                :rules="[(val) => !!val || `${'กรุณาเลือก วันที่บรรจุ'}`]"
+                :label="`${'วันที่บรรจุ'}`"
               >
                 <template v-slot:prepend>
                   <q-icon
@@ -306,11 +330,6 @@ const props = defineProps({
     type: Boolean,
     required: true,
   },
-
-  notiNoEdit: {
-    type: Function,
-    default: () => console.log("not function"),
-  },
 });
 const emit = defineEmits(["update:statusEdit"]);
 
@@ -319,8 +338,7 @@ const $q = useQuasar();
 const dataStore = useDataStore();
 const { loaderPage } = dataStore;
 const mixin = useCounterMixin();
-const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
-  mixin;
+const { date2Thai, success, dateToISO, messageError } = mixin;
 const profileStore = useProfileDataStore();
 const { birthDate, retireText } = storeToRefs(profileStore);
 const edit = ref<boolean>(false);
@@ -343,10 +361,21 @@ const columnsHistory = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
-    name: "position",
+    name: "positionPathSide",
     align: "left",
     label: "ตำแหน่ง",
     sortable: true,
+    field: "positionPathSide",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
+  {
+    name: "position",
+    align: "left",
+    label: "ด้าน/สาขา",
+    sortable: true,
     field: "position",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -356,7 +385,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
   {
     name: "posNo",
     align: "left",
-    label: "เลขที่ตำแหน่ง",
+    label: "ตำแหน่งเลขที่",
     sortable: true,
     field: "posNo",
     headerStyle: "font-size: 14px",
@@ -408,10 +437,21 @@ const columnsHistory = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
+  {
+    name: "positionExecutiveSide",
+    align: "left",
+    label: "ด้านทางการบริหาร",
+    sortable: true,
+    field: "positionExecutiveSide",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    sort: (a: string, b: string) =>
+      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+  },
   {
     name: "dateAppoint",
     align: "left",
-    label: "วันที่สั่งบรรจุ",
+    label: "วันที่บรรจุ",
     sortable: true,
     field: "dateAppoint",
     headerStyle: "font-size: 14px",
@@ -511,11 +551,13 @@ const columnsHistory = ref<QTableProps["columns"]>([
 const visibleColumnsHistory = ref<String[]>([
   "oc",
   "position",
+  "positionPathSide",
   "posNo",
   "positionLine",
   "positionType",
   "positionLevel",
   "positionexecutive",
+  "positionExecutiveSide",
   "dateAppoint",
   "dateStart",
   "retireDate",
@@ -541,18 +583,20 @@ watch(retireText, async () => {
 });
 
 const fetchData = async () => {
-  showLoader();
+  loaderPage(true);
   await http
     .get(config.API.profileGovId(route.params.id.toString()))
     .then((res) => {
       const data: ResponseObject = res.data.result;
       govermentData.value.ocId = data.oc;
       govermentData.value.positionId = data.position;
-      govermentData.value.workId = data.work;
-      govermentData.value.typeId = data.type;
-      govermentData.value.levelId = data.level;
+      govermentData.value.positionPathSide = data.positionPathSide;
+      govermentData.value.positionLine = data.positionLine;
+      govermentData.value.positionType = data.positionType;
+      govermentData.value.positionLevel = data.positionLevel;
       govermentData.value.numberId = data.posNo;
-      govermentData.value.businessId = data.business;
+      govermentData.value.positionExecutive = data.positionExecutive;
+      govermentData.value.positionExecutiveSide = data.positionExecutiveSide;
       govermentData.value.containDate = new Date(data.dateAppoint);
       govermentData.value.workDate = new Date(data.dateStart);
       govermentData.value.retireDate = data.retireDate;
@@ -565,7 +609,7 @@ const fetchData = async () => {
       messageError($q, e);
     })
     .finally(async () => {
-      hideLoader();
+      loaderPage(false);
     });
 };
 
@@ -575,27 +619,13 @@ const refreshData = async () => {
 };
 
 const editData = async () => {
-  showLoader();
-  const body: ResponseObject = {
-    oc: govermentData.value.ocId,
-    business: govermentData.value.businessId,
-    dateAppoint: dateToISO(govermentData.value.containDate),
-    dateStart: dateToISO(govermentData.value.workDate),
-    govAge: govermentData.value.ageAll,
-    govAgeAbsent: govermentData.value.absent,
-    govAgePlus: govermentData.value.age,
-    level: govermentData.value.levelId,
-    posNo: govermentData.value.numberId,
-    position: govermentData.value.positionId,
-    retireDate: govermentData.value.retireDate,
-    type: govermentData.value.typeId,
-    work: govermentData.value.workId,
-    reasonSameDate: govermentData.value.reasonSameDate,
-    createdAt: new Date(),
-    createdFullName: "-",
-  };
+  loaderPage(true);
   await http
-    .put(config.API.profileGovId(route.params.id.toString()), body)
+    .put(config.API.profileGovId(route.params.id.toString()), {
+      dateAppoint: dateToISO(govermentData.value.containDate),
+      dateStart: dateToISO(govermentData.value.workDate),
+      reasonSameDate: govermentData.value.reasonSameDate,
+    })
     .then((res) => {
       success($q, "บันทึกข้อมูลสำเร็จ");
     })
@@ -624,7 +654,7 @@ const handleDate = async (modelData: Date) => {
 };
 
 const fetchCalAgeGov = async (date: Date) => {
-  showLoader();
+  loaderPage(true);
   const body = {
     dateAppoint: date,
   };
@@ -638,7 +668,7 @@ const fetchCalAgeGov = async (date: Date) => {
       messageError($q, e);
     })
     .finally(async () => {
-      hideLoader();
+      loaderPage(false);
     });
 };
 
@@ -647,7 +677,7 @@ const fetchCalAgeGov = async (date: Date) => {
  */
 const clickHistory = async () => {
   modalHistory.value = true;
-  showLoader();
+  loaderPage(true);
   await http
     .get(config.API.profileGovHisId(route.params.id.toString()))
     .then((res) => {
@@ -657,11 +687,13 @@ const clickHistory = async () => {
         rowsHistory.value.push({
           oc: e.oc,
           position: e.position,
+          positionPathSide: e.positionPathSide,
           posNo: e.posNo,
           positionLine: e.positionLine,
           positionType: e.positionType,
           positionLevel: e.positionLevel,
           positionExecutive: e.positionExecutive,
+          positionExecutiveSide: e.positionExecutiveSide,
           dateAppoint: new Date(e.dateAppoint),
           dateStart: new Date(e.dateStart),
           retireDate: e.retireDate,
@@ -678,7 +710,7 @@ const clickHistory = async () => {
       messageError($q, e);
     })
     .finally(() => {
-      hideLoader();
+      loaderPage(false);
     });
 };
 
@@ -686,7 +718,6 @@ const changeBtn = async () => {
   if (edit.value == true) {
     if (props.statusEdit === true) {
       edit.value = false;
-      props.notiNoEdit();
     } else {
       emit("update:statusEdit", true);
     }