diff --git a/src/modules/04_registryPerson/components/TableView.vue b/src/modules/04_registryPerson/components/TableView.vue index 847ec5db5..6146a23df 100644 --- a/src/modules/04_registryPerson/components/TableView.vue +++ b/src/modules/04_registryPerson/components/TableView.vue @@ -30,6 +30,7 @@ const router = useRouter(); const formFilter = defineModel("formFilter", { required: true }); const maxPage = defineModel("maxPage", { required: true }); const empType = defineModel("empType", { required: true }); +const isFilter = defineModel("isFilter", { required: true }); const props = defineProps({ rows: { type: Array }, fetchData: { type: Function }, @@ -226,6 +227,7 @@ watch( รายการคำร้องขอแก้ไข
+ {{ + `${props.row.prefix ? props.row.prefix : ""}${ + props.row.firstName + } ${props.row.lastName}` + }} +
+
รายละเอียด {{ @@ -474,7 +484,7 @@ watch( > - ไม่พบข้อมูล + {{ isFilter ? "ไม่พบข้อมูล" : "ค้นหาข้อมูล" }}
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue index db2a03cad..52e83625e 100644 --- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue +++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue @@ -72,126 +72,126 @@ const workDateRef = ref(null); const reasonSameDateRef = ref(null); const visibleColumnsHistory = ref([ - "oc", - "position", - "positionPathSide", - "posNo", - "positionLine", - "positionType", - "positionLevel", - "positionExecutive", - "positionExecutiveSide", + // "oc", + // "position", + // "positionPathSide", + // "posNo", + // "positionLine", + // "positionType", + // "positionLevel", + // "positionExecutive", + // "positionExecutiveSide", "dateAppoint", "dateStart", - "retireDate", - "govAge", - "govAgeAbsent", - "govAgePlus", + // "retireDate", + // "govAge", + // "govAgeAbsent", + // "govAgePlus", "reasonSameDate", "lastUpdateFullName", "lastUpdatedAt", ]); const columnsHistory = ref([ - { - name: "oc", - align: "left", - label: "สังกัด", - sortable: true, - field: "oc", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - 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", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "posNo", - align: "left", - label: "ตำแหน่งเลขที่", - sortable: true, - field: "posNo", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "positionLine", - align: "left", - label: "สายงาน", - sortable: true, - field: "positionLine", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "positionType", - align: "left", - label: "ประเภท", - sortable: true, - field: "positionType", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "positionLevel", - align: "left", - label: "ระดับ", - sortable: true, - field: "positionLevel", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "positionExecutive", - align: "left", - label: "ตำแหน่งทางการบริหาร", - sortable: true, - field: "positionExecutive", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - 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: "oc", + // align: "left", + // label: "สังกัด", + // sortable: true, + // field: "oc", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // sort: (a: string, b: string) => + // a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + // }, + // { + // 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", + // sort: (a: string, b: string) => + // a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + // }, + // { + // name: "posNo", + // align: "left", + // label: "ตำแหน่งเลขที่", + // sortable: true, + // field: "posNo", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // sort: (a: string, b: string) => + // a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + // }, + // { + // name: "positionLine", + // align: "left", + // label: "สายงาน", + // sortable: true, + // field: "positionLine", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // sort: (a: string, b: string) => + // a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + // }, + // { + // name: "positionType", + // align: "left", + // label: "ประเภท", + // sortable: true, + // field: "positionType", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // sort: (a: string, b: string) => + // a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + // }, + // { + // name: "positionLevel", + // align: "left", + // label: "ระดับ", + // sortable: true, + // field: "positionLevel", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // sort: (a: string, b: string) => + // a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + // }, + // { + // name: "positionExecutive", + // align: "left", + // label: "ตำแหน่งทางการบริหาร", + // sortable: true, + // field: "positionExecutive", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // 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", @@ -216,51 +216,51 @@ const columnsHistory = ref([ sort: (a: string, b: string) => a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, - { - name: "retireDate", - align: "left", - label: "วันเกษียณอายุ", - sortable: true, - field: "retireDate", - format: (v) => date2Thai(v), - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "govAge", - align: "left", - label: "อายุราชการ", - sortable: true, - field: "govAge", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "govAgeAbsent", - align: "left", - label: "ขาดราชการ", - sortable: true, - field: "govAgeAbsent", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "govAgePlus", - align: "left", - label: "อายุราชการเกื้อกูล", - sortable: true, - field: "govAgePlus", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, + // { + // name: "retireDate", + // align: "left", + // label: "วันเกษียณอายุ", + // sortable: true, + // field: "retireDate", + // format: (v) => date2Thai(v), + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // sort: (a: string, b: string) => + // a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + // }, + // { + // name: "govAge", + // align: "left", + // label: "อายุราชการ", + // sortable: true, + // field: "govAge", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // sort: (a: string, b: string) => + // a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + // }, + // { + // name: "govAgeAbsent", + // align: "left", + // label: "ขาดราชการ", + // sortable: true, + // field: "govAgeAbsent", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // sort: (a: string, b: string) => + // a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + // }, + // { + // name: "govAgePlus", + // align: "left", + // label: "อายุราชการเกื้อกูล", + // sortable: true, + // field: "govAgePlus", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // sort: (a: string, b: string) => + // a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + // }, { name: "reasonSameDate", align: "left", @@ -596,6 +596,22 @@ onMounted(() => { +
+
+
+ วันที่เกษียณอายุราชการตามกฏหมาย +
+
+ {{ + formMain.dateRetireLaw + ? date2Thai(formMain.dateRetireLaw as Date) + : "-" + }} +
+
+
@@ -635,22 +651,6 @@ onMounted(() => {
-
-
-
- วันที่เกษียณอายุราชการตามกฏหมาย -
-
- {{ - formMain.dateRetireLaw - ? date2Thai(formMain.dateRetireLaw as Date) - : "-" - }} -
-
-
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue index 79edee3b2..e7ff8f5d8 100644 --- a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue +++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue @@ -70,6 +70,8 @@ const changeNameData = reactive({ status: "", documentId: "", }); + +const selection = ref([]); const prefixChange = ref(""); const firstNameChange = ref(""); const lastNameChange = ref(""); @@ -99,7 +101,9 @@ const visibleColumns = ref([ "prefix", "firstName", "lastName", - "status", + "lastUpdateFullName", + "lastUpdatedAt", + // "status", ]); const historyVisibleColumns = ref([ "prefix", @@ -146,12 +150,35 @@ const columns = ref([ sort: (a: string, b: string) => a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, + // { + // name: "status", + // align: "left", + // label: "สถานะการเปลี่ยนชื่อ", + // sortable: true, + // field: "status", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // sort: (a: string, b: string) => + // a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + // }, { - name: "status", + name: "lastUpdateFullName", align: "left", - label: "สถานะการเปลี่ยนชื่อ", + label: "ผู้ดำเนินการ", sortable: true, - field: "status", + 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), headerStyle: "font-size: 14px", style: "font-size: 14px", sort: (a: string, b: string) => @@ -241,22 +268,23 @@ const historyPagination = ref({ rowsPerPage: 10, }); -function editForm(row: any) { - submitDisable.value = true; - dialogStatus.value = "edit"; - editId.value = row.id; - subId.value = row.id; - changeNameData.prefix = row.prefix; - changeNameData.firstName = row.firstName; - changeNameData.lastName = row.lastName; - changeNameData.status = row.status; - prefixChange.value = changeNameData.prefix; - firstNameChange.value = changeNameData.firstName; - lastNameChange.value = changeNameData.lastName; - dialog.value = true; -} +// function editForm(row: any) { +// submitDisable.value = true; +// dialogStatus.value = "edit"; +// editId.value = row.id; +// subId.value = row.id; +// changeNameData.prefix = row.prefix; +// changeNameData.firstName = row.firstName; +// changeNameData.lastName = row.lastName; +// changeNameData.status = row.status; +// prefixChange.value = changeNameData.prefix; +// firstNameChange.value = changeNameData.firstName; +// lastNameChange.value = changeNameData.lastName; +// dialog.value = true; +// } function closeDialog() { + selection.value = []; alertUpload.value = false; dialog.value = false; } @@ -550,7 +578,16 @@ watch( > เพิ่มข้อมูล - + ดาวน์โหลด - - ดูประวัติการเปลี่ยนชื่อ-นามสกุล - - แก้ไขข้อมูล - + -->
@@ -658,16 +683,33 @@ watch( - +
-
- +
+
+ + + +
+
+ +
diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts index 602875b43..a66ee687b 100644 --- a/src/modules/04_registryPerson/store.ts +++ b/src/modules/04_registryPerson/store.ts @@ -1,18 +1,19 @@ import { defineStore } from "pinia"; -import { ref } from "vue"; +import { ref, reactive } from "vue"; import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main"; import type { DataType, DataLevel, } from "@/modules/04_registryPerson/interface/response/Main"; +import type { FormFilter } from "@/modules/04_registryPerson/interface/request/Main"; export const useRegistryNewDataStore = defineStore("registryNew", () => { const searchTypeOption = ref([ { id: "fullName", name: "ชื่อ-นามสกุล" }, { id: "citizenId", name: "เลขประจำตัวประชาชน" }, - // { id: "posNo", name: "ตำแหน่งเลขที่" }, { id: "position", name: "ตำแหน่งในสายงาน" }, + { id: "posNo", name: "ตำแหน่งเลขที่" }, ]); const employeeClassOps = ref([ { id: "officer", name: "ข้าราชการ กทม.สามัญ" }, @@ -48,6 +49,28 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => { } }); } + + const formFilter = reactive({ + page: 1, + pageSize: 12, + keyword: "", + type: "officer", + posType: "", + posLevel: "", + retireYear: "", + rangeYear: { min: 0, max: 60 }, + isShowRetire: false, + isProbation: false, + }); + + const labelOption = reactive({ + type: "ข้าราชการ กทม.สามัญ", + posType: "ทั้งหมด", + posLevel: "ทั้งหมด", + retireYear: "", + node: "เลือกหน่วยงาน/ส่วนราชการ", + }); + return { fetchType, fetchLevel, @@ -58,5 +81,7 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => { posLevelOps, yearOps, mode, + formFilter, + labelOption, }; }); diff --git a/src/modules/04_registryPerson/views/list.vue b/src/modules/04_registryPerson/views/list.vue index 608033c40..5ebd1a959 100644 --- a/src/modules/04_registryPerson/views/list.vue +++ b/src/modules/04_registryPerson/views/list.vue @@ -10,11 +10,11 @@ import type { DataPerson, DataType, } from "@/modules/04_registryPerson/interface/response/Main"; -import type { FormFilter } from "@/modules/04_registryPerson/interface/request/Main"; /** importComponents*/ import TableView from "@/modules/04_registryPerson/components/TableView.vue"; import avatar from "@/assets/avatar_user.jpg"; +import DialogHeader from "@/components/DialogHeader.vue"; /** importStore*/ import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store"; @@ -28,39 +28,23 @@ const route = useRoute(); const mode = ref<"table" | "card">("table"); -const isShowFilter = ref(false); -const isShowBtnFilter = ref(true); -const empType = ref("officer"); // ประเภท ขรก./ลูกจ้างประจำ/ลูกจ้างชั่วคราว -const labelOption = reactive({ - type: "ข้าราชการ กทม.สามัญ", - posType: "ทั้งหมด", - posLevel: "ทั้งหมด", - retireYear: "", -}); +const isShowFilter = ref(true); +const isShowBtnFilter = ref(false); +const empType = ref("officer"); // officer / employee / perm const searchType = ref("fullName"); -const formFilter = reactive({ - page: 1, - pageSize: 12, - keyword: "", - type: "", - posType: "", - posLevel: "", - retireYear: "", - rangeYear: { min: 0, max: 60 }, - isShowRetire: false, - isProbation: false, -}); + const maxPage = ref(1); const total = ref(0); +const selectNode = ref(false); const dataPersonMain = ref([]); const conditionTotal = computed(() => { let num: string = ""; - if (formFilter.isProbation && formFilter.isShowRetire) { + if (store.formFilter.isProbation && store.formFilter.isShowRetire) { num = "(2)"; - } else if (formFilter.isProbation || formFilter.isShowRetire) { + } else if (store.formFilter.isProbation || store.formFilter.isShowRetire) { num = "(1)"; } else ""; @@ -115,35 +99,35 @@ function fetchYearOption() { function fetchDataPerson() { showLoader(); let queryParams: any = { - page: formFilter.page, - pageSize: formFilter.pageSize, + page: store.formFilter.page, + pageSize: store.formFilter.pageSize, }; - if (formFilter.keyword) { + if (store.formFilter.keyword) { queryParams = Object.assign({}, queryParams, { searchField: searchType.value, - searchKeyword: formFilter.keyword, + searchKeyword: store.formFilter.keyword, }); } - if (labelOption.posLevel != "ทั้งหมด") { + if (store.labelOption.posLevel != "ทั้งหมด") { queryParams = Object.assign({}, queryParams, { - posLevel: labelOption.posLevel, + posLevel: store.labelOption.posLevel, }); } - if (labelOption.posType != "ทั้งหมด") { + if (store.labelOption.posType != "ทั้งหมด") { queryParams = Object.assign({}, queryParams, { - posType: labelOption.posType, + posType: store.labelOption.posType, }); } - if (formFilter.isProbation != null) { - queryParams.isProbation = formFilter.isProbation; + if (store.formFilter.isProbation != null) { + queryParams.isProbation = store.formFilter.isProbation; } - if (formFilter.isShowRetire != null) { - queryParams.isRetire = formFilter.isShowRetire; + if (store.formFilter.isShowRetire != null) { + queryParams.isRetire = store.formFilter.isShowRetire; } if (empType.value !== "officer") { @@ -156,9 +140,12 @@ function fetchDataPerson() { { params: queryParams } ) .then((res) => { - maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize); + maxPage.value = Math.ceil( + res.data.result.total / store.formFilter.pageSize + ); dataPersonMain.value = res.data.result.data; total.value = res.data.result.total; + isShowBtnFilter.value = true; insertAvatar(res.data.result.data); }) .catch((err) => { @@ -204,28 +191,29 @@ function insertAvatar(items: DataPerson[]) { /** * funciotn แสดงตัวเลือกเพิ่มเติม */ -function onClickShowFilter() { - isShowFilter.value = !isShowFilter.value; - isShowBtnFilter.value = false; - if (isShowFilter.value) { - // fetchLevel(); - fetchYearOption(); - } -} +// function onClickShowFilter() { +// isShowFilter.value = !isShowFilter.value; +// isShowBtnFilter.value = false; +// if (isShowFilter.value) { +// // fetchLevel(); +// fetchYearOption(); +// } +// } /** * funciotn ค้นหาข้อมูล */ function onclickSearch() { isShowFilter.value = true; - isShowBtnFilter.value = false; - formFilter.page = 1; + // isShowBtnFilter.value = false; + store.formFilter.page = 1; if (isShowFilter.value) { fetchType(); // fetchLevel(); fetchYearOption(); } - formFilter.keyword = formFilter.keyword === null ? "" : formFilter.keyword; + store.formFilter.keyword = + store.formFilter.keyword === null ? "" : store.formFilter.keyword; fetchDataPerson(); } @@ -234,21 +222,34 @@ function onclickSearch() { * @param item ประเภทข้าราชการ */ async function selectType() { - // labelOption.type = item.name; empType.value = await (route.name == "registryNew" ? "officer" : "perm"); - formFilter.page = 1; - labelOption.posType = "ทั้งหมด"; - labelOption.posLevel = "ทั้งหมด"; if (empType.value !== "officer") { - formFilter.isShowRetire = null; - formFilter.isProbation = null; + store.formFilter.isShowRetire = null; + store.formFilter.isProbation = null; fetchOptionGroup(); } else { fetchType(); } - fetchDataPerson(); + // เช็ค store ถ้าเปลี่ยนประเภททะเบียนประวัติ ให้ล่างค่า filter ใหม่ + if (store.formFilter.type != empType.value) { + store.labelOption.posType = "ทั้งหมด"; + store.labelOption.posLevel = "ทั้งหมด"; + store.formFilter.type = empType.value; + } else { + // แต่ถ้าประเภทเดิมระบบจะใช้ filter เดิมที่เคยค้นหาไว้ + if ( + store.formFilter.keyword != "" || + store.labelOption.posType != "ทั้งหมด" || + store.labelOption.posLevel != "ทั้งหมด" || + store.formFilter.isShowRetire != null || + store.formFilter.isProbation != null + ) { + store.formFilter.page = 1; + fetchDataPerson(); + } + } } /** @@ -258,9 +259,9 @@ async function selectType() { function selectPosType(item: DataOption) { const dataType = store.posTypeMain.find((e: DataType) => e.id === item.id); store.fetchLevel(dataType?.posLevels); - labelOption.posType = item.name; - labelOption.posLevel = "ทั้งหมด"; - formFilter.page = 1; + store.labelOption.posType = item.name; + store.labelOption.posLevel = "ทั้งหมด"; + store.formFilter.page = 1; fetchDataPerson(); } @@ -269,8 +270,8 @@ function selectPosType(item: DataOption) { * @param item ประเภทระดับ */ function selectPosLevel(item: DataOption) { - labelOption.posLevel = item.name; - formFilter.page = 1; + store.labelOption.posLevel = item.name; + store.formFilter.page = 1; fetchDataPerson(); } @@ -280,17 +281,17 @@ function selectPosLevel(item: DataOption) { */ function clearSelect(t: string) { if (t === "posType") { - labelOption.posType = "ทั้งหมด"; - labelOption.posLevel = "ทั้งหมด"; + store.labelOption.posType = "ทั้งหมด"; + store.labelOption.posLevel = "ทั้งหมด"; } else if (t === "posLevel") { - labelOption.posLevel = "ทั้งหมด"; + store.labelOption.posLevel = "ทั้งหมด"; } else if (t === "retireYear") { - labelOption.retireYear = ""; + store.labelOption.retireYear = ""; } else if (t === "rangeYear") { - formFilter.rangeYear.min = 0; - formFilter.rangeYear.max = 60; + store.formFilter.rangeYear.min = 0; + store.formFilter.rangeYear.max = 60; } - formFilter.page = 1; + store.formFilter.page = 1; fetchDataPerson(); } @@ -337,7 +338,7 @@ onMounted(async () => { borderless dense bg-color="white" - v-model="formFilter.keyword" + v-model="store.formFilter.keyword" clearable placeholder="ค้นหา" class="col-9 q-pr-md" @@ -361,47 +362,40 @@ onMounted(async () => {
- + > -->
- + { > @@ -452,15 +446,15 @@ onMounted(async () => { label-color="white" dropdown-icon="mdi-chevron-down" class="q-px-sm" - :disable="labelOption.posType === 'ทั้งหมด' ? true : false" + :disable="store.labelOption.posType === 'ทั้งหมด' ? true : false" > @@ -510,7 +504,7 @@ onMounted(async () => { { { + + + + + + + + + + +