diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index 8231235bd..8a3f5e8ed 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -2,6 +2,7 @@ import env from "../index"; const placement = `${env.API_PLACEMENT_URI}/placement`; const orgTree = `${env.API_URI_ORG_TREE}`; const order = `${env.API_PLACEMENT_URI}`; +const receive = `${env.API_PLACEMENT_URI}/placement/Receive`; export default { MainDetail: (year: number) => `${placement}/exam/${year}`, @@ -56,11 +57,12 @@ export default { // order yearOptionsOrder: () => `${order}/order/fiscal-year`, listOrder: () => `${order}/order`, + detailOrder: (orderId: string) => `${order}/order/detail/${orderId}`, deleteOrder: (orderId: string) => `${order}/order/${orderId}`, typeOrder: () => `${order}/order/order-type`, createOrder: () => `${order}/order/detail`, - detailOrder: (orderId: string) => `${order}/order/detail/${orderId}`, + examroundOrder: () => `${order}/order/detail/exam-round`, //ข้อมูลเลือกรายชื่อออกคำสั่ง, ลบรายชื่อ @@ -96,4 +98,9 @@ export default { `${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}`, + receivePosition: (id: string) => `${receive}/position/${id}`, }; diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts index 7cf8a8057..698f2cb82 100644 --- a/src/api/06_retirement/api.retirement.ts +++ b/src/api/06_retirement/api.retirement.ts @@ -6,7 +6,9 @@ export default { profile: (type: string, year: string) => `${retirement}/profile/${type}/${year}`, profileRetire: (retireProfileId: string) => `${retirement}/profile/${retireProfileId}`, listRetire: (retireId: string) => `${retirement}/${retireId}`, - createnote: () => `${retirement}/reason`, - reasonId: (retireId:string) => `${retirement}/reason/${retireId}`, - retirement:(type:string,year:string) => `${retirement}/${type}/${year}` + createnote: () => `${retirement}/edit`, + removeProfile: () => `${retirement}/remove`, + reasonId: (retireId: string) => `${retirement}/reason/${retireId}`, + retirement: (type: string, year: string) => `${retirement}/${type}/${year}`, + createProfile: () => `${retirement}/profile`, }; diff --git a/src/modules/05_placement/components/OrderPlacement/step/step01.vue b/src/modules/05_placement/components/OrderPlacement/step/step01.vue index 6f5ff7392..4f63bc851 100644 --- a/src/modules/05_placement/components/OrderPlacement/step/step01.vue +++ b/src/modules/05_placement/components/OrderPlacement/step/step01.vue @@ -208,24 +208,10 @@ ) " -->
- +
@@ -552,7 +538,7 @@ const fetchdetailOrder = async () => { nameCommand.value = data.signatoryBy; positionCommand.value = data.signatoryPosition; examRound.value = data.examRound; - position.value = data.registerPosition; + // position.value = data.registerPosition; register.value = data.conclusionRegisterNo; dateRegister.value = data.conclusionRegisterDate; announce.value = data.conclusionResultNo; diff --git a/src/modules/05_placement/components/OrderPlacement/step/step04.vue b/src/modules/05_placement/components/OrderPlacement/step/step04.vue index d7521a80d..e35338733 100644 --- a/src/modules/05_placement/components/OrderPlacement/step/step04.vue +++ b/src/modules/05_placement/components/OrderPlacement/step/step04.vue @@ -422,10 +422,15 @@ import { VuePDF, usePDF } from "@tato30/vue-pdf"; import type { PDFDocumentLoadingTask } from "pdfjs-dist/types/src/display/api"; import type { QForm } from "quasar"; import { useCounterMixin } from "@/stores/mixin"; +import { useRoute } from "vue-router"; +import http from "@/plugins/http"; +import config from "@/app.config"; const mixin = useCounterMixin(); const { date2Thai } = mixin; +const route = useRoute(); +const orderId_params = route.params.orderid; const dialog = ref(false); // onUnmounted(() => { @@ -433,8 +438,15 @@ const dialog = ref(false); // myEventHandler(e); // }); // }); - +const orderId = ref(""); onMounted(async () => { + console.log(orderId_params); + if (orderId_params !== undefined) { + orderId.value == orderId_params.toString(); + } + + fetchAttachment(orderId.value); + // window.addEventListener("resize", (e: any) => { // myEventHandler(e); // }); @@ -447,6 +459,15 @@ onMounted(async () => { }, 1000); }); +const fetchAttachment = async (orderId: string) => { + console.log(123); + await http + .get(config.API.attachmentOrder("08db94be-f7c6-43e2-83eb-3c5cef3a91c7")) + .then((res) => { + console.log(res); + }); +}; + // const myEventHandler = (e: any) => { // console.log("e", e.target.innerWidth); // if (vuePDFRef !== null) { diff --git a/src/modules/05_placement/components/Receive/FormAdd.vue b/src/modules/05_placement/components/Receive/FormAdd.vue new file mode 100644 index 000000000..f782c6d70 --- /dev/null +++ b/src/modules/05_placement/components/Receive/FormAdd.vue @@ -0,0 +1,545 @@ + + + diff --git a/src/modules/05_placement/components/Receive/information.vue b/src/modules/05_placement/components/Receive/information.vue new file mode 100644 index 000000000..92166e018 --- /dev/null +++ b/src/modules/05_placement/components/Receive/information.vue @@ -0,0 +1,1138 @@ + + diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue index 7dc840540..816fd8e71 100644 --- a/src/modules/05_placement/components/Receive/receiveMain.vue +++ b/src/modules/05_placement/components/Receive/receiveMain.vue @@ -1,11 +1,17 @@