From 5640c9bd6897add7ab9f2a77178341f3d2c92aa0 Mon Sep 17 00:00:00 2001
From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com>
Date: Fri, 11 Aug 2023 10:04:47 +0700
Subject: [PATCH] =?UTF-8?q?api=20edit=20detail=20=E0=B8=82=E0=B8=AD?=
 =?UTF-8?q?=E0=B9=82=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/transfer/api.transfer.ts              |  2 +-
 src/modules/02_transfer/views/AddTransfer.vue | 41 +++++++++++++------
 src/modules/02_transfer/views/Main.vue        | 34 +++++++--------
 3 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/src/api/transfer/api.transfer.ts b/src/api/transfer/api.transfer.ts
index 8c3e87d..5e1a04f 100644
--- a/src/api/transfer/api.transfer.ts
+++ b/src/api/transfer/api.transfer.ts
@@ -5,5 +5,5 @@ const placementTransfer = `${env.API_URI}/placement`
 export default {
 	listUserTransfer: () => `${placementTransfer}/transfer/user`,
 	listtransfer: () => `${placementTransfer}/transfer`,
-	// transferByid: (id: string) => `${placementTransfer}/transfer/${id}`,
+	transferByid: (id: string) => `${placementTransfer}/transfer/${id}`,
 }
diff --git a/src/modules/02_transfer/views/AddTransfer.vue b/src/modules/02_transfer/views/AddTransfer.vue
index 3f86efb..d58cb90 100644
--- a/src/modules/02_transfer/views/AddTransfer.vue
+++ b/src/modules/02_transfer/views/AddTransfer.vue
@@ -46,17 +46,6 @@
 								</div>
 							</q-card>
 						</div>
-						<!-- <div class="col-xs-12 col-sm-4 row">
-							<q-card bordered flat>
-								<div class="q-pa-xs bg-grey-2 row items-center q-py-sm q-px-md justify-center text-bold">ข้อมูลการศึกษา</div>
-								<q-separator />
-								<div class="col-12 row q-pa-sm q-col-gutter-sm">
-									<q-input class="col-12" dense outlined v-model="edu" label="คุณวุฒิทางการศึกษา" :readonly="routeName != 'addTransfer'" />
-									<q-input class="col-12" dense outlined v-model="highEdu" label="คุณวุฒิทางการศึกษาสูงสุด" :readonly="routeName != 'addTransfer'" />
-									<q-input class="col-12" dense outlined v-model="eduEtc" label="คุณวุฒิทางการศึกษาอื่นๆหรือประกาศนียบัตรอื่นๆ" :readonly="routeName != 'addTransfer'" />
-								</div>
-							</q-card>
-						</div> -->
 					</div>
 					<!-- <div class="col-12 row q-col-gutter-md q-pa-md">
 						<div class="col-xs-12 col-sm-8 row">
@@ -307,17 +296,24 @@ import config from "@/app.config"
 
 const router = useRouter()
 const $q = useQuasar()
-
 const mixin = useCounterMixin()
 const { date2Thai, dateToISO, success, messageError, showLoader, hideLoader } = mixin
 const fileDocDataUpload = ref<File[]>([])
+const route = useRoute()
 const files = ref<any>()
 const tranferOrg = ref("")
 const noteReason = ref("")
+const id = ref<string>("")
 
 const routeName = router.currentRoute.value.name
 
-onMounted(() => {})
+onMounted(() => {
+	if (route.params.id !== undefined) {
+		id.value = route.params.id.toString()
+		fecthDataTransfer(id.value)
+	}
+})
+
 const saveTransfer = () => {
 	$q.dialog({
 		title: "ยืนยันการยื่นข้อมูลลาออก",
@@ -354,6 +350,25 @@ const createTransfer = async () => {
 		})
 }
 
+const fecthDataTransfer = async (id: string) => {
+	showLoader()
+	await http
+		.get(config.API.transferByid(id))
+		.then((res: any) => {
+			let data = res.data.result
+			// console.log(data);
+			tranferOrg.value = data.organization
+			noteReason.value = data.reason
+			files.value = data.file
+		})
+		.catch((e: any) => {
+			messageError($q, e)
+		})
+		.finally(() => {
+			hideLoader()
+		})
+}
+
 const fileUploadDoc = async (files: any) => {
 	fileDocDataUpload.value.push(files)
 }
diff --git a/src/modules/02_transfer/views/Main.vue b/src/modules/02_transfer/views/Main.vue
index 7425cfb..24e5112 100644
--- a/src/modules/02_transfer/views/Main.vue
+++ b/src/modules/02_transfer/views/Main.vue
@@ -106,30 +106,30 @@ onMounted(async () => {
 const fecthListTransfer = async () => {
 	console.log(config.API.listUserTransfer())
 
-	//showLoader()
+	showLoader()
 	await http
 		.get(config.API.listUserTransfer())
 		.then((res: any) => {
 			// console.log(res);
-			// let data = res.data.result
-			// console.log(data)
-			// rows.value = data.map((e: any) => ({
-			// 	id: e.id,
-			// 	date: date2Thai(e.date),
-			// 	status: e.status,
-			// 	position: e.organizationPositionOld,
-			// 	noPos: e.posNo,
-			// 	level: e.positionLevel,
-			// 	salary: e.salary,
-			// 	transfer: e.organization,
-			// }))
+			let data = res.data.result
+			console.log(data)
+			rows.value = data.map((e: any) => ({
+				id: e.id,
+				date: date2Thai(e.createdAt),
+				status: e.status,
+				position: e.organizationPositionOld,
+				noPos: e.posNo,
+				level: e.positionLevel,
+				salary: e.salary,
+				transfer: e.organization,
+			}))
 		})
 		.catch((e: any) => {
 			console.log("e")
-			//messageError($q, e)
+			messageError($q, e)
 		})
 		.finally(() => {
-			//hideLoader()
+			hideLoader()
 		})
 }
 
@@ -160,13 +160,13 @@ const clickAdd = async () => {
 						:titleText="''"
 					>
 						<template #columns="props">
-							<q-tr :props="props" class="cursor-pointer" @click="router.push(`/transfer/1`)">
+							<q-tr :props="props" class="cursor-pointer" @click="router.push(`/transfer/` + props.row.id)">
 								<q-td v-for="col in props.cols" :key="col.name" :props="props">
 									<div v-if="col.name == 'no'">
 										{{ props.rowIndex + 1 }}
 									</div>
 									<div v-else-if="col.name == 'status'">
-										<q-icon size="20px" v-if="props.row.status == 'รอดำเนินการ'" name="mdi-timer-sand" color="deep-orange">
+										<q-icon size="20px" v-if="props.row.status == 'WAITTING'" name="mdi-timer-sand" color="deep-orange">
 											<q-tooltip>รอดำเนินการ</q-tooltip>
 										</q-icon>
 										<q-icon size="20px" v-else name="mdi-check" color="teal">