diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts
index 79a08679e..8a3f5e8ed 100644
--- a/src/api/05_placement/api.placement.ts
+++ b/src/api/05_placement/api.placement.ts
@@ -46,23 +46,59 @@ export default {
//education
placementEducationId: (id: string) => `${placement}/education/${id}`,
- // position
+ // position
placementPosition: () => `${placement}/position/use`,
// putPositiom
putPosition: (id: any) => `${placement}/position/${id}`,
// clear Position
- clearPosition: (personalId: string) => `${placement}/position/clear/${personalId}`,
+ clearPosition: (personalId: string) =>
+ `${placement}/position/clear/${personalId}`,
// order
yearOptionsOrder: () => `${order}/order/fiscal-year`,
- createOrder: () => `${order}/order/detail`,
listOrder: () => `${order}/order`,
detailOrder: (orderId: string) => `${order}/order/detail/${orderId}`,
deleteOrder: (orderId: string) => `${order}/order/${orderId}`,
typeOrder: () => `${order}/order/order-type`,
- examroundOrder: () => `${order}/order/detail/exam-round`,
- attachmentOrder: (orderId: string) => `${order}/order/attachment/${orderId}`,
+ createOrder: () => `${order}/order/detail`,
+
+ examroundOrder: () => `${order}/order/detail/exam-round`,
+
+ //ข้อมูลเลือกรายชื่อออกคำสั่ง, ลบรายชื่อ
+ personsOrder: (orderId: string) => `${order}/order/persons/${orderId}`,
+
+ //เปลี่ยน status ของคำสั่งไปขั้นตอนถัดไป
+ nextOrder: (orderId: string) => `${order}/order/next/${orderId}`,
+ //เปลี่ยน status ของคำสั่งไปขั้นตอนถัดไป
+ preventOrder: (orderId: string) => `${order}/order/prev/${orderId}`,
+
+ //สลับลำดับข้อมูลในบัญชีแนบท้ายขึ้น
+ swapUpOrder: (personalId: string) => `${order}/order/swap/up/${personalId}`,
+ //สลับลำดับข้อมูลในบัญชีแนบท้ายลง
+ swapDownOrder: (personalId: string) =>
+ `${order}/order/swap/down/${personalId}`,
+
+ //บันทึกข้อมูลเงินเดือนสำหรับผู้บรรจุ
+ salaryOrder: (id: string) => `${order}/order/salary/${id}`,
+
+ // popup แสดงรายชื่อตามหน่วยงานที่เลือก , popup เลือกรายชื่อส่งสำเนา
+ copyOrderPersonsId: (id: string) => `${order}/order/copy-order/persons/${id}`,
+
+ copyOrder: `${order}/order/copy-order`,
+
+ copyOrderId: (id: string) => `${order}/order/copy-order/${id}`,
+
+ attachmentId: (id: string) => `${order}/order/attachment/${id}`,
+
+ attachmentOrderId: (orderId: string) =>
+ `${order}/order/attachment/order-file/${orderId}`,
+
+ attachmentFileId: (orderId: string) =>
+ `${order}/order/attachment/file/${orderId}`,
+
+ orderReady: (id: string) => `${order}/order/ready/${id}`,
+ attachmentOrder: (orderId: string) => `${order}/order/attachment/${orderId}`,
receiveData: () => `${receive}`,
receiveDataId: (id: string) => `${receive}/${id}`,
diff --git a/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue
index 6c17f39fd..8b68a05df 100644
--- a/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue
+++ b/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue
@@ -48,6 +48,7 @@
:name="4"
title="รายละเอียดคำสั่งและแนบท้าย"
prefix="4"
+ :done="step > 4"
:header-nav="step > 4"
/>
@@ -61,8 +62,12 @@
diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue
index 816fd8e71..98c75f741 100644
--- a/src/modules/05_placement/components/Receive/receiveMain.vue
+++ b/src/modules/05_placement/components/Receive/receiveMain.vue
@@ -72,25 +72,27 @@ const fecthlistRecevice = async () => {
.then((res) => {
let response = res.data.result;
listRecevice.value = response;
- console.log(response);
+ // console.log(response);
rows.value = response.map((e: any) => ({
personalId: e.id,
citizenId: e.citizenId,
fullname: e.firstname + " " + e.lastname,
organizationName:
- e.organizationName +
- " " +
- e.organizationShortName +
- " " +
- e.positionNumber +
- " " +
- e.positionPath,
- orgName: e.organizationName,
- organizationShortName: e.organizationShortName,
+ e.organizationName +
+ " " +
+ e.organizationShortName +
+ " " +
+ e.positionNumber +
+ " " +
+ e.positionPath,
+ orgName: e.organizationName,
+ organizationShortName: e.organizationShortName,
positionNumber: e.positionNumber,
positionPath: e.positionPath,
birthday: date2Thai(e.dateOfBirth),
}));
+ // console.log(rows.value);
+ rows2.value = rows.value.filter((e: any) => e.orgName !== null);
})
.catch((e) => {
console.log(typeof e);
@@ -116,6 +118,19 @@ const rows = ref([
// birthday: dateText(new Date("1989-09-03")),
// },
]);
+const rows2 = ref([
+ {
+ personalId: "08db721d-add6-47b0-8a13-5f45d106e8d1",
+ citizenId: "1234444332222",
+ fullname: "นางสาวอย พชช",
+ organizationName: "นักจัดการงานทั่วไป",
+ orgName: "กลุ่มงานช่วยนักบริหาร",
+ organizationShortName: "สกจ.",
+ positionNumber: "กก. 1",
+ positionPath: "นักจัดการงานทั่วไป",
+ birthday: dateText(new Date("1989-09-03")),
+ },
+]);
const columns = ref([
{
name: "no",
@@ -219,7 +234,7 @@ const openModalTree = (id: string) => {
personalId.value = id;
console.log(personalId.value);
- personal.value = listRecevice.value.filter((e) => e.id === id);
+ personal.value = listRecevice.value.filter((e: any) => e.id === id);
modalTree.value = true;
};
diff --git a/src/modules/05_placement/interface/request/Order.ts b/src/modules/05_placement/interface/request/Order.ts
new file mode 100644
index 000000000..d7e306c25
--- /dev/null
+++ b/src/modules/05_placement/interface/request/Order.ts
@@ -0,0 +1,7 @@
+interface RequestCopyOrder {
+ personalId: string;
+ emailChannel: boolean;
+ inboxChannel: boolean;
+}
+
+export type { RequestCopyOrder };
diff --git a/src/modules/05_placement/interface/response/Order.ts b/src/modules/05_placement/interface/response/Order.ts
new file mode 100644
index 000000000..6dc958ff1
--- /dev/null
+++ b/src/modules/05_placement/interface/response/Order.ts
@@ -0,0 +1,43 @@
+interface ResponseData {
+ education: string;
+ idCard: string;
+ name: string;
+ personId: string;
+ selectStatus: boolean;
+ sequence: number;
+}
+
+interface ResponseOrganiz {
+ firstName: string;
+ idCard: string;
+ lastName: string;
+ name: string;
+ position: string;
+ prefixId: string;
+ profileId: string;
+ unit: string;
+}
+
+interface ResponseCopyOrder {
+ emailChannel: boolean;
+ idCard: string;
+ inboxChannel: boolean;
+ name: string;
+ personalId: string;
+ position: string;
+ selectStatus: boolean;
+ sequence: number;
+ unit: string;
+}
+
+interface DataCopyOrder {
+ personalId: string;
+ name: string;
+ idCard: string;
+ position: string;
+ unit: string;
+ send: string;
+ mutiselect: number[];
+}
+
+export type { ResponseData, ResponseOrganiz, ResponseCopyOrder, DataCopyOrder };
diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts
index 0fca902c5..0ebbda72f 100644
--- a/src/modules/05_placement/store.ts
+++ b/src/modules/05_placement/store.ts
@@ -229,8 +229,6 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
) => {
DataMainUpdateOrder.value = [];
-
-
if (filter_1 === "" && filter_2 === "" && filterYear === 0) {
DataMainUpdateOrder.value = DataMainOrigOrder.value;
} else if (filter_1 !== "" && filter_2 === "" && filterYear === 0) {
@@ -269,7 +267,11 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
item.OrderStatus === filter_2 &&
item.fiscalYear === filterYear
);
- } else if (filter_1 == "ทั้งหมด" && filter_2 == "ทั้งหมด" && filterYear !== null) {
+ } else if (
+ filter_1 == "ทั้งหมด" &&
+ filter_2 == "ทั้งหมด" &&
+ filterYear !== null
+ ) {
DataMainUpdateOrder.value = DataMainOrigOrder.value;
}
};
@@ -294,8 +296,18 @@ export const useProbationDataStore = defineStore("probationDataStore", () => {
"blue-9",
"blue-10",
]);
+ const orderId = ref("");
+
+ const stepOrder = ref(2);
+
+ const setOrderId = (val: string) => (orderId.value = val);
+ const setStepOrder = (val: number) => (stepOrder.value = val);
return {
ratingColors,
+ orderId,
+ stepOrder,
+ setOrderId,
+ setStepOrder,
};
});
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index 359536720..1edcb1b45 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -263,7 +263,12 @@
-
+