diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue index cf8cdb9d5..08149986b 100644 --- a/src/modules/10_order/components/step/step01.vue +++ b/src/modules/10_order/components/step/step01.vue @@ -189,14 +189,16 @@ const fecthTypeOption = async (actions: string) => { name: e.name, category: e.category, commandCode: e.commandCode, - fullname: e.commandCode + " " + e.name, + // fullname: e.commandCode + " " + e.name, + fullname: e.name, })); typeOrderFilter.value = data.map((e: OrederResult) => ({ id: e.id, name: e.name, category: e.category, commandCode: e.commandCode, - fullname: e.commandCode + " " + e.name, + // fullname: e.commandCode + " " + e.name, + fullname: e.name, })); }) .catch((e) => { @@ -644,9 +646,15 @@ const createListOrder = async (formData: Object, type: string) => { route.name == "disciplineOrderDatail" || route.name == "disciplineOrderAdd" ) { - router.push(`/discipline-order/detail/${data.id}?step=${2}`); // สร้างเสร็จแล้วให้ไป Step 2 + router.push( + `/discipline-order/detail/${data.id}?step=${ + type == "C-PM-38" ? 3 : 2 + }` + ); // สร้างเสร็จแล้วให้ไป Step 2 } else { - router.push(`/order/detail/${data.id}?step=${2}`); // สร้างเสร็จแล้วให้ไป Step 2 + router.push( + `/order/detail/${data.id}?step=${type == "C-PM-38" ? 3 : 2}` + ); // สร้างเสร็จแล้วให้ไป Step 2 } next(); success($q, "บันทึกข้อมูลสำเร็จ"); diff --git a/src/modules/10_order/store.ts b/src/modules/10_order/store.ts index 6870cafaa..87fa8f21c 100644 --- a/src/modules/10_order/store.ts +++ b/src/modules/10_order/store.ts @@ -177,6 +177,8 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => { return "คำสั่งเลื่อนขั้นค่าจ้าง"; case "C-PM-37": return "คำสั่งให้ลูกจ้างประจำได้รับค่าตอบแทนพิเศษ"; + case "C-PM-38": + return "แต่งตั้งข้าราชการให้ดำรงตำแหน่ง"; // คำสั่งปรับโครงสร้าง default: return ""; }