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

Merge branch 'nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-11-12 14:01:26 +07:00
commit d3cc08fdaf
17 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -1,12 +1,9 @@
/*** Router ระบบทะเบียนประวัติลูกจ้าง (registryEmployee) */ /*** Router ระบบทะเบียนประวัติลูกจ้าง (registryEmployee) */
import { defineAsyncComponent } from "vue";
const Main = defineAsyncComponent( const Main = () => import("@/modules/08_registryEmployee/views/Main.vue");
() => import("@/modules/08_registryEmployee/views/Main.vue")
); const DetailView = () =>
const DetailView = defineAsyncComponent( import("@/modules/08_registryEmployee/views/DetailView.vue");
() => import("@/modules/08_registryEmployee/views/DetailView.vue")
);
// const CreateEmployee = defineAsyncComponent( // const CreateEmployee = defineAsyncComponent(
// () => import("@/modules/08_registryEmployee/views/Add.vue") // () => 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 dense
ref="roundRef" ref="roundRef"
:rules="[ :rules="[
(val) => !!val || 'กรุณาเลือกรอบที่ต้องการเปลี่ยน', (val:string) => !!val || 'กรุณาเลือกรอบที่ต้องการเปลี่ยน',
]" ]"
emit-value emit-value
map-options map-options
@ -295,7 +295,7 @@ watch(
" "
label="วันที่ให้มีผล" label="วันที่ให้มีผล"
:rules="[ :rules="[
(val) => !!val || `${'กรุณาเลือกวันที่ให้มีผล'}`, (val:string) => !!val || `${'กรุณาเลือกวันที่ให้มีผล'}`,
]" ]"
> >
<template v-slot:prepend> <template v-slot:prepend>

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 { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
import type { ArrayPersonAdd } from "@/modules/11_discipline/interface/response/investigate"; 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 { import type {
FormData as FormDataComplaint, FormData as FormDataComplaint,
ArrayPerson, ArrayPerson,

2
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 { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore";
import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main"; 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 type { OptionData } from "@/modules/07_insignia/interface/index/Main";
import CalandarDialog from "@/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue"; import CalandarDialog from "@/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue";

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

@ -18,7 +18,7 @@ import type {
ArrayPerson, ArrayPerson,
ArrayFileList, ArrayFileList,
} from "@/modules/11_discipline/interface/request/complaint"; } 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 PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue";
import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //เรื่องร้องเรียน import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //เรื่องร้องเรียน

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 { useCounterMixin } from "@/stores/mixin";
import { useKpiDataStore } from "@/modules/14_KPI/store"; 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 DialogListCriteria from "@/modules/14_KPI/components/Tab/Dialog/DialogListCriteria.vue";
import Work from "@/modules/14_KPI/components/Tab/Topic/01_Indicator.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 config from "@/app.config";
import http from "@/plugins/http"; 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"; 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 { ref, reactive, onMounted, watch } from "vue";
import DialogHeader from "@/components/DialogHeader.vue"; import DialogHeader from "@/components/DialogHeader.vue";
import type { DataOption } from "@/modules/14_KPI/interface/index/Main"; 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 { useKpiDataStore } from "@/modules/14_KPI/store";
import { useCounterMixin } from "@/stores/mixin"; 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 { import type {
FormComment, FormComment,
FormCommentByRole, FormCommentByRole,
} from "@/modules/14_KPI/interface/request/Index"; } from "@/modules/14_KPI/interface/request/index";
import { useRoute } from "vue-router"; import { useRoute } from "vue-router";
import { useQuasar } from "quasar"; 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 { import type {
FormComment, FormComment,
FormCommentByRole, FormCommentByRole,
} from "@/modules/14_KPI/interface/request/Index"; } from "@/modules/14_KPI/interface/request/index";
const $q = useQuasar(); const $q = useQuasar();
const store = useKpiDataStore(); const store = useKpiDataStore();

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

@ -407,7 +407,7 @@ watch(
dense dense
label="คำค้น" label="คำค้น"
:rules="[ :rules="[
(val) => !!val || !searchRules || `กรุณากรอกคำค้น`, (val:string) => !!val || !searchRules || `กรุณากรอกคำค้น`,
]" ]"
> >
<template v-slot:after> <template v-slot:after>
@ -567,7 +567,7 @@ watch(
hide-bottom-space hide-bottom-space
lazy-rules lazy-rules
:rules="[ :rules="[
(val) => !!val.id || `${'กรุณาเลือกรอบการประเมิน'}`, (val:string) => !!val || `${'กรุณาเลือกรอบการประเมิน'}`,
]" ]"
@update:model-value="checkClosed" @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 http from "@/plugins/http";
import config from "@/app.config"; 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"; 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, FormCapacityList,
ListCriteria, ListCriteria,
DataOptions, 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 DialogListCriteria from "@/modules/14_KPI/components/Tab/Dialog/DialogListCriteria.vue";
import DialogCompetncyByRow from "@/modules/14_KPI/components/Tab/Dialog/DialogCompetncyByRow.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 { import type {
ResRound, ResRound,
ResDevelopment, ResDevelopment,
} from "@/modules/14_KPI/interface/response/Index"; } from "@/modules/14_KPI/interface/response/index";
/** /**
* importComponents * importComponents

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

@ -1,7 +1,7 @@
import { defineStore } from "pinia"; import { defineStore } from "pinia";
import { ref, reactive } from "vue"; import { ref, reactive } from "vue";
import type { DataOption } from "@/modules/14_KPI/interface/index/Main"; 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", () => { export const useKpiDataStore = defineStore("KPIDataAdmin", () => {
const tabMainevaluator = ref<string>("1"); 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 { useKpiDataStore } from "@/modules/14_KPI/store";
import DialogHeader from "@/components/DialogHeader.vue"; 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"; import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
// const modalScore = ref<boolean>(false); // const modalScore = ref<boolean>(false);