diff --git a/src/modules/01_dashboard/views/Dashboard.vue b/src/modules/01_dashboard/views/Dashboard.vue index d823fad..d67d776 100644 --- a/src/modules/01_dashboard/views/Dashboard.vue +++ b/src/modules/01_dashboard/views/Dashboard.vue @@ -71,6 +71,14 @@ const items = ref([ path: "/retire", active: false, }, + { + icon: "mdi-scale-balance", + title: "อุทธรณ์ร้องทุกข์", + sub: "ทำเรื่องขออุทธรณ์ หรือร้องทุกข์", + color: "green-3", + path: "/appeal-complain", + active: false, + }, ]) onMounted(async () => { await fetchlistInbox() diff --git a/src/modules/05_leave/componenst/Forms/01_SickForm.vue b/src/modules/05_leave/componenst/Forms/01_SickForm.vue index c3d1f27..37a530d 100644 --- a/src/modules/05_leave/componenst/Forms/01_SickForm.vue +++ b/src/modules/05_leave/componenst/Forms/01_SickForm.vue @@ -36,13 +36,16 @@ const formDataSick = reactive({ leaveEndDate: null, halfDay: "day", leaveTotal: "", - leaveLast: "", + leaveLast: null, leaveNumber: "", leaveAddress: "", leaveDetail: "", leaveDocument: [], }) +//แปลง leaveLast ด้วย Date2thai +const leave2Thai = dataStore.leaveLast != null ? date2Thai(dataStore.leaveLast) : null + /** ตัวแปร ref สำหรับแสดง validate */ const leaveWroteRef = ref(null) const leaveStartDateRef = ref(null) @@ -320,7 +323,7 @@ const isReadOnly = computed(() => { outlined ref="leaveLastRef" for="leaveLastRef" - v-model="dataStore.leaveLast" + v-model="leave2Thai" label="ลาครั้งสุดท้ายเมื่อวันที่" readonly hide-bottom-space diff --git a/src/modules/05_leave/componenst/Forms/03_Birth.vue b/src/modules/05_leave/componenst/Forms/03_Birth.vue index 6618216..1d5d330 100644 --- a/src/modules/05_leave/componenst/Forms/03_Birth.vue +++ b/src/modules/05_leave/componenst/Forms/03_Birth.vue @@ -42,6 +42,9 @@ const formDataBirth = reactive({ leaveDocument: [], }) +//แปลง leaveLast ด้วย Date2thai +const leave2Thai = dataStore.leaveLast != null ? date2Thai(dataStore.leaveLast) : null + /** ตัวแปร ref สำหรับแสดง validate */ const leaveWroteRef = ref(null) const leaveStartDateRef = ref(null) @@ -287,7 +290,7 @@ async function saveFormData() { outlined ref="leaveLastRef" for="leaveLastRef" - v-model="dataStore.leaveLast" + v-model="leave2Thai" label="ลาครั้งสุดท้ายเมื่อวันที่" readonly hide-bottom-space diff --git a/src/modules/05_leave/componenst/Forms/Form.vue b/src/modules/05_leave/componenst/Forms/Form.vue index 8d7935b..2c5cdfa 100644 --- a/src/modules/05_leave/componenst/Forms/Form.vue +++ b/src/modules/05_leave/componenst/Forms/Form.vue @@ -72,7 +72,7 @@ onMounted(async () => { - + diff --git a/src/modules/05_leave/store.ts b/src/modules/05_leave/store.ts index 9341b67..098c7b7 100644 --- a/src/modules/05_leave/store.ts +++ b/src/modules/05_leave/store.ts @@ -184,7 +184,6 @@ export const useLeaveStore = defineStore("Leave", () => { typeLeave.value = convertSubtitleInfo2(subitem) } typeId.value = convertId(item) - console.log(typeId.value) } /** @@ -193,7 +192,7 @@ export const useLeaveStore = defineStore("Leave", () => { * @returns ส่งค่าที่แปลงแล้ว */ function convertSubtitle(val: string) { - return options.value.find(x => x.id == val)?.name + return options.value.find(x => x.code == val)?.name } /** @@ -229,7 +228,7 @@ export const useLeaveStore = defineStore("Leave", () => { const dateSendLeave = ref() //วันที่ยื่นใบลา const leaveTypeName = ref("") //Name ประเภทการลา const dear = ref("") //เรียน - const fullname = ref("") //คำนำหน้า ชื่อ นามสกุล ผู้ยื่นขอ + const fullName = ref("") //คำนำหน้า ชื่อ นามสกุล ผู้ยื่นขอ const positionName = ref("") //ตำแหน่งผู้ยื่นขอ const positionLevelName = ref("") //ระดับผู้ยื่นขอ const organizationName = ref("") //สังกัดผู้ยื่นขอ @@ -241,7 +240,7 @@ export const useLeaveStore = defineStore("Leave", () => { const dateAppoint = ref() //วันที่เข้ารับราชการ const salary = ref(0) //เงินเดือนปัจจุบัน const salaryText = ref("") //เงินเดือนปัจจุบัน(ภาษาไทย) - const leaveLast = ref("") + const leaveLast = ref() const restDayCurrentTotal = ref("") //ดึงข้อมูล profile จาก API @@ -254,7 +253,7 @@ export const useLeaveStore = defineStore("Leave", () => { dateSendLeave.value = data.dateSendLeave leaveTypeName.value = data.leaveTypeName dear.value = data.dear - fullname.value = data.fullname + fullName.value = data.fullName positionName.value = data.positionName positionLevelName.value = data.positionLevelName organizationName.value = data.organizationName @@ -266,7 +265,7 @@ export const useLeaveStore = defineStore("Leave", () => { dateAppoint.value = data.dateAppoint salary.value = data.salary salaryText.value = data.salaryText - leaveLast.value = data.leaveLast + leaveLast.value = data.leaveLast && date2Thai(data.leaveLast) restDayCurrentTotal.value = data.restDayCurrentTotal console.log(data) }) @@ -303,7 +302,7 @@ export const useLeaveStore = defineStore("Leave", () => { dateSendLeave, leaveTypeName, dear, - fullname, + fullName, positionName, positionLevelName, organizationName, diff --git a/src/modules/06_appealComplain/router.ts b/src/modules/06_appealComplain/router.ts new file mode 100644 index 0000000..349d879 --- /dev/null +++ b/src/modules/06_appealComplain/router.ts @@ -0,0 +1,36 @@ +/** + * Router ขอโอน + */ + +const mainPage = () => import("@/modules/06_appealComplain/views/Main.vue"); +const addPage = () => import("@/modules/06_appealComplain/views/Add.vue"); + +export default [ + { + path: "/appeal-complain", + name: "appealComplain", + component: mainPage, + meta: { + Auth: true, + Key: [7], + }, + }, + { + path: "/appeal-complain/add", + name: "appealComplainAdd", + component: addPage, + meta: { + Auth: true, + Key: [7], + }, + }, + { + path: "/appeal-complain/:id", + name: "appealComplainView", + component: addPage, + meta: { + Auth: true, + Key: [7], + }, + }, +]; diff --git a/src/modules/06_appealComplain/store.ts b/src/modules/06_appealComplain/store.ts new file mode 100644 index 0000000..17af986 --- /dev/null +++ b/src/modules/06_appealComplain/store.ts @@ -0,0 +1,5 @@ +import { defineStore } from "pinia"; + +export const useAppealComplainStore = defineStore("appealComplainStore", () => { + return {}; +}); diff --git a/src/modules/06_appealComplain/views/Add.vue b/src/modules/06_appealComplain/views/Add.vue new file mode 100644 index 0000000..30370b8 --- /dev/null +++ b/src/modules/06_appealComplain/views/Add.vue @@ -0,0 +1,205 @@ + + + diff --git a/src/modules/06_appealComplain/views/Main.vue b/src/modules/06_appealComplain/views/Main.vue new file mode 100644 index 0000000..a29b5db --- /dev/null +++ b/src/modules/06_appealComplain/views/Main.vue @@ -0,0 +1,233 @@ + + +