เพิ่ม ผลการพิจารณา

ผลการพิจารณาของผู้มีอำนาจ
ผลการพิจารณาของผู้บังคับบัญชา

src/modules/03_leave/views/AddLeave.vue

@@ -87,6 +87,118 @@
 								</div>
 							</div>
 						</div>
+						<q-card bordered class="row col-12 text-dark q-mt-sm">
+    <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+      <div class="q-pl-sm text-weight-bold text-dark">
+        ผลการพิจารณาของผู้บังคับบัญชา
+      </div>
+    </div>
+    <q-separator />
+    <div class="row col-12 q-pa-md">
+      <div class="col-12 row bg-white q-col-gutter-md">
+        <div class="col-xs-6 row items-start">
+          <div class="col-12 text-top">สถานะ</div>
+          <div class="col-12 text-detail">
+            {{
+              dataDetail.commanderReject !== null
+                ? statusOrder(dataDetail.commanderReject)
+                : "-"
+            }}
+          </div>
+        </div>
+        <div class="col-xs-6 row items-start">
+          <div class="col-12 text-top">วันสุดท้ายที่ยับยั้ง</div>
+          <div class="col-12 text-detail">
+            {{
+              dataDetail.commanderRejectDate !== null
+                ? date2Thai(dataDetail.commanderRejectDate)
+                : "-"
+            }}
+          </div>
+        </div>
+        <div class="col-xs-12 row items-start">
+          <div class="col-12 text-top">ความคิดเห็นและเหตุผล</div>
+          <div
+            class="col-12 text-detail"
+            v-if="dataDetail.commanderReject === false"
+          >
+            {{
+              dataDetail.commanderApproveReason !== null
+                ? dataDetail.commanderApproveReason
+                : "-"
+            }}
+          </div>
+          <div
+            class="col-12 text-detail"
+            v-if="dataDetail.commanderReject === true"
+          >
+            {{
+              dataDetail.commanderRejectReason !== null
+                ? dataDetail.commanderRejectReason
+                : "-"
+            }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </q-card>
+
+  <q-card bordered class="row col-12 text-dark q-mt-sm">
+    <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
+      <div class="q-pl-sm text-weight-bold text-dark">
+        ผลการพิจารณาของผู้มีอำนาจ
+      </div>
+    </div>
+    <q-separator />
+    <div class="row col-12 q-pa-md">
+      <div class="col-12 row bg-white q-col-gutter-md">
+        <div class="col-xs-6 row items-start">
+          <div class="col-12 text-top">สถานะ</div>
+          <div class="col-12 text-detail">
+            {{
+              dataDetail.oligarchReject !== null
+                ? statusOrder(dataDetail.oligarchReject)
+                : "-"
+            }}
+          </div>
+        </div>
+        <div class="col-xs-6 row items-start">
+          <div class="col-12 text-top">วันสุดท้ายที่ยับยั้ง</div>
+          <div class="col-12 text-detail">
+            {{
+              dataDetail.oligarchRejectDate !== null
+                ? date2Thai(dataDetail.oligarchRejectDate)
+                : "-"
+            }}
+          </div>
+        </div>
+        <div class="col-xs-12 row items-start">
+          <div class="col-12 text-top">ความคิดเห็นและเหตุผล</div>
+          <div
+            class="col-12 text-detail"
+            v-if="dataDetail.oligarchReject == false"
+          >
+            {{
+              dataDetail.oligarchApproveReason !== null
+                ? dataDetail.oligarchApproveReason
+                : "-"
+            }}
+          </div>
+          <div
+            class="col-12 text-detail"
+            v-else-if="dataDetail.oligarchReject == true"
+          >
+            {{
+              dataDetail.oligarchRejectReason !== null
+                ? dataDetail.oligarchRejectReason
+                : "-"
+            }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </q-card>
+
 					</div>
 					<q-separator v-if="routeName == 'AddLeave'" />
 					<div class="row col-12 q-pa-md" v-if="routeName == 'AddLeave'">
@@ -122,6 +234,38 @@ const dateLeave = ref<Date>(new Date())
 const noteReason = ref("")
 const nameFile = ref<string>("")
 
+const dataDetail = ref<any>({
+  datetext: "",
+  activeDate: new Date(),
+  createdAt: new Date(),
+  firstName: "",
+  id: "",
+  isActive: true,
+  lastName: "",
+  location: "",
+  organizationPositionOld: "",
+  positionLevelOld: "",
+  positionNumberOld: "",
+  positionTypeOld: "",
+  prefix: "",
+  profileId: "",
+  reason: "",
+  salary: 0,
+  sendDate: new Date(),
+  status: "",
+  statustext: "",
+  fullname: "",
+});
+
+const statusOrder = (val: boolean) => {
+  switch (val) {
+    case true:
+      return "ยับยั้งการลาออก";
+    case false:
+      return "อนุมัติการลาออก";
+  }
+};
+
 onMounted(() => {
 	if (route.params.id !== undefined) {
 		id.value = route.params.id.toString()
@@ -176,7 +320,8 @@ const fectDataresign = async (id: string) => {
 		.then((res: any) => {
 			let data = res.data.result
 			// console.log(data);
-			;(tranferOrg.value = data.location), (dateCommand.value = data.sendDate), (dateLeave.value = data.activeDate), (noteReason.value = data.reason), (files.value = data.docs)
+			;(tranferOrg.value = data.location), (dateCommand.value = data.sendDate), (dateLeave.value = data.activeDate), (noteReason.value = data.reason), (files.value = data.docs) ,(dataDetail.value = data)
+
 		})
 		.catch((e: any) => {
 			console.log(e)