Merge branch 'develop' into devTee

2024-08-14 10:52:54 +07:00 · 2024-08-14 10:52:54 +07:00 · 6a6efd2564
commit 6a6efd2564
parent 879d6126c9 8a150642b5
25 changed files with 564 additions and 564 deletions
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
--- a/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue
+++ b/src/modules/01_masterdata/components/Indicators/Assignment/DetailView.vue
@ -115,7 +115,7 @@ onMounted(() => {
      color="primary"
      @click="router.go(-1)"
    />
-    รายละเอียดงานที่ได้รับมอบหมาย
+    รายละเอียดงานอื่นๆ ที่ได้รับมอบหมาย
  </div>
  <q-card flat>
    <q-card-section>
--- a/src/modules/01_masterdata/components/Indicators/Summary.vue
+++ b/src/modules/01_masterdata/components/Indicators/Summary.vue
@ -54,7 +54,7 @@ onMounted(() => {
 });
 </script>
 <template>
-  <q-card bordered class="q-mb-sm q-pa-xs bg-grey-1">
+  <q-card bordered class="q-pa-xs bg-grey-1">
    <div class="row q-col-gutter-sm">
      <div
        v-for="i in indicatorTotal"
--- a/src/modules/01_masterdata/views/Assignment.vue
+++ b/src/modules/01_masterdata/views/Assignment.vue
@ -13,7 +13,7 @@ import type {
 } from "@/modules/01_masterdata/interface/index/Main";
 import type { FormFilterAssignment } from "@/modules/01_masterdata/interface/request/Main";
 import type { ResAssignment } from "@/modules/01_masterdata/interface/response/Main";
-import IndicatorTotal from "@/modules/01_masterdata/components/Indicators/Summary.vue";
+import Summary from "@/modules/01_masterdata/components/Indicators/Summary.vue";

 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@ -174,12 +174,10 @@ onMounted(() => {
  <div class="toptitle text-dark col-12 row items-center">
    รายการงานอื่นๆ ที่ได้รับมอบหมาย
  </div>
+
+  <Summary />
+
  <q-card flat bordered class="q-pa-md">
-    <div class="row">
-      <div class="col-12">
-        <IndicatorTotal />
-      </div>
-    </div>
    <div class="row q-col-gutter-sm q-pl-sm">
      <q-toolbar style="padding: 0">
        <div class="row q-gutter-sm">
--- a/src/modules/01_masterdata/views/indicatorByPlan.vue
+++ b/src/modules/01_masterdata/views/indicatorByPlan.vue
@ -8,7 +8,7 @@ import config from "@/app.config";

 import type { DataOption } from "@/modules/01_masterdata/interface/index/Main";
 import DialogHistory from "@/modules/01_masterdata/components/Indicators/DialogHistory.vue";
-import IndicatorTotal from "@/modules/01_masterdata/components/Indicators/Summary.vue";
+import Summary from "@/modules/01_masterdata/components/Indicators/Summary.vue";

 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@ -205,6 +205,9 @@ onMounted(() => {
  <div class="toptitle text-dark col-12 row items-center">
    รายการตัวชี้วัดตามแผนฯ
  </div>
+
+  <Summary />
+
  <q-card bordered class="col-12 row caedNone">
    <div class="col-xs-12 col-sm-3 row">
      <div class="col-12 row no-wrap">
@ -268,7 +271,6 @@ onMounted(() => {
    </div>
    <div class="col-xs-12 col-sm-9 q-pa-md row">
      <div class="col-12">
-        <IndicatorTotal />
        <div class="row q-col-gutter-sm items-center q-mb-sm no-wrap">
          <datepicker
            menu-class-name="modalfix"
--- a/src/modules/01_masterdata/views/indicatorByRole.vue
+++ b/src/modules/01_masterdata/views/indicatorByRole.vue
@ -12,7 +12,7 @@ import type {
 } from "@/modules/01_masterdata/interface/index/Main";

 import DialogHistory from "@/modules/01_masterdata/components/Indicators/DialogHistory.vue";
-import IndicatorTotal from "@/modules/01_masterdata/components/Indicators/Summary.vue";
+import Summary from "@/modules/01_masterdata/components/Indicators/Summary.vue";

 /** importStore*/
 import { useCounterMixin } from "@/stores/mixin";
@ -273,10 +273,10 @@ onMounted(async () => {
  <div class="toptitle text-dark col-12 row items-center">
    รายการตัวชี้วัดตามตำแหน่ง
  </div>
+
+  <Summary />
+
  <q-card flat bordered class="q-pa-md">
-    <div class="col-12">
-      <IndicatorTotal />
-    </div>
    <div class="row q-gutter-sm no-wrap q-mb-sm">
      <q-select
        dense
--- a/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
@ -168,7 +168,7 @@ const historyColumns = ref<QTableProps["columns"]>([
    label: "วันที่แก้ไข",
    sortable: true,
    field: "lastUpdatedAt",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    sort: (a: string, b: string) =>
--- a/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/02_Train.vue
@ -282,7 +282,7 @@ const historyColumns = ref<QTableProps["columns"]>([
    label: "วันที่แก้ไข",
    sortable: true,
    field: "lastUpdatedAt",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    sort: (a: string, b: string) =>
--- a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue
@ -405,7 +405,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
    field: "lastUpdatedAt",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    sort: (a: string, b: string) =>
      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
--- a/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/04_DeclarationHonor.vue
@ -186,7 +186,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
    field: "lastUpdatedAt",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    sort: (a: string, b: string) =>
      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
--- a/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
@ -253,7 +253,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
    field: "lastUpdatedAt",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    sort: (a: string, b: string) =>
      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
--- a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
@ -255,7 +255,7 @@ const columns = ref<QTableColumn[]>([
    field: "lastUpdatedAt",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
  },
 ]);
 const visibleColumns = ref<String[]>([
--- a/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
@ -71,7 +71,7 @@ const columns = ref<QTableProps["columns"]>([
    field: "lastUpdatedAt",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
  },
 ]);
 const visibleColumns = ref<string[]>([
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
@ -289,7 +289,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
    label: "วันที่แก้ไข",
    sortable: true,
    field: "lastUpdatedAt",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    sort: (a: string, b: string) =>
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_DisciplineHistory.vue
@ -142,7 +142,7 @@ const columns = ref<QTableProps["columns"]>([
    label: "วันที่แก้ไข",
    sortable: true,
    field: "lastUpdatedAt",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    sort: (a: string, b: string) =>
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/03_LeaveHistory.vue
@ -139,7 +139,7 @@ const columns = ref<QTableProps["columns"]>([
    label: "วันที่แก้ไข",
    sortable: true,
    field: "lastUpdatedAt",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    sort: (a: string, b: string) =>
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue
@ -144,7 +144,7 @@ const columns = ref<QTableProps["columns"]>([
    field: "lastUpdatedAt",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    sort: (a: string, b: string) =>
      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
--- a/src/modules/04_registryPerson/components/detail/Other/01_OtherInformationHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/Other/01_OtherInformationHistory.vue
@ -92,7 +92,7 @@ const columns = ref<QTableProps["columns"]>([
    field: "lastUpdatedAt",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    sort: (a: string, b: string) =>
      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue
@ -255,7 +255,7 @@ const columnsHistory = ref<QTableColumn[]>([
    field: "lastUpdatedAt",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    sort: (a: string, b: string) =>
      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
@ -178,7 +178,7 @@ const columns = ref<QTableProps["columns"]>([
    label: "วันที่แก้ไข",
    sortable: true,
    field: "lastUpdatedAt",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    sort: (a: string, b: string) =>
@ -247,7 +247,7 @@ const historyColumns = ref<QTableProps["columns"]>([
    label: "วันที่แก้ไข",
    sortable: true,
    field: "lastUpdatedAt",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    sort: (a: string, b: string) =>
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/03_Address.vue
@ -245,7 +245,7 @@ const columnsHistory = ref<QTableProps["columns"]>([
    field: "lastUpdatedAt",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    sort: (a: string, b: string) =>
      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
@ -390,7 +390,7 @@ const historyColumns = ref<QTableProps["columns"]>([
    label: "วันที่แก้ไข",
    sortable: true,
    field: "lastUpdatedAt",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    sort: (a: string, b: string) =>
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
@ -133,7 +133,7 @@ const historyColumns = ref<QTableProps["columns"]>([
    label: "วันที่แก้ไข",
    sortable: true,
    field: "lastUpdatedAt",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    sort: (a: string, b: string) =>
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalaryHistory.vue
@ -194,7 +194,7 @@ const baseColumns = ref<QTableProps["columns"]>([
    field: "lastUpdatedAt",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
  },
 ]);
 const visibleColumns = ref<string[]>([
--- a/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalaryHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalaryHistory.vue
@ -100,7 +100,7 @@ const columns = ref<QTableProps["columns"]>([
    field: "lastUpdatedAt",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
-    format: (v) => date2Thai(v),
+    format: (v) => date2Thai(v, false, true),
    sort: (a: string, b: string) =>
      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
  },