From bbc5c7ed5ea8d63f825c1980308fe6963053789c Mon Sep 17 00:00:00 2001 From: waruneeta Date: Tue, 10 Oct 2023 17:29:29 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B9=83?= =?UTF-8?q?=E0=B8=AB=E0=B9=89=E0=B8=A3=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B1?= =?UTF-8?q?=E0=B8=9A=202=20=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88?= =?UTF-8?q?=E0=B8=87=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B9=80=E0=B8=9E=E0=B8=B4?= =?UTF-8?q?=E0=B9=88=E0=B8=A1=E0=B9=83=E0=B8=AB=E0=B8=A1=E0=B9=88,=20?= =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20css=20=E0=B9=81=E0=B8=A5=E0=B8=B0?= =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/AppointEmployee/Main.vue | 10 +++++----- .../05_placement/components/AppointMent/Main.vue | 2 +- .../components/resign/ResignByid.vue | 4 ++-- src/modules/10_order/components/step/step02.vue | 3 ++- src/modules/10_order/components/step/step04.vue | 16 +++++++++++----- src/modules/10_order/store.ts | 6 +++++- 6 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/modules/05_placement/components/AppointEmployee/Main.vue b/src/modules/05_placement/components/AppointEmployee/Main.vue index 6cf5ccf4c..74cd78ad9 100644 --- a/src/modules/05_placement/components/AppointEmployee/Main.vue +++ b/src/modules/05_placement/components/AppointEmployee/Main.vue @@ -6,7 +6,7 @@ import { useRouter } from "vue-router"; import { useCounterMixin } from "@/stores/mixin"; import { useTransferDataStore } from "@/modules/05_placement/store"; import Dialogbody from "@/modules/05_placement/components/AppointEmployee/Dialogbody.vue"; -import DialogOrgTree from "@/modules/05_placement/components/AppointEmployee/Modal.vue"; +// import DialogOrgTree from "@/modules/05_placement/components/AppointEmployee/Modal.vue"; import DialogHeader from "@/modules/05_placement/components/AppointMent/DialogHeader.vue"; import type { listAppointType, @@ -665,7 +665,7 @@ const savePosition = async () => { transition-show="jump-down" transition-hide="jump-up" > - + { name="mdi-bookmark-outline" /> - เลือกหน่วยงาน/ตำแหน่ง + กำหนดตำแหน่ง { :nextPage="nextPage" :fecthlistappointment="fecthlistappointment" /> - + /> --> diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue index 010aa076f..8995fd4f2 100644 --- a/src/modules/05_placement/components/AppointMent/Main.vue +++ b/src/modules/05_placement/components/AppointMent/Main.vue @@ -443,7 +443,7 @@ onMounted(() => { transition-show="jump-down" transition-hide="jump-up" > - + { dialogMessage( $q, "ต้องการแก้ไขข้อมูลหรือไม่?", - "แก้ไขข้อมูลรายละเอียดการลาออก", + "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย", "mdi-help-circle-outline", "ตกลง", "public", @@ -724,7 +724,7 @@ const downloadFile = (response: any, filename: string) => {
- แก้ไขข้อมูลรายละเอียดการลาออก + แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย
diff --git a/src/modules/10_order/components/step/step02.vue b/src/modules/10_order/components/step/step02.vue index e75517d7b..65782c730 100644 --- a/src/modules/10_order/components/step/step02.vue +++ b/src/modules/10_order/components/step/step02.vue @@ -168,7 +168,8 @@ const statuscode = computed(() => { orderTypeCode.value === "c-pm-08" || orderTypeCode.value === "c-pm-09" || orderTypeCode.value === "c-pm-14" || - orderTypeCode.value === "c-pm-21" + orderTypeCode.value === "c-pm-21" || + orderTypeCode.value === "c-pm-22" ) { return false; } diff --git a/src/modules/10_order/components/step/step04.vue b/src/modules/10_order/components/step/step04.vue index 281ab3377..d8da9750a 100644 --- a/src/modules/10_order/components/step/step04.vue +++ b/src/modules/10_order/components/step/step04.vue @@ -76,7 +76,8 @@ const getCommandDetail = async () => { code.value != "c-pm-18" && code.value != "c-pm-19" && code.value != "c-pm-20" && - code.value != "c-pm-21" + code.value != "c-pm-21" && + code.value != "c-pm-22" ) { fetchReportAttachment("pdf", orderId.value); } @@ -272,7 +273,8 @@ const saveUpload = () => { code.value != "c-pm-18" && code.value != "c-pm-19" && code.value != "c-pm-20" && - code.value != "c-pm-21" + code.value != "c-pm-21" && + code.value != "c-pm-22" ) { await postfileTailer(); } @@ -306,7 +308,8 @@ const saveDetail = () => { code.value != "c-pm-18" && code.value != "c-pm-19" && code.value != "c-pm-20" && - code.value != "c-pm-21" + code.value != "c-pm-21" && + code.value != "c-pm-22" ) { // ดึงรายงานในส่วนของแนบท้ายมาใหม่ await fetchReportAttachment("pdf", orderId.value); @@ -404,6 +407,7 @@ const validateFormUpload = () => { code.value != "c-pm-19" && code.value != "c-pm-20" && code.value != "c-pm-21" && + code.value != "c-pm-22" && fileOrder.value !== null && fileTailer.value !== null ) { @@ -503,7 +507,8 @@ const viewFileUpload = async (url: string) => { code != 'c-pm-18' && code != 'c-pm-19' && code != 'c-pm-20' && - code != 'c-pm-21' + code != 'c-pm-21' && + code != 'c-pm-22' " @click="setTab('second')" :class="getClass(tab == 'second')" @@ -682,7 +687,8 @@ const viewFileUpload = async (url: string) => { code != 'c-pm-18' && code != 'c-pm-19' && code != 'c-pm-20' && - code != 'c-pm-21' + code != 'c-pm-21' && + code != 'c-pm-22' " > diff --git a/src/modules/10_order/store.ts b/src/modules/10_order/store.ts index 168f0f029..c158e7af8 100644 --- a/src/modules/10_order/store.ts +++ b/src/modules/10_order/store.ts @@ -141,8 +141,12 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => { return "ลงโทษไล่ออกจากราชการ"; case "C-PM-21": return "จ้างและแต่งตั้งลูกจ้างประจำ"; + case "C-PM-22": + return "จ้างและแต่งตั้งลูกจ้างประจำ"; + case "C-PM-23": + return "อนุญาตให้ลูกจ้างประจำลาออกจากราชการ"; default: - return "error"; + return ""; } };