From b31c3b847cc17b3a7619839fdb63f4676b67f10a Mon Sep 17 00:00:00 2001 From: "STW_TTTY\\stwtt" Date: Fri, 28 Jun 2024 18:14:53 +0700 Subject: [PATCH 1/3] no message --- src/modules/06_evaluate/components/viewstep/viewStep1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/06_evaluate/components/viewstep/viewStep1.vue b/src/modules/06_evaluate/components/viewstep/viewStep1.vue index 5fe08bb..e958963 100644 --- a/src/modules/06_evaluate/components/viewstep/viewStep1.vue +++ b/src/modules/06_evaluate/components/viewstep/viewStep1.vue @@ -115,7 +115,7 @@ async function fetchDetail() { salaryRef: e.salaryRef ? e.salaryRef : "", salaryStatus: e.salaryStatus ? e.salariesStatus : "", // - oc: "-",//ไม่มี + oc: "",//ไม่มี lineWork: e.positionLine ? e.positionLine : "-", side: e.positionPathSide ? e.positionPathSide : "-", positionType: e.positionType ? e.positionType : "-", @@ -123,7 +123,7 @@ async function fetchDetail() { positionsAdministrative: e.positionExecutive ? e.positionExecutive : "-", - aspectAdministrative: "-",//ไม่มี + aspectAdministrative: "",//ไม่มี })); console.log( "🚀 ~ formDetail.salaries=res.data.result.map ~ formDetail.salaries:", From c99fa4493c012cdadb1566578a234506ec946d71 Mon Sep 17 00:00:00 2001 From: "STW_TTTY\\stwtt" Date: Fri, 28 Jun 2024 19:04:04 +0700 Subject: [PATCH 2/3] no message --- .../components/EvaluateStepMain.vue | 9 ++-- .../components/viewstep/viewStep1.vue | 51 +++++++++---------- .../06_evaluate/stores/evaluteDetail.ts | 18 +++++-- 3 files changed, 42 insertions(+), 36 deletions(-) diff --git a/src/modules/06_evaluate/components/EvaluateStepMain.vue b/src/modules/06_evaluate/components/EvaluateStepMain.vue index 1a948ff..55fc7a8 100644 --- a/src/modules/06_evaluate/components/EvaluateStepMain.vue +++ b/src/modules/06_evaluate/components/EvaluateStepMain.vue @@ -62,9 +62,9 @@ function onClickPopupHistory() { /** function NextToStep*/ async function onCilckNextStep() { const functionCreateDoc: (() => Promise) | null = - // store.step === 1 - // ? await saveStep1 - // : + store.step === 1 + ? await saveStep1 + : store.step === 3 ? await saveStep3 : store.step === 7 @@ -231,6 +231,7 @@ async function updateCheckSpec(data: FormSpec) { */ function updateFormDetail(data: any) { formDetail.value = data; + console.log("🚀 ~ updateFormDetail ~ data:", data) } /** function เช็คการการคุณสมบัติ*/ function checkSelectForm() { @@ -267,7 +268,7 @@ async function saveStep1() { country: e.country, degree: e.degree, duration: e.duration, - durationYear: e.durationYear.toString(), + durationYear: e.durationYear, educationLevel: e.educationLevel, endDate: e.endDate, field: e.field, diff --git a/src/modules/06_evaluate/components/viewstep/viewStep1.vue b/src/modules/06_evaluate/components/viewstep/viewStep1.vue index e958963..f90fe6e 100644 --- a/src/modules/06_evaluate/components/viewstep/viewStep1.vue +++ b/src/modules/06_evaluate/components/viewstep/viewStep1.vue @@ -75,11 +75,13 @@ async function fetchDetail() { formDetail.citizenId = data.citizenId; formDetail.prefix = data.prefix; formDetail.fullName = `${data.firstName} ${data.lastName}`; + formDetail.firstName = data.firstName + formDetail.lastName = data.lastName formDetail.position = data.position; formDetail.oc = data.rootShortName; formDetail.positionLevel = data.posLevelName; formDetail.posNo = data.rootShortName + data.posMasterNo; - formDetail.birthDate = data.birthDate && date2Thai(data.birthDate); + formDetail.birthDate = data.birthDate formDetail.govAge = data.govAge; // ยังไม่มี http.get(config.API.dataUserEducations).then((res) => { @@ -91,8 +93,8 @@ async function fetchDetail() { (e: CertificatesForm) => ({ certificateNo: e.certificateNo, certificateType: e.certificateType, - expireDate: date2Thai(e.expireDate), - issueDate: date2Thai(e.issueDate), + expireDate: e.expireDate, + issueDate: e.issueDate, issuer: e.issuer, }) ); @@ -101,35 +103,28 @@ async function fetchDetail() { http.get(config.API.dataUserSalary).then((res) => { formDetail.salaries = res.data.result.map((e: any) => ({ amount: e.amount, - date: date2Thai(e.date), + 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 : "", + refCommandDate: e.refCommandDate, - refCommandNo: e.refCommandNo ? e.refCommandNo : "", - salaryClass: e.salaryClass ? e.salaryClass : "", - salaryRef: e.salaryRef ? e.salaryRef : "", - salaryStatus: e.salaryStatus ? e.salariesStatus : "", + refCommandNo: e.refCommandNo, + salaryClass: e.salaryClass, + salaryRef: e.salaryRef, + salaryStatus: e.salaryStatus, // oc: "",//ไม่มี - lineWork: e.positionLine ? e.positionLine : "-", - side: e.positionPathSide ? e.positionPathSide : "-", - positionType: e.positionType ? e.positionType : "-", - level: e.positionLevel ? e.positionLevel : "-", - positionsAdministrative: e.positionExecutive - ? e.positionExecutive - : "-", + lineWork: e.positionLine, + side: e.positionPathSide, + positionType: e.positionType, + level: e.positionLevel, + positionsAdministrative: e.positionExecutive, aspectAdministrative: "",//ไม่มี })); - console.log( - "🚀 ~ formDetail.salaries=res.data.result.map ~ formDetail.salaries:", - formDetail.salaries - ); - formDetail.salary = formDetail.salaries ? formattedNumber( formDetail.salaries[formDetail.salaries.length - 1].amount @@ -139,20 +134,20 @@ async function fetchDetail() { http.get(config.API.dataUserCertificate("training")).then((res) => { formDetail.trainings = res.data.result.map((e: any) => ({ - dateOrder: date2Thai(e.dateOrder), + dateOrder: e.dateOrder, department: e.department, duration: e.duration, - endDate: date2Thai(e.endDate), + endDate: e.endDate, name: e.name, numberOrder: e.numberOrder, place: e.place, - startDate: date2Thai(e.startDate), + startDate: e.startDate, topic: e.topic, yearly: e.yearly, })); }); // formDetail.assessments = data.assessments; - emit("update:formDeital", data); + emit("update:formDeital", formDetail); }) .catch((err) => { messageError($q, err); @@ -178,7 +173,7 @@ async function fetchCheckSpec(data: any) { formDetail.salary = data.salary ? formattedNumber(data.salary) : ""; formDetail.positionLevel = data.positionLevel; formDetail.posNo = data.posNo; - formDetail.birthDate = data.birthDate && date2Thai(data.birthDate); + formDetail.birthDate = data.birthDate formDetail.educations = data.educations; formDetail.certificates = data.certificates.map((e: CertificatesForm) => ({ @@ -190,7 +185,7 @@ async function fetchCheckSpec(data: any) { })); formDetail.salaries = data.salaries.map((e: any) => ({ amount: e.amount, - date: date2Thai(e.date), + date: e.date, mouthSalaryAmount: e.mouthSalaryAmount ? e.mouthSalaryAmount : 0, posNo: e.posNo, position: e.position, @@ -297,7 +292,7 @@ onMounted(async () => {
diff --git a/src/modules/06_evaluate/stores/evaluteDetail.ts b/src/modules/06_evaluate/stores/evaluteDetail.ts index 35ce4b2..cf7372d 100644 --- a/src/modules/06_evaluate/stores/evaluteDetail.ts +++ b/src/modules/06_evaluate/stores/evaluteDetail.ts @@ -2,9 +2,13 @@ import { defineStore } from "pinia"; import { ref } from "vue"; import type { QTableProps } from "quasar"; +import { useCounterMixin } from "@/stores/mixin"; export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => { /** columns TableViewStep1*/ + const mixin = useCounterMixin(); + const { date2Thai } = mixin; + const columnsCertificates = ref([ { name: "certificateType", @@ -38,7 +42,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => { align: "left", label: "วันที่ออกใบอนุญาต", sortable: true, - field: "issueDate", + field: (value) => date2Thai(value), headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -47,7 +51,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => { align: "left", label: "วันที่หมดอายุ", sortable: true, - field: "expireDate", + field: (value) => date2Thai(value), headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -60,6 +64,9 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => { label: "วัน เดือน ปี", sortable: false, field: "date", + format(val, row) { + return date2Thai(row.date) + }, headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -170,7 +177,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => { align: "left", label: "วันเริ่มต้นการฝึกอบรม/ดูงาน", sortable: true, - field: "startDate", + field: (value) => date2Thai(value), headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -179,7 +186,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => { align: "left", label: "วันสิ้นสุดการฝึกอบรม/ดูงาน", sortable: true, - field: "endDate", + field: (value) => date2Thai(value), headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -189,6 +196,9 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => { label: "ปีที่อบรม/ดูงาน", sortable: true, field: "yearly", + format(val, row) { + return row.yearly + 543 + }, headerStyle: "font-size: 14px", style: "font-size: 14px", }, From 9ba58b4ba2a639e6fd84fc095f05e7dc446a3c36 Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Fri, 28 Jun 2024 19:06:35 +0700 Subject: [PATCH 3/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=20path=20=E0=B9=83=E0=B8=99=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app.config.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app.config.ts b/src/app.config.ts index 9dde560..86d2a17 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -36,7 +36,7 @@ const generatePopupPath = (routeName: any) => { return `${path}/manual/chapter-2-admin-metadata`; } if (routeName.includes("leave")) { - return `${path}/manual/chapter-3-user-leave`; + return `${path}/manual/chapter-4-user-leave`; } // if (routeName.includes("compete")) { // return `${path}/manual/chapter-10-admin-recruit`; @@ -54,6 +54,7 @@ const generatePopupPath = (routeName: any) => { const manualConfig = { dashboard: `${path}/manual/chapter-1-user-organization-chart`, + leave: `${path}/manual/chapter-4-user-leave`, }; export default {