diff --git a/src/modules/01_dashboard/views/Dashboard.vue b/src/modules/01_dashboard/views/Dashboard.vue index 2cfe962..39e0fd0 100644 --- a/src/modules/01_dashboard/views/Dashboard.vue +++ b/src/modules/01_dashboard/views/Dashboard.vue @@ -241,7 +241,9 @@ const thaiOptions: Intl.DateTimeFormatOptions = { กล่องข้อความ -
ทั้งหมด {{ totalInbox }} ข้อความ
+
+ ทั้งหมด {{ totalInbox }} ข้อความ +
@@ -308,7 +310,7 @@ const thaiOptions: Intl.DateTimeFormatOptions = { icon="mdi-reply" size="10px" color="grey-7" - @click="dialogRepleOpen(item.no)" + @click.stop.prevent="dialogRepleOpen(item.no)" > ตอบกลับข้อความ diff --git a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue index ef6a3b4..0441e79 100644 --- a/src/modules/05_leave/components/FormLeave/10_TrainForm.vue +++ b/src/modules/05_leave/components/FormLeave/10_TrainForm.vue @@ -14,14 +14,14 @@ const $q = useQuasar(); const router = useRouter(); const mixin = useCounterMixin(); const { - date2Thai, - dialogRemove, - arabicNumberToText, - calculateDurationYmd, - fails, - dateToISO, - success, - messageError, + date2Thai, + dialogRemove, + arabicNumberToText, + calculateDurationYmd, + fails, + dateToISO, + success, + messageError, } = mixin; const edit = ref(true); const files = ref(null); @@ -29,44 +29,44 @@ const leaveId = ref(""); /** รับ props มาจากหน้าหลัก */ const props = defineProps({ - data: { - type: Object, - default: null, - }, - onSubmit: { - type: Function, - default: () => "", - }, - onConfirm: { - type: Function, - default: () => "", - }, - clickDelete: { - type: Function, - default: () => "", - }, + data: { + type: Object, + default: null, + }, + onSubmit: { + type: Function, + default: () => "", + }, + onConfirm: { + type: Function, + default: () => "", + }, + clickDelete: { + type: Function, + default: () => "", + }, }); /** ข้อมูล v-model ของฟอร์ม */ const formDataTrain = reactive({ - type: dataStore.typeId, - leaveWrote: "", - leaveStartDate: null, - leaveEndDate: null, - leavebirthDate: new Date(), - leavegovernmentDate: new Date(), - leaveSalary: 10000, - leaveSalaryText: arabicNumberToText(10000), - leaveNumber: "", - leaveAddress: "", - studyDayScholarship: "", - studyDayCountry: "", - studyDayTrainingSubject: "", - studyDayTrainingName: "", - leaveDocument: [], - leaveDetail: "", - leaveTotal: "", //จำนวนวันลา - leaveTotalDay: "", //จำนวนวันลา + type: dataStore.typeId, + leaveWrote: "", + leaveStartDate: null, + leaveEndDate: null, + leavebirthDate: new Date(), + leavegovernmentDate: new Date(), + leaveSalary: 10000, + leaveSalaryText: arabicNumberToText(10000), + leaveNumber: "", + leaveAddress: "", + studyDayScholarship: "", + studyDayCountry: "", + studyDayTrainingSubject: "", + studyDayTrainingName: "", + leaveDocument: [], + leaveDetail: "", + leaveTotal: "", //จำนวนวันลา + leaveTotalDay: "", //จำนวนวันลา }); /** ตัวแปร ref สำหรับแสดง validate */ @@ -84,79 +84,79 @@ const leaveWroteRef = ref(null); /** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */ const formRef: TrainForm = { - leaveStartDate: leaveStartDateRef, - leaveEndDate: leaveEndDateRef, - leavebirthDate: leavebirthDateRef, - leavegovernmentDate: leavegovernmentDateRef, - leaveNumber: leaveNumberRef, - leaveAddress: leaveAddressRef, - studyDayScholarship: studyDayScholarshipRef, - studyDayCountry: studyDayCountryRef, - studyDayTrainingSubject: studyDayTrainingSubjectRef, - studyDayTrainingName: studyDayTrainingNameRef, - leaveWrote: leaveWroteRef, + leaveStartDate: leaveStartDateRef, + leaveEndDate: leaveEndDateRef, + leavebirthDate: leavebirthDateRef, + leavegovernmentDate: leavegovernmentDateRef, + leaveNumber: leaveNumberRef, + leaveAddress: leaveAddressRef, + studyDayScholarship: studyDayScholarshipRef, + studyDayCountry: studyDayCountryRef, + studyDayTrainingSubject: studyDayTrainingSubjectRef, + studyDayTrainingName: studyDayTrainingNameRef, + leaveWrote: leaveWroteRef, }; /** ส่วนของการประกาศและเลือกไฟล์เอกสารประกอบ */ const nameFile = ref(""); const fileDocDataUpload = ref([]); const fileUploadDoc = async (files: any) => { - files.forEach((file: any) => { - fileDocDataUpload.value.push(file); - }); + files.forEach((file: any) => { + fileDocDataUpload.value.push(file); + }); }; /** ฟังก์ชั่นตรวจสอบความถูกต้องก่อน บันทึก */ function onValidate() { - const hasError = []; + const hasError = []; - for (const key in formRef) { - if (Object.prototype.hasOwnProperty.call(formRef, key)) { - const property = formRef[key]; - if (property.value && typeof property.value.validate === "function") { - const isValid = property.value.validate(); - hasError.push(isValid); - } - } - } - if (hasError.every((result) => result === true)) { - const formData = new FormData(); - if (formDataTrain.leaveDocument) { - formDataTrain.leaveDocument.forEach((file: File) => { - formData.append("leaveDocument", file); - }); - } - // formData.append("leaveDocument", formDataTrain.leaveDocument); - formData.append("type", formDataTrain.type); // - formData.append( - "leaveStartDate", - dateToISO(new Date(formDataTrain.leaveStartDate)) - ); // - formData.append( - "leaveEndDate", - dateToISO(new Date(formDataTrain.leaveEndDate)) - ); // - formData.append("studyDayCountry", formDataTrain.studyDayCountry); - // formData.append( - // "leavegovernmentDate", - // dateToISO(formDataTrain.leavegovernmentDate) - // ); - // formData.append("leavebirthDate", dateToISO(new Date(formDataTrain.leavebirthDate))); - formData.append("studyDayTrainingName", formDataTrain.studyDayTrainingName); - formData.append( - "studyDayTrainingSubject", - formDataTrain.studyDayTrainingSubject - ); - formData.append("leaveWrote", formDataTrain.leaveWrote); // - formData.append("leaveDetail", formDataTrain.leaveDetail); // - formData.append("studyDayScholarship", formDataTrain.studyDayScholarship); - formData.append("leaveAddress", formDataTrain.leaveAddress); // - formData.append("leaveNumber", formDataTrain.leaveNumber); // - formData.append("leaveSalaryText", formDataTrain.leaveSalaryText); // - formData.append("leaveSalary", formDataTrain.leaveSalary); // - formData.append("leaveTotal", formDataTrain.leaveTotalDay); // - props.onSubmit(formData, isLeave.value); - } + for (const key in formRef) { + if (Object.prototype.hasOwnProperty.call(formRef, key)) { + const property = formRef[key]; + if (property.value && typeof property.value.validate === "function") { + const isValid = property.value.validate(); + hasError.push(isValid); + } + } + } + if (hasError.every((result) => result === true)) { + const formData = new FormData(); + if (formDataTrain.leaveDocument) { + formDataTrain.leaveDocument.forEach((file: File) => { + formData.append("leaveDocument", file); + }); + } + // formData.append("leaveDocument", formDataTrain.leaveDocument); + formData.append("type", formDataTrain.type); // + formData.append( + "leaveStartDate", + dateToISO(new Date(formDataTrain.leaveStartDate)) + ); // + formData.append( + "leaveEndDate", + dateToISO(new Date(formDataTrain.leaveEndDate)) + ); // + formData.append("studyDayCountry", formDataTrain.studyDayCountry); + // formData.append( + // "leavegovernmentDate", + // dateToISO(formDataTrain.leavegovernmentDate) + // ); + // formData.append("leavebirthDate", dateToISO(new Date(formDataTrain.leavebirthDate))); + formData.append("studyDayTrainingName", formDataTrain.studyDayTrainingName); + formData.append( + "studyDayTrainingSubject", + formDataTrain.studyDayTrainingSubject + ); + formData.append("leaveWrote", formDataTrain.leaveWrote); // + formData.append("leaveDetail", formDataTrain.leaveDetail); // + formData.append("studyDayScholarship", formDataTrain.studyDayScholarship); + formData.append("leaveAddress", formDataTrain.leaveAddress); // + formData.append("leaveNumber", formDataTrain.leaveNumber); // + formData.append("leaveSalaryText", formDataTrain.leaveSalaryText); // + formData.append("leaveSalary", formDataTrain.leaveSalary); // + formData.append("leaveTotal", formDataTrain.leaveTotalDay); // + props.onSubmit(formData, isLeave.value); + } } /** @@ -166,562 +166,562 @@ function onValidate() { const isLeave = ref(true); async function fetchCheck() { - await http - .post(config.API.leaveCheck(), { - type: dataStore.typeId ?? null, - StartLeaveDate: formDataTrain.leaveStartDate ?? null, - EndLeaveDate: formDataTrain.leaveEndDate ?? null, - }) - .then((res: any) => { - const data = res.data.result; - isLeave.value = data.isLeave; - formDataTrain.leaveTotalDay = data.totalDate; - }) - .catch((e: any) => { - messageError($q, e); - }); + await http + .post(config.API.leaveCheck(), { + type: dataStore.typeId ?? null, + StartLeaveDate: formDataTrain.leaveStartDate ?? null, + EndLeaveDate: formDataTrain.leaveEndDate ?? null, + }) + .then((res: any) => { + const data = res.data.result; + isLeave.value = data.isLeave; + formDataTrain.leaveTotalDay = data.totalDate; + }) + .catch((e: any) => { + messageError($q, e); + }); } /** * function อัพเดทค่า LeaveTotal */ function updateLeaveTotal() { - const newLeaveTotal = calculateDurationYmd( - formDataTrain.leaveStartDate, - formDataTrain.leaveEndDate - ); - formDataTrain.leaveTotal = newLeaveTotal; + const newLeaveTotal = calculateDurationYmd( + formDataTrain.leaveStartDate, + formDataTrain.leaveEndDate + ); + formDataTrain.leaveTotal = newLeaveTotal; } /** * แปลงตัวเลขเงินเดือน */ const formattedSalary = computed(() => { - return formDataTrain.leaveSalary !== null - ? formDataTrain.leaveSalary.toLocaleString("th-TH") - : ""; + return formDataTrain.leaveSalary !== null + ? formDataTrain.leaveSalary.toLocaleString("th-TH") + : ""; }); /** แจ้งเมื่อวันลาไม่ถูกต้อง */ const dateEndInputStyle = computed(() => { - return !isLeave.value ? "input-alert" : ""; + return !isLeave.value ? "input-alert" : ""; }); /** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่ฟอร์มไหม เมื่อมีการส่งจะ map ข้อมูลเข้า v-model ของฟอร์ม */ const leaveDocumentList = ref(); const statusCheck = ref(""); watch(props.data, async () => { - if (props.data) { - formDataTrain.leaveWrote = props.data.leaveWrote; - formDataTrain.leaveStartDate = props.data.leaveStartDate; - formDataTrain.leaveEndDate = props.data.leaveEndDate; - formDataTrain.leaveTotal = props.data.leaveTotal; - formDataTrain.leavebirthDate = props.data.leavebirthDate; - formDataTrain.leavegovernmentDate = props.data.leavegovernmentDate; - formDataTrain.leaveSalary = props.data.leaveSalary; - formDataTrain.leaveSalaryText = props.data.leaveSalaryText; - formDataTrain.leaveNumber = props.data.leaveNumber; - formDataTrain.leaveAddress = props.data.leaveAddress; - formDataTrain.studyDayScholarship = props.data.studyDayScholarship; - formDataTrain.studyDayCountry = props.data.studyDayCountry; - formDataTrain.studyDayTrainingSubject = props.data.studyDayTrainingSubject; - formDataTrain.studyDayTrainingName = props.data.studyDayTrainingName; - formDataTrain.leaveDetail = props.data.leaveDetail; - formDataTrain.leaveDocument = []; - const leaveTotal = await calculateDurationYmd( - props.data.leaveStartDate, - props.data.leaveEndDate - ); - formDataTrain.leaveTotal = leaveTotal; - leaveDocumentList.value = props.data.leaveDocument; - statusCheck.value = props.data.status; - } + if (props.data) { + formDataTrain.leaveWrote = props.data.leaveWrote; + formDataTrain.leaveStartDate = props.data.leaveStartDate; + formDataTrain.leaveEndDate = props.data.leaveEndDate; + formDataTrain.leaveTotal = props.data.leaveTotal; + formDataTrain.leavebirthDate = props.data.leavebirthDate; + formDataTrain.leavegovernmentDate = props.data.leavegovernmentDate; + formDataTrain.leaveSalary = props.data.leaveSalary; + formDataTrain.leaveSalaryText = props.data.leaveSalaryText; + formDataTrain.leaveNumber = props.data.leaveNumber; + formDataTrain.leaveAddress = props.data.leaveAddress; + formDataTrain.studyDayScholarship = props.data.studyDayScholarship; + formDataTrain.studyDayCountry = props.data.studyDayCountry; + formDataTrain.studyDayTrainingSubject = props.data.studyDayTrainingSubject; + formDataTrain.studyDayTrainingName = props.data.studyDayTrainingName; + formDataTrain.leaveDetail = props.data.leaveDetail; + formDataTrain.leaveDocument = []; + const leaveTotal = await calculateDurationYmd( + props.data.leaveStartDate, + props.data.leaveEndDate + ); + formDataTrain.leaveTotal = leaveTotal; + leaveDocumentList.value = props.data.leaveDocument; + statusCheck.value = props.data.status; + } }); /**Hook */ onMounted(async () => { - if (props.data) { - formDataTrain.leaveWrote = props.data.leaveWrote; - formDataTrain.leaveStartDate = props.data.leaveStartDate; - formDataTrain.leaveEndDate = props.data.leaveEndDate; - formDataTrain.leaveTotal = props.data.leaveTotal; - formDataTrain.leavebirthDate = props.data.leavebirthDate; - formDataTrain.leavegovernmentDate = props.data.leavegovernmentDate; - formDataTrain.leaveSalary = props.data.leaveSalary; - formDataTrain.leaveSalaryText = props.data.leaveSalaryText; - formDataTrain.leaveNumber = props.data.leaveNumber; - formDataTrain.leaveAddress = props.data.leaveAddress; - formDataTrain.studyDayScholarship = props.data.studyDayScholarship; - formDataTrain.studyDayCountry = props.data.studyDayCountry; - formDataTrain.studyDayTrainingSubject = props.data.studyDayTrainingSubject; - formDataTrain.studyDayTrainingName = props.data.studyDayTrainingName; - formDataTrain.leaveDetail = props.data.leaveDetail; - // formDataTrain.leaveDocument = props.data.leaveDocument; - const leaveTotal = await calculateDurationYmd( - props.data.leaveStartDate, - props.data.leaveEndDate - ); - formDataTrain.leaveTotal = leaveTotal; - leaveDocumentList.value = props.data.leaveDocument; - statusCheck.value = props.data.status; - leaveId.value = props.data.id; - } + if (props.data) { + formDataTrain.leaveWrote = props.data.leaveWrote; + formDataTrain.leaveStartDate = props.data.leaveStartDate; + formDataTrain.leaveEndDate = props.data.leaveEndDate; + formDataTrain.leaveTotal = props.data.leaveTotal; + formDataTrain.leavebirthDate = props.data.leavebirthDate; + formDataTrain.leavegovernmentDate = props.data.leavegovernmentDate; + formDataTrain.leaveSalary = props.data.leaveSalary; + formDataTrain.leaveSalaryText = props.data.leaveSalaryText; + formDataTrain.leaveNumber = props.data.leaveNumber; + formDataTrain.leaveAddress = props.data.leaveAddress; + formDataTrain.studyDayScholarship = props.data.studyDayScholarship; + formDataTrain.studyDayCountry = props.data.studyDayCountry; + formDataTrain.studyDayTrainingSubject = props.data.studyDayTrainingSubject; + formDataTrain.studyDayTrainingName = props.data.studyDayTrainingName; + formDataTrain.leaveDetail = props.data.leaveDetail; + // formDataTrain.leaveDocument = props.data.leaveDocument; + const leaveTotal = await calculateDurationYmd( + props.data.leaveStartDate, + props.data.leaveEndDate + ); + formDataTrain.leaveTotal = leaveTotal; + leaveDocumentList.value = props.data.leaveDocument; + statusCheck.value = props.data.status; + leaveId.value = props.data.id; + } }); diff --git a/src/modules/06_evaluate/components/ExpertPage.vue b/src/modules/06_evaluate/components/ExpertPage.vue new file mode 100644 index 0000000..d7b6c69 --- /dev/null +++ b/src/modules/06_evaluate/components/ExpertPage.vue @@ -0,0 +1,328 @@ + + + diff --git a/src/modules/06_evaluate/interface/evalute.ts b/src/modules/06_evaluate/interface/evalute.ts index aa80df8..1d3e17d 100644 --- a/src/modules/06_evaluate/interface/evalute.ts +++ b/src/modules/06_evaluate/interface/evalute.ts @@ -93,6 +93,16 @@ interface ListMenu { label: string; } +interface FormRef{ + subject: object | null; + author: object | null; + commanderFullname: object | null; + commanderPosition: object | null; + commanderAboveFullname: object | null; + commanderAbovePosition: object | null; + [key: string]: any; +} + export type { PersonInformation, FormCommand, @@ -101,4 +111,5 @@ export type { EducationForm, CertificatesForm, ListMenu, + FormRef }; diff --git a/src/modules/06_evaluate/router.ts b/src/modules/06_evaluate/router.ts index f57a7f8..6a1d5d7 100644 --- a/src/modules/06_evaluate/router.ts +++ b/src/modules/06_evaluate/router.ts @@ -2,7 +2,7 @@ const evaluateMain = () => import("@/modules/06_evaluate/views/EvaluateMain.vue"); const evaluateStep = () => import("@/modules/06_evaluate/components/EvaluateStepMain.vue"); - +const expertPage = () => import('@/modules/06_evaluate/components/ExpertPage.vue') export default [ { path: "/evaluate", @@ -32,4 +32,13 @@ export default [ Key: [7], }, }, + { + path: "/evaluate/expert", + name: "evaluate-expert", + component: expertPage, + meta: { + Auth: true, + Key: [7], + }, + }, ]; diff --git a/src/modules/06_evaluate/views/EvaluateMain.vue b/src/modules/06_evaluate/views/EvaluateMain.vue index 1c3bf2a..87b4b1e 100644 --- a/src/modules/06_evaluate/views/EvaluateMain.vue +++ b/src/modules/06_evaluate/views/EvaluateMain.vue @@ -48,6 +48,10 @@ function onclickAddEvaluate(data: ListMenu) { menu.value = data; } +function openExpert(){ +router.push('/evaluate/expert') +} + /** ตัวแปร Paging*/ const page = ref(1); const pageSize = ref(25); @@ -192,6 +196,10 @@ watch( {{ item.label }} {{ item.label }} + + ประเมินเชี่ยวชาญ + ประเมินเชี่ยวชาญ + เพิ่มการประเมินบุคคล diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts index 6d2ba7c..a091e50 100644 --- a/src/stores/mixin.ts +++ b/src/stores/mixin.ts @@ -1012,7 +1012,7 @@ export const useCounterMixin = defineStore("mixin", () => { //Convert to an array and store const calcFormat = calcFormatTmp.split("-"); //Subtract each member of our array from the default date - const days_passed = Number(Math.abs(Number(calcFormat[0])) - 1); + const days_passed = Number(Math.abs(Number(calcFormat[0]))); const months_passed = Number(Math.abs(Number(calcFormat[1])) - 1); const years_passed = Number(Math.abs(Number(calcFormat[2])) - 1970);