diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue index 2445e8a93..5d89c04a8 100644 --- a/src/modules/05_placement/components/AppointMent/Main.vue +++ b/src/modules/05_placement/components/AppointMent/Main.vue @@ -4,18 +4,22 @@ import type { QTableProps } from "quasar"; import { useQuasar } from "quasar"; import { useRouter } from "vue-router"; import { useCounterMixin } from "@/stores/mixin"; -import { useTransferDataStore } from "@/modules/05_placement/store" -import Dialogbody from "@/modules/05_placement/components/AppointMent/Dialogbody.vue" +import { useTransferDataStore } from "@/modules/05_placement/store"; +import Dialogbody from "@/modules/05_placement/components/AppointMent/Dialogbody.vue"; import DialogOrgTree from "@/modules/05_placement/components/AppointMent/AppointmentModal.vue"; -import type { listAppointType,resData,orgFilter } from "@/modules/05_placement/interface/response/AppointMent" -import type { OpType } from "@/modules/05_placement/interface/response/Main" +import type { + listAppointType, + resData, + orgFilter, +} from "@/modules/05_placement/interface/response/AppointMent"; +import type { OpType } from "@/modules/05_placement/interface/response/Main"; import http from "@/plugins/http"; import config from "@/app.config"; const $q = useQuasar(); const modal = ref(false); const storeFn = useTransferDataStore(); -const { statusText } = storeFn +const { statusText } = storeFn; const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง const { showLoader, @@ -167,15 +171,30 @@ const fecthlistappointment = async () => { status: statusText(e.status), createdAt: date2Thai(e.createdAt), birthday: e.dateOfBirth == null ? "-" : date2Thai(e.dateOfBirth), + educationOld: e.educationOld, + organizationPositionOld: e.organizationPositionOld, + positionTypeOld: e.positionTypeOld, + positionLevelOld: e.positionLevelOld, + positionNumberOld: e.positionNumberOld, + salary: e.salary, + positionDate: e.positionDate, })); rows2.value = rows.value.filter( (e: orgFilter) => e.orgName !== null && e.status !== "ส่งรายชื่อไปออกคำสั่ง" && - e.status !== "ออกคำสั่งเสร็จแล้ว" + e.status !== "ออกคำสั่งเสร็จแล้ว" && + e.educationOld && + e.organizationPositionOld && + e.positionTypeOld && + e.positionLevelOld && + e.positionNumberOld && + e.salary !== null && + e.positionDate ); }) .catch((e) => { + messageError($q, e); }) .finally(() => { hideLoader(); @@ -241,7 +260,6 @@ const nextPage = (id: string) => { }); }; - onMounted(() => { fecthlistappointment(); }); @@ -255,27 +273,65 @@ onMounted(() => {
- + ส่งไปออกคำสั่งแต่งตั้ง-เลื่อน-ย้าย - + - +
- + diff --git a/src/modules/05_placement/components/Other/Main.vue b/src/modules/05_placement/components/Other/Main.vue index f20fe73c5..a8ea2c189 100644 --- a/src/modules/05_placement/components/Other/Main.vue +++ b/src/modules/05_placement/components/Other/Main.vue @@ -150,9 +150,19 @@ const fecthlistOthet = async () => { status: r.status ?? "-", statustext: statusText(r.status ?? ""), fullname: `${r.prefix ?? ""}${r.firstname ?? ""} ${r.lastname ?? ""}`, + amountOld: r.amountOld, + positionDate: r.positionDate, })); rows2.value = rows.value.filter( - (e: listMain) => e.status !== "REPORT" && e.status !== "DONE" + (e: listMain) => + e.status !== "REPORT" && + e.status !== "DONE" && + e.organizationPositionOld && + e.positionTypeOld && + e.positionLevelOld && + e.positionNumberOld && + e.amountOld !== null && + e.positionDate ); }) .catch((e) => { diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue index db91c6dfb..ef738b93e 100644 --- a/src/modules/05_placement/components/Receive/receiveMain.vue +++ b/src/modules/05_placement/components/Receive/receiveMain.vue @@ -52,8 +52,15 @@ const popup = () => { (r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE") && - r.positionNumber != null + r.positionNumber != null && + r.educationOld && + r.organizationPositionOld && + r.positionTypeOld && + r.positionLevelOld && + r.positionNumberOld && + r.amountOld !== null ); + rows2.value = row; modal.value = true; }; @@ -147,27 +154,28 @@ const columns = ref([ }, ]); - //save file +//save file const SaveData = async () => { myForm.value.validate().then((result: boolean) => { if (result) { - const formData = new FormData(); - formData.append("File", files.value); - showLoader(); - http - .put(config.API.receiveFile(personalId.value), formData) - .then(() => { - success($q, "บันทึกข้อมูลสำเร็จ"); - }) - .catch((e) => { - messageError($q, e); - }) - .finally(async () => { - await clickCloseUpload(); - hideLoader(); - - }); -}})}; + const formData = new FormData(); + formData.append("File", files.value); + showLoader(); + http + .put(config.API.receiveFile(personalId.value), formData) + .then(() => { + success($q, "บันทึกข้อมูลสำเร็จ"); + }) + .catch((e) => { + messageError($q, e); + }) + .finally(async () => { + await clickCloseUpload(); + hideLoader(); + }); + } + }); +}; const fecthlistRecevice = async () => { showLoader(); @@ -175,6 +183,7 @@ const fecthlistRecevice = async () => { .get(config.API.receiveData()) .then((res: any) => { const response = res.data.result; + listRecevice.value = response; let list: ResponseRow[] = []; response.map((e: ResponseData) => { @@ -194,12 +203,23 @@ const fecthlistRecevice = async () => { organizationShortName: e.organizationShortName, positionNumber: e.positionNumber, positionPath: e.positionPath, - birthday: e.dateOfBirth == null ? "-" : date2Thai(e.dateOfBirth) && - e.dateOfBirth.toString() === "0001-01-01T00:00:00" ? "-" : date2Thai(e.dateOfBirth), + birthday: + e.dateOfBirth == null + ? "-" + : date2Thai(e.dateOfBirth) && + e.dateOfBirth.toString() === "0001-01-01T00:00:00" + ? "-" + : date2Thai(e.dateOfBirth), status: e.status, statusText: statusText(e.status ?? ""), createdAt: e.createdAt !== null ? new Date(e.createdAt) : null, dateText: e.createdAt !== null ? date2Thai(e.createdAt) : "-", + educationOld: e.educationOld ?? "", + organizationPositionOld: e.organizationPositionOld ?? "", + positionTypeOld: e.positionTypeOld, + positionLevelOld: e.positionLevelOld, + positionNumberOld: e.positionNumberOld, + amountOld: e.amountOld, }); }); rows.value = list; @@ -231,7 +251,7 @@ const clickClose = () => { // ปิดโมเดลอัปเดตไฟล์ const clickCloseUpload = () => { modalupload.value = false; - files.value = null + files.value = null; }; // ปิดโมเดลโครงสร้าง const openModalTree = (id: string) => { @@ -292,26 +312,62 @@ onMounted(() => { เพิ่มข้อมูล - + ส่งไปออกคำสั่งรับโอน - + - +
- +