hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop

Browse source
This commit is contained in:
Warunee Tamkoo 2024-11-12 14:08:26 +07:00
commit 96dde8fda5
25 changed files with 59 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/03_recruiting/views/01_compete/Detail.vue
View file

@ -206,9 +206,9 @@ const columns = ref<QTableProps["columns"]>([
},
{
name: "examScore",
align: "right",
align: "center",
label: "คะแนนรวม",
sortable: true,
sortable: false,
field: "examScore",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
@ -220,9 +220,9 @@ const columns = ref<QTableProps["columns"]>([
},
{
name: "examResult",
align: "left",
align: "center",
label: "ผลคะแนนสอบ",
sortable: true,
sortable: false,
field: "examResult",
headerStyle: "font-size: 14px",
style: "font-size: 14px",

13
src/modules/04_registryPerson/components/detail/Employee/02_Employment.vue
View file

@ -34,7 +34,7 @@ const profileId = ref<string>(route.params.id.toString());
/**
* props
*/
const isLeave = defineModel<boolean>("isLeave", {
const isLeave = defineModel<boolean>("isLeave", {
required: true,
});
@ -96,9 +96,9 @@ const formData = reactive<FormEmployment>({
});
/** function fetch ข้อมูลรายการการจ้าง*/
function fetchListEmployment() {
async function fetchListEmployment() {
showLoader();
http
await http
.get(config.API.employmentEmployee(profileId.value))
.then((res) => {
const data = res.data.result;
@ -170,10 +170,9 @@ function onSubmit() {
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
})
.finally(() => {});
});
}
@ -275,7 +274,6 @@ onMounted(() => {
map-options
:options="columns?.slice(0, 2)"
option-value="name"
style="min-width: 140px"
/>
</div>
@ -474,7 +472,6 @@ onMounted(() => {
map-options
:options="columns"
option-value="name"
style="min-width: 140px"
/>
</div>

8
src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
View file

@ -217,9 +217,9 @@ const docOption = ref<DataOption2[]>(store.optionTemplateDoc);
/**
* function fetch รายการ ตำแหน่งเงินเดือน
*/
function fetchListSalary() {
async function fetchListSalary() {
showLoader();
http
await http
.get(config.API.profileListSalaryNew(profileId.value, empType.value))
.then((res) => {
rows.value = res.data.result;
@ -448,13 +448,13 @@ function onSubmit() {
: config.API.profileSalaryNew(empType.value);
const method = isStatusEdit.value ? "patch" : "post";
await http[method](url, formData);
await onClickCloseDialog();
await fetchListSalary();
success($q, "บันทึกข้อมูลสำเร็จ");
await onClickCloseDialog();
} catch (e) {
messageError($q, e);
hideLoader()
} finally {
hideLoader();
}
});
}

7
src/modules/06_retirement/components/resignEMP/ResignByid.vue
View file

@ -526,7 +526,7 @@ onMounted(async () => {
</script>
<template>
<div class="q-gutter-sm q-pa-sm">
<div class="q-pa-sm">
<div class="toptitle text-dark col-12 row items-center">
<q-btn
icon="mdi-arrow-left"
@ -1095,6 +1095,7 @@ onMounted(async () => {
greedy
@submit.prevent
@validation-success="onSubmitAttached"
class="full-width"
>
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
<div class="q-pl-sm text-weight-bold text-dark">
@ -1168,9 +1169,9 @@ onMounted(async () => {
:readonly="!edit"
:borderless="!edit"
v-model="positionTypeOld"
:rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
:rules="[(val:string) => !!val || `${'กรุณากรอกกลุ่มงาน'}`]"
hide-bottom-space
:label="`${'ตำแหน่งประเภท'}`"
:label="`${'กลุ่มงาน'}`"
/>
</div>
</div>

5
src/modules/06_retirement/components/resignEMP/ResignReject.vue
View file

@ -520,6 +520,7 @@ onMounted(async () => {
greedy
@submit.prevent
@validation-success="onSubmitAttached"
class="full-width"
>
<div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
<div class="q-pl-sm text-weight-bold text-dark">
@ -593,9 +594,9 @@ onMounted(async () => {
:readonly="!edit"
:borderless="!edit"
v-model="positionTypeOld"
:rules="[(val:string) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
:rules="[(val:string) => !!val || `${'กรุณากรอกกลุ่มงาน'}`]"
hide-bottom-space
:label="`${'ตำแหน่งประเภท'}`"
:label="`${'กลุ่มงาน'}`"
/>
</div>
</div>

2
src/modules/07_insignia/router.ts
View file

@ -25,7 +25,7 @@ const insigniaBorrow = () =>
const ReportView = () => import("./views/06_ReportMain.vue");
const report_02 = () =>
import("./components/report/ReportDetail.vue");
import("@/modules/07_insignia/components/report/ReportDetail.vue");
export default [
{

11
src/modules/08_registryEmployee/router.ts
View file

@ -1,12 +1,9 @@
/*** Router ระบบทะเบียนประวัติลูกจ้าง (registryEmployee) */
import { defineAsyncComponent } from "vue";
const Main = defineAsyncComponent(
() => import("@/modules/08_registryEmployee/views/Main.vue")
);
const DetailView = defineAsyncComponent(
() => import("@/modules/08_registryEmployee/views/DetailView.vue")
);
const Main = () => import("@/modules/08_registryEmployee/views/Main.vue");
const DetailView = () =>
import("@/modules/08_registryEmployee/views/DetailView.vue");
// const CreateEmployee = defineAsyncComponent(
// () => import("@/modules/08_registryEmployee/views/Add.vue")

4
src/modules/09_leave/components/4_ChangeRound/DialogForm.vue
View file

@ -245,7 +245,7 @@ watch(
dense
ref="roundRef"
:rules="[
(val) => !!val || 'กรุณาเลือกรอบที่ต้องการเปลี่ยน',
(val:string) => !!val || 'กรุณาเลือกรอบที่ต้องการเปลี่ยน',
]"
emit-value
map-options
@ -295,7 +295,7 @@ watch(
"
label="วันที่ให้มีผล"
:rules="[
(val) => !!val || `${'กรุณาเลือกวันที่ให้มีผล'}`,
(val:string) => !!val || `${'กรุณาเลือกวันที่ให้มีผล'}`,
]"
>
<template v-slot:prepend>

21
src/modules/11_discipline/components/1_Complaint/Form.vue
View file

@ -220,10 +220,9 @@ async function getActive() {
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
})
.finally(() => {});
} else {
await getOc(formData.activeId);
}
@ -231,7 +230,6 @@ async function getActive() {
/** ดึงข้อมูลหน่วยงานจาก api */
async function getOc(activeId: string) {
showLoader();
await http
.get(config.API.orgByIdSystem(activeId, route.meta.Key as string))
.then(async (res) => {
@ -244,9 +242,7 @@ async function getOc(activeId: string) {
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
.finally(() => {});
}
/**
@ -262,8 +258,8 @@ function deletePerson(id: string) {
/** ช่องทางการร้องเรียน และฟังก์ชั่นการดึงข้อมูลช่องทางการร้องเรียนมาจาก api*/
function getListChannel() {
http
async function getListChannel() {
await http
.get(
config.API.complaintListOp(
mainStore.pathComplaintsChannal(route.name as string)
@ -379,11 +375,10 @@ watch(props.data, async () => {
});
/** โหลดข้อมูลเมื่อเข้าหน้านี้ */
onMounted(() => {
onMounted(async () => {
mainStore.rowsAdd = [];
getActive();
getListChannel();
await getActive();
await getListChannel();
});
</script>

2
src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
View file

@ -10,7 +10,7 @@ import { useInvestigateFactStore } from "@/modules/11_discipline/store/Investiga
import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
import type { ArrayPersonAdd } from "@/modules/11_discipline/interface/response/investigate";
import type { FormData } from "@/modules/11_discipline/interface/request/InvestigateFact";
import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
import type {
FormData as FormDataComplaint,
ArrayPerson,

12
src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
View file

@ -11,7 +11,7 @@ import { useInvestigateDisStore } from "@/modules/11_discipline/store/Investigat
import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore";
import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
import type { FormData } from "@/modules/11_discipline/interface/request/InvestigateFact";
import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
import type { OptionData } from "@/modules/07_insignia/interface/index/Main";
import CalandarDialog from "@/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue";
@ -338,10 +338,9 @@ async function getActive() {
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
})
.finally(() => {});
}
/** ดึงข้อมูลหน่วยงาน */
@ -359,10 +358,9 @@ async function getOc(activeId: string) {
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
})
.finally(() => {});
}
/** ดึงข้อมูลรายละเอียดสืบสวน */

2
src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
View file

@ -18,7 +18,7 @@ import type {
ArrayPerson,
ArrayFileList,
} from "@/modules/11_discipline/interface/request/complaint";
import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/InvestigateFact";
import type { FormData as FormInvestigateFact } from "@/modules/11_discipline/interface/request/investigateFact";
import PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue";
import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //เรื่องร้องเรียน

11
src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
View file

@ -421,10 +421,9 @@ async function getActive() {
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
})
.finally(() => {});
}
async function getOc(activeId: string) {
@ -439,10 +438,9 @@ async function getOc(activeId: string) {
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
})
.finally(() => {});
}
/** function เรียกรายชื่อกรรมการ*/
@ -491,7 +489,6 @@ async function fetchDListDirector() {
});
}
/**
* function return รายชื่อกรรมการที่เลือก
* @param data รายชื่อกรรมการที่เลือก

2
src/modules/11_discipline/store/ComplaintsStore.ts
View file

@ -9,7 +9,7 @@ import type {
DataList,
DataListRow,
ocListType,
} from "@/modules/11_discipline/interface/response/complaint";
} from "@/modules/11_discipline/interface/response/Complaint";
import type { QTableProps } from "quasar";

2
src/modules/14_KPI/components/Tab/01_Assessment.vue
View file

@ -8,7 +8,7 @@ import http from "@/plugins/http";
import { useCounterMixin } from "@/stores/mixin";
import { useKpiDataStore } from "@/modules/14_KPI/store";
import type { ListCriteria } from "@/modules/14_KPI/interface/request/Index";
import type { ListCriteria } from "@/modules/14_KPI/interface/request/index";
import DialogListCriteria from "@/modules/14_KPI/components/Tab/Dialog/DialogListCriteria.vue";
import Work from "@/modules/14_KPI/components/Tab/Topic/01_Indicator.vue";

2
src/modules/14_KPI/components/Tab/Dialog/03_FormIndicatorSpecial.vue
View file

@ -5,7 +5,7 @@ import { useQuasar } from "quasar";
import config from "@/app.config";
import http from "@/plugins/http";
import type { FormDataAssigned } from "@/modules/14_KPI/interface/request/Index";
import type { FormDataAssigned } from "@/modules/14_KPI/interface/request/index";
import DialogHeader from "@/components/DialogHeader.vue";

2
src/modules/14_KPI/components/Tab/Dialog/04_FormCompetency.vue
View file

@ -2,7 +2,7 @@
import { ref, reactive, onMounted, watch } from "vue";
import DialogHeader from "@/components/DialogHeader.vue";
import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
import type { ListCapacity } from "@/modules/14_KPI/interface/request/Index";
import type { ListCapacity } from "@/modules/14_KPI/interface/request/index";
import { useKpiDataStore } from "@/modules/14_KPI/store";
import { useCounterMixin } from "@/stores/mixin";

2
src/modules/14_KPI/components/Tab/Dialog/DialogCommentProblem.vue
View file

@ -9,7 +9,7 @@ import config from "@/app.config";
import type {
FormComment,
FormCommentByRole,
} from "@/modules/14_KPI/interface/request/Index";
} from "@/modules/14_KPI/interface/request/index";
import { useRoute } from "vue-router";
import { useQuasar } from "quasar";

2
src/modules/14_KPI/components/Tab/Dialog/DialogCommentProgress.vue
View file

@ -12,7 +12,7 @@ import { useKpiDataStore } from "@/modules/14_KPI/store";
import type {
FormComment,
FormCommentByRole,
} from "@/modules/14_KPI/interface/request/Index";
} from "@/modules/14_KPI/interface/request/index";
const $q = useQuasar();
const store = useKpiDataStore();

4
src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
View file

@ -407,7 +407,7 @@ watch(
dense
label="คำค้น"
:rules="[
(val) => !!val || !searchRules || `กรุณากรอกคำค้น`,
(val:string) => !!val || !searchRules || `กรุณากรอกคำค้น`,
]"
>
<template v-slot:after>
@ -567,7 +567,7 @@ watch(
hide-bottom-space
lazy-rules
:rules="[
(val) => !!val.id || `${'กรุณาเลือกรอบการประเมิน'}`,
(val:string) => !!val || `${'กรุณาเลือกรอบการประเมิน'}`,
]"
@update:model-value="checkClosed"
/>

2
src/modules/14_KPI/components/Tab/DialogEvaluate/02_Competenct.vue
View file

@ -8,7 +8,7 @@ import { useKpiDataStore } from "@/modules/14_KPI/store";
import http from "@/plugins/http";
import config from "@/app.config";
import type { ListCriteria } from "@/modules/14_KPI/interface/request/Index";
import type { ListCriteria } from "@/modules/14_KPI/interface/request/index";
import DialogHeader from "@/components/DialogHeader.vue";

2
src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
View file

@ -12,7 +12,7 @@ import type {
FormCapacityList,
ListCriteria,
DataOptions,
} from "@/modules/14_KPI/interface/request/Index";
} from "@/modules/14_KPI/interface/request/index";
import DialogListCriteria from "@/modules/14_KPI/components/Tab/Dialog/DialogListCriteria.vue";
import DialogCompetncyByRow from "@/modules/14_KPI/components/Tab/Dialog/DialogCompetncyByRow.vue";

2
src/modules/14_KPI/components/results/tableIndividual.vue
View file

@ -16,7 +16,7 @@ import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
import type {
ResRound,
ResDevelopment,
} from "@/modules/14_KPI/interface/response/Index";
} from "@/modules/14_KPI/interface/response/index";
/**
* importComponents

2
src/modules/14_KPI/store.ts
View file

@ -1,7 +1,7 @@
import { defineStore } from "pinia";
import { ref, reactive } from "vue";
import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
import type { FormQuery } from "@/modules/14_KPI/interface/request/Index";
import type { FormQuery } from "@/modules/14_KPI/interface/request/index";
export const useKpiDataStore = defineStore("KPIDataAdmin", () => {
const tabMainevaluator = ref<string>("1");

2
src/modules/14_KPI/views/detail.vue
View file

@ -10,7 +10,7 @@ import { useCounterMixin } from "@/stores/mixin";
import { useKpiDataStore } from "@/modules/14_KPI/store";
import DialogHeader from "@/components/DialogHeader.vue";
import type { FormProfile } from "@/modules/14_KPI/interface/request/Index";
import type { FormProfile } from "@/modules/14_KPI/interface/request/index";
import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
// const modalScore = ref<boolean>(false);