From d81ec7071a617383c1739007bf74b9475cf82662 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 9 Apr 2025 15:23:14 +0700 Subject: [PATCH 1/3] fix messageError --- .../12_evaluatePersonal/components/Detail/step/step2.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue index fd6648df1..1ee96e01d 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue @@ -48,7 +48,8 @@ async function fetchSigner() { } }) .catch((e) => { - messageError($q, e); + // messageError($q, e); + console.log(e); }) .finally(() => { setTimeout(() => { From 4fecce4663d7eb80cef324ed0fa75555bb3d96ed Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 9 Apr 2025 16:06:11 +0700 Subject: [PATCH 2/3] fix columns --- .../DialogAddPerson.vue | 14 ++++++++++ .../05_salaryListsEmployee/TableTypeOther.vue | 20 +++++++------ .../TableTypePending.vue | 28 +++++++++++++++---- .../views/05_salaryListsEmployee.vue | 4 +++ 4 files changed, 52 insertions(+), 14 deletions(-) diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue b/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue index e292c7ec5..e4dd670f0 100644 --- a/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue +++ b/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue @@ -61,6 +61,20 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "posNo", + align: "left", + label: "ตำแหน่งเลขที่", + sortable: false, + field: "posNo", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format(val, row) { + return row.orgShortName && row.posMasterNo + ? `${row.orgShortName} ${row.posMasterNo}` + : "-"; + }, + }, { name: "position", align: "left", diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue index e055cd0a3..306e3ce17 100644 --- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue +++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue @@ -54,15 +54,7 @@ const baseColumns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "posNo", - align: "left", - label: "ตำแหน่งเลขที่", - sortable: false, - field: "posNo", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, + { name: "fullName", align: "left", @@ -72,6 +64,15 @@ const baseColumns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "posNo", + align: "left", + label: "ตำแหน่งเลขที่", + sortable: false, + field: "posNo", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "position", align: "left", @@ -441,6 +442,7 @@ watch( + ([ style: "font-size: 14px", }, { - name: "posType", + name: "posNo", align: "left", - label: "กลุ่มงาน", + label: "ตำแหน่งเลขที่", sortable: false, - field: "posType", + field: "posNo", headerStyle: "font-size: 14px", style: "font-size: 14px", + format(val, row) { + return row.orgShortName && row.posMasterNo + ? `${row.orgShortName} ${row.posMasterNo}` + : "-"; + }, }, + { name: "position", align: "left", @@ -89,6 +95,15 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "posType", + align: "left", + label: "กลุ่มงาน", + sortable: false, + field: "posType", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "posLevel", align: "left", @@ -107,7 +122,7 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { - return val ? "กลุ่ม" + val : "-"; + return val ? `กลุ่ม${val}` : "-"; }, }, { @@ -186,6 +201,7 @@ const columns = ref([ const visibleColumns = ref([ "no", "fullName", + "posNo", "posType", "position", "posLevel", @@ -512,7 +528,9 @@ watch( dense icon="info" class="q-pa-none q-ml-xs" - color="info" + :color=" + col.name == 'discipline' && props.row.isPunish ? 'red' : 'info' + " size="12px" @click.pervent="onClickViewInfo(col.name, props.row.profileId)" > diff --git a/src/modules/13_salary/views/05_salaryListsEmployee.vue b/src/modules/13_salary/views/05_salaryListsEmployee.vue index e7973cafa..20522fa8c 100644 --- a/src/modules/13_salary/views/05_salaryListsEmployee.vue +++ b/src/modules/13_salary/views/05_salaryListsEmployee.vue @@ -196,6 +196,7 @@ async function getAgency(id: string) { }) .catch((err) => { messageError($q, err); + hideLoader(); })); } @@ -227,6 +228,7 @@ async function getAgencyPosition(id: string) { }) .catch((err) => { messageError($q, err); + hideLoader(); }); } else agencyFilter.value = ""; } @@ -263,6 +265,7 @@ async function fetchSalalyPeriod( }) .catch((err) => { messageError($q, err); + hideLoader(); }); } } @@ -380,6 +383,7 @@ async function fetchCheckisOfficer() { }) .catch((e) => { messageError($q, e); + hideLoader(); }); } From 2b0998c1fe8730a2f8e0d7a184896cbad8dd4914 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 9 Apr 2025 16:27:24 +0700 Subject: [PATCH 3/3] fix salary --- .../04_salaryLists/DialogAddPerson.vue | 24 +++++++++++--- .../components/04_salaryLists/TabMain.vue | 2 ++ .../04_salaryLists/TableTypeOther.vue | 32 +++++++++++++------ .../04_salaryLists/TableTypePending.vue | 28 ++++++++++++++-- .../interface/response/SalaryList.ts | 2 ++ .../13_salary/views/04_salaryLists.vue | 4 +++ 6 files changed, 75 insertions(+), 17 deletions(-) diff --git a/src/modules/13_salary/components/04_salaryLists/DialogAddPerson.vue b/src/modules/13_salary/components/04_salaryLists/DialogAddPerson.vue index 621805e96..881f1956f 100644 --- a/src/modules/13_salary/components/04_salaryLists/DialogAddPerson.vue +++ b/src/modules/13_salary/components/04_salaryLists/DialogAddPerson.vue @@ -47,7 +47,7 @@ const columns = ref([ name: "citizenId", align: "left", label: "เลขประจำตัวประชาชน", - sortable: false, + sortable: false, field: "citizenId", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -57,15 +57,29 @@ const columns = ref([ align: "left", label: "ชื่อ-นามสกุล", field: "fullName", - sortable: false, + sortable: false, headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "posNo", + align: "left", + label: "เลขที่ตำแหน่ง", + sortable: false, + field: "posNo", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format(val, row) { + return row.orgShortName && row.posMasterNo + ? `${row.orgShortName} ${row.posMasterNo}` + : "-"; + }, + }, { name: "position", align: "left", label: "ตำแหน่งในสายงาน", - sortable: false, + sortable: false, field: "position", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -74,7 +88,7 @@ const columns = ref([ name: "posType", align: "left", label: "ประเภทตำเเหน่ง", - sortable: false, + sortable: false, field: "posType", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -83,7 +97,7 @@ const columns = ref([ name: "posLevel", align: "left", label: "ระดับตำเเหน่ง", - sortable: false, + sortable: false, field: "posLevel", headerStyle: "font-size: 14px", style: "font-size: 14px", diff --git a/src/modules/13_salary/components/04_salaryLists/TabMain.vue b/src/modules/13_salary/components/04_salaryLists/TabMain.vue index 7bfde9c46..9c089fe63 100644 --- a/src/modules/13_salary/components/04_salaryLists/TabMain.vue +++ b/src/modules/13_salary/components/04_salaryLists/TabMain.vue @@ -637,6 +637,7 @@ const updateIsShowRetire = async () => { :fetchDataTable="fetchDataPeriodNew" :total="total" :snap-shot="props?.snapShot" + :is-close="props.periodLatest?.group1IsClose ?? false" /> { :total="total" :type="item.type" :snap-shot="props?.snapShot" + :is-close="props.periodLatest?.group2IsClose ?? false" /> diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue b/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue index 06779bb5b..22ace0b36 100644 --- a/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue +++ b/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue @@ -30,6 +30,7 @@ const { dialogRemove, messageError, showLoader, hideLoader, success } = const formFilter = defineModel("formFilter", { required: true }); const maxPage = defineModel("maxPage", { required: true }); const snapShot = defineModel("snapShot"); +const isClose = defineModel("isClose", { required: true }); const props = defineProps({ rows: { type: Array }, @@ -56,15 +57,7 @@ const baseColumns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "posNo", - align: "left", - label: "เลขที่ตำแหน่ง", - sortable: false, - field: "posNo", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, + { name: "fullName", align: "left", @@ -74,6 +67,20 @@ const baseColumns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "posNo", + align: "left", + label: "เลขที่ตำแหน่ง", + sortable: false, + field: "posNo", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format(val, row) { + return row.orgShortName && row.posMasterNo + ? `${row.orgShortName} ${row.posMasterNo}` + : "-"; + }, + }, { name: "position", align: "left", @@ -298,7 +305,11 @@ watch( ("formFilter", { required: true }); const maxPage = defineModel("maxPage", { required: true }); const snapShot = defineModel("snapShot"); +const isClose = defineModel("isClose", { required: true }); const props = defineProps({ rows: { type: Array }, fetchDataTable: { @@ -62,6 +63,7 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { name: "fullName", align: "left", @@ -71,6 +73,20 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "posNo", + align: "left", + label: "เลขที่ตำแหน่ง", + sortable: false, + field: "posNo", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format(val, row) { + return row.orgShortName && row.posMasterNo + ? `${row.orgShortName} ${row.posMasterNo}` + : "-"; + }, + }, { name: "posType", align: "left", @@ -174,6 +190,7 @@ const columns = ref([ const visibleColumns = ref([ "no", "fullName", + "posNo", "posType", "posExecutive", "position", @@ -330,7 +347,11 @@ function onClickViewInfo(type: string, id: string) { diff --git a/src/modules/13_salary/interface/response/SalaryList.ts b/src/modules/13_salary/interface/response/SalaryList.ts index 336ec90e5..4494bc7b0 100644 --- a/src/modules/13_salary/interface/response/SalaryList.ts +++ b/src/modules/13_salary/interface/response/SalaryList.ts @@ -3,6 +3,8 @@ interface DataPeriodLatest { group2id: string; // Id กลุ่ม2 effectiveDate: string; // วันที่มีผลบังคับใช้ period: string; // ประเภทผัง (SPECIAL->รอบพิเศษ,APR->รอบเมษายน,OCT->รอบตุลาคม) + group1IsClose: boolean; + group2IsClose: boolean; } interface DataPeriodQuota { diff --git a/src/modules/13_salary/views/04_salaryLists.vue b/src/modules/13_salary/views/04_salaryLists.vue index d1bf6bb1f..b25a7fd3d 100644 --- a/src/modules/13_salary/views/04_salaryLists.vue +++ b/src/modules/13_salary/views/04_salaryLists.vue @@ -201,6 +201,7 @@ async function getAgency(id: string) { }) .catch((err) => { messageError($q, err); + hideLoader(); }); } else { agencyOptionsMain.value = []; @@ -239,6 +240,7 @@ async function getAgencyPosition(id: string) { }) .catch((err) => { messageError($q, err); + hideLoader(); }); } else agencyFilter.value = ""; } @@ -352,6 +354,7 @@ function getQuota() { }) .catch((e) => { messageError($q, e); + hideLoader(); }); } @@ -385,6 +388,7 @@ async function fetchCheckisOfficer() { }) .catch((e) => { messageError($q, e); + hideLoader(); }); }