เพิ่มคำสั่งปรับโครงสร้าง C-PM-38
This commit is contained in:
parent
e6ee9efded
commit
dc079e31fd
2 changed files with 14 additions and 4 deletions
|
|
@ -189,14 +189,16 @@ const fecthTypeOption = async (actions: string) => {
|
||||||
name: e.name,
|
name: e.name,
|
||||||
category: e.category,
|
category: e.category,
|
||||||
commandCode: e.commandCode,
|
commandCode: e.commandCode,
|
||||||
fullname: e.commandCode + " " + e.name,
|
// fullname: e.commandCode + " " + e.name,
|
||||||
|
fullname: e.name,
|
||||||
}));
|
}));
|
||||||
typeOrderFilter.value = data.map((e: OrederResult) => ({
|
typeOrderFilter.value = data.map((e: OrederResult) => ({
|
||||||
id: e.id,
|
id: e.id,
|
||||||
name: e.name,
|
name: e.name,
|
||||||
category: e.category,
|
category: e.category,
|
||||||
commandCode: e.commandCode,
|
commandCode: e.commandCode,
|
||||||
fullname: e.commandCode + " " + e.name,
|
// fullname: e.commandCode + " " + e.name,
|
||||||
|
fullname: e.name,
|
||||||
}));
|
}));
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
|
|
@ -644,9 +646,15 @@ const createListOrder = async (formData: Object, type: string) => {
|
||||||
route.name == "disciplineOrderDatail" ||
|
route.name == "disciplineOrderDatail" ||
|
||||||
route.name == "disciplineOrderAdd"
|
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 {
|
} 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();
|
next();
|
||||||
success($q, "บันทึกข้อมูลสำเร็จ");
|
success($q, "บันทึกข้อมูลสำเร็จ");
|
||||||
|
|
|
||||||
|
|
@ -177,6 +177,8 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
|
||||||
return "คำสั่งเลื่อนขั้นค่าจ้าง";
|
return "คำสั่งเลื่อนขั้นค่าจ้าง";
|
||||||
case "C-PM-37":
|
case "C-PM-37":
|
||||||
return "คำสั่งให้ลูกจ้างประจำได้รับค่าตอบแทนพิเศษ";
|
return "คำสั่งให้ลูกจ้างประจำได้รับค่าตอบแทนพิเศษ";
|
||||||
|
case "C-PM-38":
|
||||||
|
return "แต่งตั้งข้าราชการให้ดำรงตำแหน่ง"; // คำสั่งปรับโครงสร้าง
|
||||||
default:
|
default:
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue