diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue index b275af850..2576a9247 100644 --- a/src/components/CardProfile.vue +++ b/src/components/CardProfile.vue @@ -134,7 +134,7 @@ watch( -
+
{{ props.type == "employee" ? "ตำแหน่ง" : "ตำแหน่งในสายงาน" }} @@ -144,7 +144,7 @@ watch(
-
+
{{ props.type == "employee" ? "กลุ่มงาน" : "ประเภทตำแหน่ง" }} @@ -154,7 +154,7 @@ watch(
-
+
สังกัด
diff --git a/src/modules/04_registryNew/views/detailView.vue b/src/modules/04_registryNew/views/detailView.vue index 54d657581..f8d5b02d0 100644 --- a/src/modules/04_registryNew/views/detailView.vue +++ b/src/modules/04_registryNew/views/detailView.vue @@ -661,7 +661,86 @@ onMounted(async () => {
- + + +
+
+
+
+

+ {{ + `${formDetail?.prefix ? formDetail?.prefix : ""}${ + formDetail?.firstName + } ${formDetail?.lastName} ${leaveReason}` + }} +

+
+ +
+
+
+ + +
+ + + + + +
+ +
+
+
+
+
+ {{ empType === "" ? "ตำแหน่งในสายงาน" : "ตำแหน่ง" }} +
+
{{ formDetail?.position || "-" }}
+
+
+
+
+
+ {{ empType === "" ? "ตำแหน่งประเภท" : "กลุ่มงาน" }} +
+
+ {{ formDetail?.posType?.posTypeName || "-" }} +
+
+
+
+
+
+ {{ empType === "" ? "ระดับ" : "ระดับชั้นงาน" }} +
+
+ {{ formDetail?.posLevel?.posLevelName || "-" }} +
+
+
+
+
+ + + + + +
@@ -732,7 +810,7 @@ onMounted(async () => {
- + --> diff --git a/src/modules/05_placement/components/Other/Main.vue b/src/modules/05_placement/components/Other/Main.vue index 3402dd0f4..9af971be0 100644 --- a/src/modules/05_placement/components/Other/Main.vue +++ b/src/modules/05_placement/components/Other/Main.vue @@ -316,7 +316,12 @@ onMounted(() => {
{{ col.value ? col.value : "-" }}
diff --git a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue index 698dce91b..cea4b5420 100644 --- a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue +++ b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue @@ -287,7 +287,7 @@ const pagination = ref({
{{ col.value ? col.value : "-" }}
diff --git a/src/modules/06_retirement/components/resign/Resign.vue b/src/modules/06_retirement/components/resign/Resign.vue index 459aa2327..382f585af 100644 --- a/src/modules/06_retirement/components/resign/Resign.vue +++ b/src/modules/06_retirement/components/resign/Resign.vue @@ -341,7 +341,7 @@ const pagination = ref({ : '' " > - {{ col.value == null ? "" : col.value }} + {{ col.value == null ? "-" : col.value }} diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue index e1ebe3054..530b021b3 100644 --- a/src/modules/06_retirement/views/Main.vue +++ b/src/modules/06_retirement/views/Main.vue @@ -364,7 +364,7 @@ const typeReportChangeName = (val: string) => { {{ props.rowIndex + 1 }} - {{ props.row.signDate }} + {{ props.row.signDate ? props.row.signDate : "-" }} {{ props.row.Date }} diff --git a/src/modules/09_leave/views/LeaveListMain.vue b/src/modules/09_leave/views/LeaveListMain.vue index 859a37831..afba501f3 100644 --- a/src/modules/09_leave/views/LeaveListMain.vue +++ b/src/modules/09_leave/views/LeaveListMain.vue @@ -26,7 +26,7 @@ const leaveStore = useLeavelistDataStore(); -
+
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue b/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue index 0d760227a..c8bd7e48f 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue @@ -348,6 +348,7 @@ const columnsSpeciel = ref([ format: (v) => Number(v).toLocaleString(), }, ]); + const columns = computed(() => { const columnsss = store.roundMainCode === "APR" @@ -371,8 +372,9 @@ const visibleColumns = ref( "remainingAmount", "totalBackup", ] - : [] + : ["org", "total", "chosen", "totalBackup"] ); +const filter = ref(""); function fetchDataDashboard() { showLoader(); @@ -462,59 +464,75 @@ watch([() => props?.snapShot, () => props.roundFilter], () => {
-
-
- - - - +
+
+ + +
+ + + + +
+ +
+
+ + + + +
diff --git a/src/modules/13_salary/components/SalaryLists/Dashboard.vue b/src/modules/13_salary/components/SalaryLists/Dashboard.vue index 63b71215f..7a8aadce1 100644 --- a/src/modules/13_salary/components/SalaryLists/Dashboard.vue +++ b/src/modules/13_salary/components/SalaryLists/Dashboard.vue @@ -360,6 +360,22 @@ const columnsSpeciel = ref([ format: (v) => Number(v).toLocaleString(), }, ]); +const visibleColumns = ref( + store.roundMainCode === "APR" + ? ["org", "total", "chosen", "totalBackup"] + : store.roundMainCode === "OCT" + ? [ + "org", + "currentAmount", + "sixPercentAmount", + "spentAmount", + "sixPercentSpentAmount", + "useAmount", + "remainingAmount", + "totalBackup", + ] + : ["org", "total", "fifteenPercent", "chosen", "remaining", "totalBackup"] +); const columns = computed(() => { const columnsss = store.roundMainCode === "APR" @@ -369,6 +385,7 @@ const columns = computed(() => { : columnsSpeciel.value; return columnsss; }); +const filter = ref(""); /** function fetch ข้อมูลสถิติ*/ function fetchDataDashboard() { @@ -500,58 +517,74 @@ watch([() => props?.snapShot, () => props.roundFilter], () => {
- -
- - - - +
+
+ + +
+ + + + +
+ +
+
+ + + + +
diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue index a73bdf12b..ea12a5b2f 100644 --- a/src/modules/13_salary/components/SalaryLists/TabMain.vue +++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue @@ -356,7 +356,6 @@ function onClickDownload(data: DataOption) { const modalDialogInfoCriteria = ref(false); onMounted(() => { - console.log(props.rootId); if (props.rootId) { fetchDataQuota(store.groupId); fetchDataPeriod(store.groupId); diff --git a/src/modules/13_salary/views/salaryEmployeeLists.vue b/src/modules/13_salary/views/salaryEmployeeLists.vue index c39079c4a..71ec8c671 100644 --- a/src/modules/13_salary/views/salaryEmployeeLists.vue +++ b/src/modules/13_salary/views/salaryEmployeeLists.vue @@ -154,6 +154,8 @@ async function getAgency(id: string) { (await http .get(config.API.activeOrganizationRootById(id)) .then(async (res) => { + agencyOptions.value = []; + agencyOptionsMain.value = []; const data = res.data.result; agencyOptionsMain.value = await [ { @@ -247,13 +249,14 @@ async function onChangeRound() { await getSnap(roundFilter.value.shortCode); await getAgency(roundFilter.value.revisionId); - // await getAgencyPosition(roundFilter.value.revisionId); + await getAgencyPosition(roundFilter.value.revisionId); + if (agencyFilter.value && roundFilter.value.id && snapFilter.value) { - fetchSalalyPeriod( - agencyFilter.value, - roundFilter.value.id, - snapFilter.value - ); + // fetchSalalyPeriod( + // agencyFilter.value, + // roundFilter.value.id, + // snapFilter.value + // ); store.tabType = "PENDING"; store.roundMainCode = roundFilter.value.shortCode; } else { @@ -320,6 +323,7 @@ function filterSelector(val: any, update: Function, refData: string) { switch (refData) { case "agencyFilter": update(() => { + agencyFilter.value = ""; agencyOptions.value = agencyOptionsMain.value.filter( (v: DataOption) => v.name.indexOf(val) > -1 ); diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue index 0bfda6b23..063c2c18d 100644 --- a/src/modules/13_salary/views/salaryLists.vue +++ b/src/modules/13_salary/views/salaryLists.vue @@ -89,8 +89,6 @@ function getRound() { store.roundYear = roundFilter.value.year; store.isClosedRound = roundFilter.value.isClose; - console.log(roundFilter.value); - await getSnap(roundFilter.value.shortCode); await getAgency(roundFilter.value.revisionId); await getAgencyPosition(roundFilter.value.revisionId); @@ -157,6 +155,8 @@ async function getAgency(id: string) { .get(config.API.activeOrganizationRootById(id)) .then(async (res) => { const data = res.data.result; + agencyOptions.value = []; + agencyOptionsMain.value = []; agencyOptionsMain.value = await [ { id: "ALL", @@ -189,14 +189,12 @@ async function getAgencyPosition(id: string) { .get(config.API.keycloakPositionByid(id)) .then(async (res) => { const data = await res.data.result; - store.rootId = data.rootId; const position = agencyOptions.value?.find( (e: DataOption) => e.id === data.rootId ); agencyFilter.value = position ? position.id : "ALL"; - if (agencyFilter.value && roundFilter.value.id && snapFilter.value) { fetchSalalyPeriod( agencyFilter.value, @@ -266,12 +264,8 @@ async function onChangeRound() { } getSnap(roundFilter.value.shortCode); await getAgency(roundFilter.value.revisionId); + await getAgencyPosition(roundFilter.value.revisionId); if (agencyFilter.value && roundFilter.value.id && snapFilter.value) { - fetchSalalyPeriod( - agencyFilter.value, - roundFilter.value.id, - snapFilter.value - ); store.tabType = "PENDING"; store.roundMainCode = roundFilter.value.shortCode; store.roundYear = roundFilter.value.year; @@ -282,6 +276,7 @@ async function onChangeRound() { /** function เปลี่ยนรอบ*/ async function onChangeSnap() { + agencyFilter.value = ""; if (agencyFilter.value && roundFilter.value.id && snapFilter.value) { await fetchSalalyPeriod( agencyFilter.value, @@ -307,29 +302,6 @@ async function onChangeAgency() { } } -/** function onScrollSelect รอบการขึ้นเงินเดือน*/ -function onScroll({ to, ref }: { to: number; ref: any }) { - const lastIndex = roundOptions.value.length - 1; - - if ( - loading.value !== true && - nextPage.value < lastPage.value && - to === lastIndex - ) { - loading.value = true; - - setTimeout(() => { - nextPage.value++; - page.value = nextPage.value; - getRound(); - nextTick(() => { - ref.refresh(); - loading.value = false; - }); - }, 500); - } -} - /** function fetch PeriodQuota*/ function getQuota() { http @@ -340,8 +312,7 @@ function getQuota() { }) .catch((e) => { messageError($q, e); - }) - .finally(() => {}); + }); } /** @@ -354,6 +325,7 @@ function filterSelector(val: string, update: Function, refData: string) { switch (refData) { case "agencyFilter": update(() => { + agencyFilter.value = ""; agencyOptions.value = agencyOptionsMain.value.filter( (v: DataOption) => v.name.indexOf(val) > -1 ); @@ -422,8 +394,6 @@ onMounted(() => { hide-bottom-space bg-color="white" @update:model-value="onChangeRound" - :loading="loading" - @virtual-scroll="onScroll" :disable="!isDisable" > +
diff --git a/src/modules/14_KPI/views/report.vue b/src/modules/14_KPI/views/report.vue index 8afb39273..3e4bf4369 100644 --- a/src/modules/14_KPI/views/report.vue +++ b/src/modules/14_KPI/views/report.vue @@ -324,17 +324,21 @@ const columns = ref([ ]); function onClickModal() { - modal.value = !modal.value; + modal.value = true; if ((modal.value = true)) { fetchListPerson(); } } +function onCloseModal() { + modal.value = false; +} + function fetchListPerson() {} function onSelectPerson(id: string) { persanalId.value = id; - modal.value = false; + onCloseModal(); fetchReport(); } @@ -624,7 +628,7 @@ onMounted(() => { - +