diff --git a/src/modules/02_transfer/views/Main.vue b/src/modules/02_transfer/views/Main.vue
index 80ad70d..fe86ae3 100644
--- a/src/modules/02_transfer/views/Main.vue
+++ b/src/modules/02_transfer/views/Main.vue
@@ -295,13 +295,7 @@ onMounted(async () => {
{{ props.rowIndex + 1 }}
-
- {{
- props.row.rootShortNameOld && props.row.noPos
- ? `${props.row.rootShortNameOld}${props.row.noPos}`
- : "-"
- }}
-
+
{{
props.row.salary
diff --git a/src/modules/10_registry/01_Information/01_Information.vue b/src/modules/10_registry/01_Information/01_Information.vue
index 6b60732..f97a40e 100644
--- a/src/modules/10_registry/01_Information/01_Information.vue
+++ b/src/modules/10_registry/01_Information/01_Information.vue
@@ -64,10 +64,9 @@ const visibleColumnsHistory = ref([
"ethnicity",
"religion",
"phone",
- "createdFullName",
- "createdAt",
+ "lastUpdateFullName",
+ "lastUpdatedAt",
]);
-
const columnsHistory = ref([
{
name: "citizenId",
@@ -214,25 +213,25 @@ const columnsHistory = ref([
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
- name: "createdFullName",
+ name: "lastUpdateFullName",
align: "left",
label: "ผู้ดำเนินการ",
sortable: true,
- field: "createdFullName",
+ field: "lastUpdateFullName",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
- name: "createdAt",
+ name: "lastUpdatedAt",
align: "left",
label: "วันที่แก้ไข",
sortable: true,
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" }),
},
diff --git a/src/modules/10_registry/01_Information/02_ChangeName.vue b/src/modules/10_registry/01_Information/02_ChangeName.vue
index 89cfdaf..0a36de2 100644
--- a/src/modules/10_registry/01_Information/02_ChangeName.vue
+++ b/src/modules/10_registry/01_Information/02_ChangeName.vue
@@ -94,6 +94,9 @@ const columns = ref([
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
]);
+const pagination = ref({
+ sortBy: "lastUpdatedAt",
+});
const visibleColumnsHistory = ref([
"prefix",
@@ -309,6 +312,7 @@ onMounted(async () => {
:rows-per-page-options="[10, 25, 50, 100]"
:visible-columns="visibleColumns"
:virtual-scroll-sticky-size-start="48"
+ v-model:pagination="pagination"
>
diff --git a/src/modules/10_registry/01_Information/03_Address.vue b/src/modules/10_registry/01_Information/03_Address.vue
index e953012..e848b40 100644
--- a/src/modules/10_registry/01_Information/03_Address.vue
+++ b/src/modules/10_registry/01_Information/03_Address.vue
@@ -211,7 +211,7 @@ const columnsHistory = ref([
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" }),
},
@@ -267,7 +267,7 @@ function getHistory() {
.then((res) => {
const data = res.data.result;
rowsHistory.value = data;
- console.log("🚀 ~ .then ~ data:", data)
+ console.log("🚀 ~ .then ~ data:", data);
rowsHistoryData.value = data;
})
.catch((e) => {
diff --git a/src/modules/10_registry/01_Information/04_Family.vue b/src/modules/10_registry/01_Information/04_Family.vue
index 0440cdd..c40a590 100644
--- a/src/modules/10_registry/01_Information/04_Family.vue
+++ b/src/modules/10_registry/01_Information/04_Family.vue
@@ -15,7 +15,7 @@ import DialogHistory from "@/modules/10_registry/Dialog/DialogHistory.vue";
const link = ref("");
const $q = useQuasar();
const mixin = useCounterMixin();
-const { showLoader, hideLoader, messageError } = mixin;
+const { showLoader, hideLoader, messageError, date2Thai } = mixin;
const idFamily = ref("");
const store = useRegistryInFormationStore();
@@ -67,6 +67,8 @@ const visibleColumnsHistory = ref([
"job",
"isLive",
"lastNameOld",
+ "lastUpdateFullName",
+ "lastUpdatedAt",
]);
const columnsHistory = ref([
{
@@ -134,6 +136,29 @@ const columnsHistory = ref([
style: "font-size: 14px",
format: (val) => (val ? "มีชีวิต" : "ถึงแก่กรรม"),
},
+ {
+ name: "lastUpdateFullName",
+ align: "left",
+ label: "ผู้ดำเนินการ",
+ sortable: true,
+ field: "lastUpdateFullName",
+ headerStyle: "font-size: 14px",
+ style: "font-size: 14px",
+ sort: (a: string, b: string) =>
+ a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+ },
+ {
+ name: "lastUpdatedAt",
+ align: "left",
+ label: "วันที่แก้ไข",
+ sortable: true,
+ field: "lastUpdatedAt",
+ format: (v) => date2Thai(v, false, true),
+ headerStyle: "font-size: 14px",
+ style: "font-size: 14px",
+ sort: (a: string, b: string) =>
+ a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+ },
]);
const checkFatherData = ref(false);
@@ -202,6 +227,8 @@ async function getData(type: string) {
/** get history */
function getHistory() {
+ rowsHistory.value = [];
+ rowsHistoryData.value = [];
const url =
dataStore.officerType == "OFFICER"
? config.API.dataUserFamilyHistory(typeForm.value, "", idFamily.value)
@@ -216,8 +243,8 @@ function getHistory() {
.get(url)
.then((res) => {
const data = res.data.result;
- const listData =
- data.map((e: any) => ({
+ const listData = data.map((e: any) => ({
+ ...e,
citizenId: e[`${typeForm.value}CitizenId`],
prefix: e[`${typeForm.value}Prefix`],
firstName: e[`${typeForm.value}FirstName`],
@@ -227,8 +254,8 @@ function getHistory() {
lastNameOld:
typeForm.value === "couple" ? e.coupleLastNameOld : undefined,
}));
- rowsHistory.value = listData
- rowsHistoryData.value = listData
+ rowsHistory.value = listData;
+ rowsHistoryData.value = listData;
})
.catch((e) => {
messageError($q, e);
diff --git a/src/modules/10_registry/01_Information/05_Educations.vue b/src/modules/10_registry/01_Information/05_Educations.vue
index 4901662..943a411 100644
--- a/src/modules/10_registry/01_Information/05_Educations.vue
+++ b/src/modules/10_registry/01_Information/05_Educations.vue
@@ -49,7 +49,6 @@ const visibleColumns = ref([
"lastUpdateFullName",
"lastUpdatedAt",
]);
-
const columns = ref([
{
name: "educationLevel",
@@ -237,13 +236,16 @@ const columns = ref([
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.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
]);
+const pagination = ref({
+ sortBy: "lastUpdatedAt",
+});
const columnsHistory = ref([
{
@@ -434,14 +436,13 @@ const columnsHistory = ref([
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.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
]);
-
const visibleColumnsHistory = ref([
"educationLevel",
"institute",
@@ -569,6 +570,7 @@ onMounted(async () => {
:rows-per-page-options="[10, 25, 50, 100]"
:visible-columns="visibleColumns"
:virtual-scroll-sticky-size-start="48"
+ v-model:pagination="pagination"
>
@@ -589,7 +591,7 @@ onMounted(async () => {
{{ props.row.status ? props.row.status : "-" }}
- {{ col.value ? col.value:'-' }}
+ {{ col.value ? col.value : "-" }}
diff --git a/src/modules/10_registry/01_Information/06_Ability.vue b/src/modules/10_registry/01_Information/06_Ability.vue
index 948df44..202e37b 100644
--- a/src/modules/10_registry/01_Information/06_Ability.vue
+++ b/src/modules/10_registry/01_Information/06_Ability.vue
@@ -36,7 +36,6 @@ const visibleColumns = ref([
"lastUpdateFullName",
"lastUpdatedAt",
]);
-
const columns = ref([
{
name: "field",
@@ -99,13 +98,16 @@ const columns = ref([
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.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
]);
+const pagination = ref({
+ sortBy: "lastUpdatedAt",
+});
const visibleColumnsHistory = ref([
"field",
@@ -177,7 +179,7 @@ const columnsHistory = ref([
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) =>
@@ -290,6 +292,7 @@ onMounted(async () => {
:rows-per-page-options="[10, 25, 50, 100]"
:visible-columns="visibleColumns"
:virtual-scroll-sticky-size-start="48"
+ v-model:pagination="pagination"
>
diff --git a/src/modules/10_registry/02_Government/02_Discipline.vue b/src/modules/10_registry/02_Government/02_Discipline.vue
index 75bb1e4..c281dcc 100644
--- a/src/modules/10_registry/02_Government/02_Discipline.vue
+++ b/src/modules/10_registry/02_Government/02_Discipline.vue
@@ -127,13 +127,16 @@ const columns = ref([
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.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
]);
+const pagination = ref({
+ sortBy: "lastUpdatedAt",
+});
function onHistory(id: string) {
modalHistory.value = true;
@@ -236,6 +239,7 @@ onMounted(async () => {
:rows-per-page-options="[10, 25, 50, 100]"
:visible-columns="visibleColumns"
:virtual-scroll-sticky-size-start="48"
+ v-model:pagination="pagination"
>
diff --git a/src/modules/10_registry/02_Government/03_Leave.vue b/src/modules/10_registry/02_Government/03_Leave.vue
index 40ddbc2..7120f43 100644
--- a/src/modules/10_registry/02_Government/03_Leave.vue
+++ b/src/modules/10_registry/02_Government/03_Leave.vue
@@ -83,7 +83,9 @@ const columns = ref([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+ a
+ .toString()
+ .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "status",
@@ -124,13 +126,16 @@ const columns = ref([
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.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
]);
+const pagination = ref({
+ sortBy: "lastUpdatedAt",
+});
const visibleColumnsHistory = ref([
"no",
@@ -187,7 +192,9 @@ const columnsHistory = ref([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
sort: (a: string, b: string) =>
- a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+ a
+ .toString()
+ .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
name: "status",
@@ -387,6 +394,7 @@ onMounted(async () => {
:rows-per-page-options="[10, 25, 50, 100]"
:visible-columns="visibleColumns"
:virtual-scroll-sticky-size-start="48"
+ v-model:pagination="pagination"
>
diff --git a/src/modules/10_registry/02_Government/04_Duty.vue b/src/modules/10_registry/02_Government/04_Duty.vue
index 50ee476..e1970fd 100644
--- a/src/modules/10_registry/02_Government/04_Duty.vue
+++ b/src/modules/10_registry/02_Government/04_Duty.vue
@@ -22,7 +22,8 @@ const rowsHistoryData = ref([]);
const $q = useQuasar();
const mode = ref($q.screen.gt.xs);
const mixin = useCounterMixin();
-const { showLoader, hideLoader, messageError, date2Thai,onSearchDataTable } = mixin;
+const { showLoader, hideLoader, messageError, date2Thai, onSearchDataTable } =
+ mixin;
const modalHistory = ref(false);
/** ตัวแปรข้อมูล */
@@ -126,11 +127,14 @@ const columns = ref([
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" }),
},
]);
+const pagination = ref({
+ sortBy: "lastUpdatedAt",
+});
const visibleColumnsHistory = ref([
"dateStart",
@@ -340,6 +344,7 @@ onMounted(async () => {
:rows-per-page-options="[10, 25, 50, 100]"
:visible-columns="visibleColumns"
:virtual-scroll-sticky-size-start="48"
+ v-model:pagination="pagination"
>
diff --git a/src/modules/10_registry/02_Government/05_Actposition.vue b/src/modules/10_registry/02_Government/05_Actposition.vue
index 5d818cb..8f887b3 100644
--- a/src/modules/10_registry/02_Government/05_Actposition.vue
+++ b/src/modules/10_registry/02_Government/05_Actposition.vue
@@ -1,7 +1,7 @@
+
@@ -273,6 +290,7 @@ onMounted(async () => {
:rows-per-page-options="[10, 25, 50, 100]"
:visible-columns="visibleColumns"
:virtual-scroll-sticky-size-start="48"
+ v-model:pagination="pagination"
>
@@ -352,6 +370,7 @@ onMounted(async () => {
:columns="columnsHistory"
/>
+