From 6c8040e365d1f6f9a2bb9300b113aa9ae0ac6269 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Wed, 30 Aug 2023 19:23:57 +0700 Subject: [PATCH] =?UTF-8?q?-=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3?= =?UTF-8?q?=E0=B8=A2=E0=B9=89=E0=B8=B2=E0=B8=A2=20-=20=E0=B9=81=E0=B8=81?= =?UTF-8?q?=E0=B9=89=20bug=20=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B8=A2=E0=B9=89?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B9=84=E0=B8=9B=E0=B8=AD=E0=B8=AD=E0=B8=81?= =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/interface/request/main/main.ts | 20 +- .../04_registry/components/Profile.vue | 20 +- .../components/AppointMent/Main.vue | 355 ++++------------ .../components/Receive/receiveMain.vue | 387 +++++------------- 4 files changed, 195 insertions(+), 587 deletions(-) diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts index 441bd5dad..4b874ec33 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -204,61 +204,61 @@ const menuList = readonly([ children: [ { key: 6.1, - label: "รายชื่อผู้สอบผ่าน" /* รายชื่อผู้สอบผ่าน */, + label: "รายชื่อผู้สอบผ่าน", path: "placement", role: "placement", }, // { // key: 6.2, - // label: "ออกคำสั่ง" /* ออกคำสั่งบรรจุ */, + // label: "ออกคำสั่ง", // path: "Orderplacement", // role: "placement", // }, { key: 6.3, - label: "การทดลองงาน" /* การทดลองงาน */, + label: "การทดลองงาน", path: "probation", role: "probation", }, { key: 6.4, - label: "รายการขอโอน" /* */, + label: "รายการขอโอน", path: "transfer", role: "placement", }, { key: 6.5, - label: "รายการรับโอน" /* */, + label: "รายการรับโอน", path: "receive", role: "placement", }, { key: 6.6, - label: "รายการช่วยราชการ" /* */, + label: "รายการช่วยราชการ", path: "help-government", role: "placement", }, { key: 6.7, - label: "รายการส่งตัวกลับ" /* */, + label: "รายการส่งตัวกลับ", path: "repatriate", role: "placement", }, { key: 6.8, - label: "รายการแต่งตั้ง-เลื่อน" /* */, + label: "รายการแต่งตั้ง-เลื่อน-ย้าย", path: "appoint-promote", role: "placement", }, // { // key: 6.9, - // label: "รายการย้าย" /* */, + // label: "รายการย้าย", // path: "relocation", // role: "placement", // }, { key: 6.1, - label: "รายการอื่นๆ" /* */, + label: "รายการอื่นๆ", path: "other", role: "placement", }, diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue index 1a0ee970f..e1e50618d 100644 --- a/src/modules/04_registry/components/Profile.vue +++ b/src/modules/04_registry/components/Profile.vue @@ -172,15 +172,15 @@ - แต่งตั้ง-เลื่อน + แต่งตั้ง-เลื่อน-ย้าย - + @@ -1042,13 +1042,13 @@ const appointPost = async () => { }); }; -const relocationPost = async () => { - dialogConfirm($q, async () => { - const formData = new FormData(); - formData.append("id", profileId.value); - await http.post(config.API.placemenRelocation, formData); - }); -}; +// const relocationPost = async () => { +// dialogConfirm($q, async () => { +// const formData = new FormData(); +// formData.append("id", profileId.value); +// await http.post(config.API.placemenRelocation, formData); +// }); +// }; const outPost = async () => { dialogConfirm($q, async () => { diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue index 24638d437..24e34372c 100644 --- a/src/modules/05_placement/components/AppointMent/Main.vue +++ b/src/modules/05_placement/components/AppointMent/Main.vue @@ -290,59 +290,31 @@ const clickAddlist = () => { dialogConfirm($q, () => createdAppoint()); }; const createdAppoint = async () => { - if (type.value == "c6de09ef-c1f8-4a39-aa31-c7ed88df01d9") { - let pId: string[] = []; - selected.value.forEach((e: any) => { - pId.push(e.personalId); + let pId: string[] = []; + selected.value.forEach((e: any) => { + pId.push(e.personalId); + }); + let data = { + id: pId, + }; + // console.log(data); + showLoader(); + await http + .put(config.API.apppointmentReport(type.value), data) + .then((res: any) => { + console.log(res); + success($q, "บันทึกสำเร็จ"); + }) + .catch((e: any) => { + // console.log(e); + messageError($q, e); + }) + .finally(() => { + hideLoader(); + fecthlistappointment(); + selected.value = []; + modal.value = false; }); - let data = { - id: pId, - }; - console.log(data); - showLoader(); - await http - .post(config.API.relocationMainReport(), data) - .then((res: any) => { - console.log(res); - success($q, "บันทึกสำเร็จ"); - }) - .catch((e) => { - console.log(e); - messageError($q, e); - }) - .finally(async () => { - hideLoader(); - fecthlistappointment(); - selected.value = []; - modal.value = false; - }); - } else { - let pId: string[] = []; - selected.value.forEach((e: any) => { - pId.push(e.personalId); - }); - let data = { - id: pId, - }; - console.log(data); - showLoader(); - await http - .put(config.API.apppointmentReport(type.value), data) - .then((res: any) => { - console.log(res); - success($q, "บันทึกสำเร็จ"); - }) - .catch((e: any) => { - console.log(e); - messageError($q, e); - }) - .finally(() => { - hideLoader(); - fecthlistappointment(); - selected.value = []; - modal.value = false; - }); - } }; const closeModalTree = async () => { @@ -389,65 +361,27 @@ const pagination = ref({ เพิ่มข้อมูล --> - + ส่งไปออกคำสั่งแต่งตั้ง-เลื่อน-ย้าย - + - +
- + diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue index a60171a4a..951b165ff 100644 --- a/src/modules/05_placement/components/Receive/receiveMain.vue +++ b/src/modules/05_placement/components/Receive/receiveMain.vue @@ -39,7 +39,7 @@ const modal = ref(false); const popup = () => { const row = filters.value.filter( (r: ResponseRow) => - r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE" + (r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE") && r.positionNumber != null ); rows2.value = row; modal.value = true; @@ -72,8 +72,8 @@ const visibleColumns2 = ref([ const filterKeyword = ref(""); const filterKeyword2 = ref(""); const filterRef = ref(null); - const files = ref(); - const fileDocDataUpload = ref([]); +const files = ref(); +const fileDocDataUpload = ref([]); const listRecevice = ref([]); const filters = ref([]); const rows = ref([ @@ -318,7 +318,7 @@ const fileUploadDoc = async (files: any) => { }); }; -const addUpload= async () => { +const addUpload = async () => { // showLoader(); // await http // .post(config.API.listRoundInsignia()) @@ -334,8 +334,8 @@ const addUpload= async () => { }; const SaveData = async () => { - await addUpload(); - await clickCloseUpload(); + await addUpload(); + await clickCloseUpload(); }; const resetFilter = () => { @@ -440,64 +440,27 @@ const saveOrder = async () => { เพิ่มข้อมูล - + ส่งไปออกคำสั่งรับโอน - + - +
- +