updated ทะเบียนประวัติ
This commit is contained in:
parent
d9b8791706
commit
5166d1c16a
6 changed files with 415 additions and 379 deletions
|
|
@ -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<boolean>(false);
|
||||
const isShowBtnFilter = ref<boolean>(true);
|
||||
const empType = ref<string>("officer"); // ประเภท ขรก./ลูกจ้างประจำ/ลูกจ้างชั่วคราว
|
||||
const labelOption = reactive({
|
||||
type: "ข้าราชการ กทม.สามัญ",
|
||||
posType: "ทั้งหมด",
|
||||
posLevel: "ทั้งหมด",
|
||||
retireYear: "",
|
||||
});
|
||||
const isShowFilter = ref<boolean>(true);
|
||||
const isShowBtnFilter = ref<boolean>(false);
|
||||
const empType = ref<string>("officer"); // officer / employee / perm
|
||||
|
||||
const searchType = ref<string>("fullName");
|
||||
const formFilter = reactive<FormFilter>({
|
||||
page: 1,
|
||||
pageSize: 12,
|
||||
keyword: "",
|
||||
type: "",
|
||||
posType: "",
|
||||
posLevel: "",
|
||||
retireYear: "",
|
||||
rangeYear: { min: 0, max: 60 },
|
||||
isShowRetire: false,
|
||||
isProbation: false,
|
||||
});
|
||||
|
||||
const maxPage = ref<number>(1);
|
||||
const total = ref<number>(0);
|
||||
const selectNode = ref<boolean>(false);
|
||||
|
||||
const dataPersonMain = ref<DataPerson[]>([]);
|
||||
|
||||
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 () => {
|
|||
</q-form>
|
||||
<div v-if="isShowBtnFilter" class="col-12 row q-mt-sm">
|
||||
<q-space />
|
||||
<q-btn
|
||||
พบข้อมูลทั้งหมด {{ total }} รายการ
|
||||
<!-- <q-btn
|
||||
flat
|
||||
label="ตัวเลือกเพิ่มเติม"
|
||||
icon-right="mdi-tune"
|
||||
@click="onClickShowFilter"
|
||||
dense
|
||||
class="q-px-sm"
|
||||
></q-btn>
|
||||
></q-btn> -->
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="row q-mt-sm q-gutter-sm justify-center"
|
||||
:class="
|
||||
!isShowBtnFilter
|
||||
? 'row q-mt-sm q-gutter-sm justify-center'
|
||||
: 'row q-gutter-sm justify-center'
|
||||
"
|
||||
v-if="isShowFilter"
|
||||
>
|
||||
<!-- <q-btn-dropdown
|
||||
<q-btn-dropdown
|
||||
flat
|
||||
rounded
|
||||
dense
|
||||
label-color="white"
|
||||
dropdown-icon="mdi-chevron-down"
|
||||
class="q-px-sm"
|
||||
@click="() => (selectNode = true)"
|
||||
>
|
||||
<template v-slot:label>
|
||||
{{ `${labelOption.type}` }}
|
||||
{{ `${store.labelOption.node}` }}
|
||||
</template>
|
||||
<q-list>
|
||||
<q-item
|
||||
v-for="(item, index) in store.employeeClassOps"
|
||||
:key="index"
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="selectType(item)"
|
||||
>
|
||||
<q-item-section>
|
||||
<q-item-label>{{ item.name }}</q-item-label>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-btn-dropdown>
|
||||
|
||||
<q-separator inset vertical class="lineFil" /> -->
|
||||
<q-separator inset vertical class="lineFil" />
|
||||
|
||||
<q-btn-dropdown
|
||||
rounded
|
||||
|
|
@ -413,19 +407,19 @@ onMounted(async () => {
|
|||
>
|
||||
<template v-slot:label>
|
||||
{{
|
||||
labelOption.posType !== "ทั้งหมด"
|
||||
? labelOption.posType
|
||||
store.labelOption.posType !== "ทั้งหมด"
|
||||
? store.labelOption.posType
|
||||
: empType === "officer"
|
||||
? `ตำแหน่งประเภท${labelOption.posType}`
|
||||
: `กลุ่มงาน${labelOption.posType}`
|
||||
? `ตำแหน่งประเภท${store.labelOption.posType}`
|
||||
: `กลุ่มงาน${store.labelOption.posType}`
|
||||
}}
|
||||
<q-btn
|
||||
v-if="store.labelOption.posType !== 'ทั้งหมด'"
|
||||
size="10px"
|
||||
flat
|
||||
round
|
||||
color="white"
|
||||
icon="close"
|
||||
v-if="labelOption.posType !== 'ทั้งหมด'"
|
||||
@click.stop.prevent="clearSelect('posType')"
|
||||
/>
|
||||
</template>
|
||||
|
|
@ -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"
|
||||
>
|
||||
<template v-slot:label>
|
||||
{{
|
||||
labelOption.posLevel !== "ทั้งหมด"
|
||||
? labelOption.posLevel
|
||||
store.labelOption.posLevel !== "ทั้งหมด"
|
||||
? store.labelOption.posLevel
|
||||
: empType === "officer"
|
||||
? `ระดับ${labelOption.posLevel}`
|
||||
: `ระดับชั้นงาน${labelOption.posLevel}`
|
||||
? `ระดับ${store.labelOption.posLevel}`
|
||||
: `ระดับชั้นงาน${store.labelOption.posLevel}`
|
||||
}}
|
||||
<q-btn
|
||||
size="10px"
|
||||
|
|
@ -468,7 +462,7 @@ onMounted(async () => {
|
|||
round
|
||||
color="white"
|
||||
icon="close"
|
||||
v-if="labelOption.posLevel !== 'ทั้งหมด'"
|
||||
v-if="store.labelOption.posLevel !== 'ทั้งหมด'"
|
||||
@click.stop.prevent="clearSelect('posLevel')"
|
||||
/>
|
||||
</template>
|
||||
|
|
@ -510,7 +504,7 @@ onMounted(async () => {
|
|||
<q-item clickable v-close-popup>
|
||||
<q-item-section>
|
||||
<q-toggle
|
||||
v-model="formFilter.isProbation"
|
||||
v-model="store.formFilter.isProbation"
|
||||
color="primary"
|
||||
label="ทดลองปฏิบัติหน้าที่ราชการ"
|
||||
@update:model-value="fetchDataPerson"
|
||||
|
|
@ -520,7 +514,7 @@ onMounted(async () => {
|
|||
<q-item clickable v-close-popup>
|
||||
<q-item-section>
|
||||
<q-toggle
|
||||
v-model="formFilter.isShowRetire"
|
||||
v-model="store.formFilter.isShowRetire"
|
||||
color="primary"
|
||||
label="แสดงข้อมูลผู้พ้นจากราชการ"
|
||||
@update:model-value="fetchDataPerson"
|
||||
|
|
@ -540,15 +534,30 @@ onMounted(async () => {
|
|||
<TableView
|
||||
v-model:mode="mode"
|
||||
:rows="dataPersonMain"
|
||||
v-model:formFilter="formFilter"
|
||||
v-model:formFilter="store.formFilter"
|
||||
v-model:maxPage="maxPage"
|
||||
:fetchData="fetchDataPerson"
|
||||
:fetchType="fetchType"
|
||||
:total="total"
|
||||
:empType="empType"
|
||||
:is-filter="isShowBtnFilter"
|
||||
/>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
|
||||
<!-- แสดง dialog เลือกหน่วยงาน/ส่วนราชการ -->
|
||||
<q-dialog v-model="selectNode" persistent>
|
||||
<q-card style="width: 850px; max-width: 80vw">
|
||||
<DialogHeader
|
||||
tittle="เลือกหน่วยงาน/ส่วนราชการ"
|
||||
:close="() => (selectNode = false)"
|
||||
/>
|
||||
|
||||
<q-separator />
|
||||
|
||||
<q-card-section class="q-pa-sm"> </q-card-section>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue