diff --git a/src/modules/06_evaluate/components/viewstep/viewStep1.vue b/src/modules/06_evaluate/components/viewstep/viewStep1.vue index dfc9002..8cfc4c8 100644 --- a/src/modules/06_evaluate/components/viewstep/viewStep1.vue +++ b/src/modules/06_evaluate/components/viewstep/viewStep1.vue @@ -28,7 +28,7 @@ const { columnsCertificates, columnSalaries, columnTraining, - columnProjectsProposed, + columnExperience, columnAssessments, } = store; @@ -63,6 +63,7 @@ const formDetail = reactive({ salaries: [], trainings: [], assessments: [], + experience: [], honor: [], }); @@ -164,27 +165,7 @@ async function fetchCheckSpec(data: any) { issueDate: date2Thai(e.issueDate), issuer: e.issuer, })); - formDetail.salaries = data.salaries - // .map((e: any) => ({ - // amount: e.amount, - // date: e.date, - // mouthSalaryAmount: e.mouthSalaryAmount ? e.mouthSalaryAmount : 0, - // posNo: e.posNo, - // position: e.position, - // positionSalaryAmount: e.positionSalaryAmount ? e.positionSalaryAmount : 0, - // refCommandDate: e.refCommandDate ? e.refCommandDate : "", - // salaryClass: e.salaryClass ? e.salaryClass : "", - // salaryRef: e.salaryRef ? e.salaryRef : "", - // salaryStatus: e.salaryStatus ? e.salariesStatus : "", - // // - // oc: "-", - // lineWork: "-", - // side: "-", - // positionType: "-", - // level: "-", - // positionsAdministrative: "-", - // aspectAdministrative: "-", - // })); + formDetail.salaries = data.salaries; formDetail.trainings = data.trainings.map((e: any) => ({ dateOrder: date2Thai(e.dateOrder), department: e.department, @@ -577,7 +558,11 @@ onMounted(async () => { ประสบการณ์ในการปฏิบัติงาน
-
-
+ diff --git a/src/modules/06_evaluate/stores/evaluteDetail.ts b/src/modules/06_evaluate/stores/evaluteDetail.ts index 0fea3e6..02aa6df 100644 --- a/src/modules/06_evaluate/stores/evaluteDetail.ts +++ b/src/modules/06_evaluate/stores/evaluteDetail.ts @@ -9,6 +9,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => { const mixin = useCounterMixin(); const { date2Thai, findOrgNameHtml, findOrgName } = mixin; + //ใบอนุญาตประกอบวิชาชีพ const columnsCertificates = ref([ { name: "certificateType", @@ -57,6 +58,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => { }, ]); + //ประวัติการรับราชการ const columnSalaries = ref([ { name: "commandDateAffect", @@ -237,6 +239,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => { }, ]); + //ประวัติการฝึกอบรมดูงาน const columnTraining = ref([ { name: "name", @@ -354,7 +357,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => { }, ]); - /** ผลงานที่เคยเสนอขอประเมิน (ถ้ามี)*/ + //ผลงานที่เคยเสนอขอประเมิน (ถ้ามี) const columnAssessments = ref([ { name: "date", @@ -448,6 +451,28 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => { }, ]); + //ประสบการณ์ในการปฏิบัติงาน + const columnExperience = ref([ + { + name: "name", + align: "left", + label: "ชื่อผลงาน", + sortable: true, + field: "name", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, + { + name: "detail", + align: "left", + label: "รายละเอียดผลงาน", + sortable: true, + field: "detail", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, + ]); + function textRangePoint(val: number | undefined) { if (val == undefined) val = -1; if (val < 60.0) return "(คะแนนต่ำกว่าร้อยละ 60.00)"; @@ -473,6 +498,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => { columnSalaries, columnTraining, columnProjectsProposed, + columnExperience, columnAssessments, }; });