From ec460a55f54dfdf106f5e9458cf8ebe108a1c722 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 8 Jan 2024 17:58:48 +0700
Subject: [PATCH] no message

---
 src/modules/06_evaluate/components/step/step2.vue |  4 ++--
 src/modules/06_evaluate/components/step/step6.vue | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/modules/06_evaluate/components/step/step2.vue b/src/modules/06_evaluate/components/step/step2.vue
index eeb90fb..edfa89c 100644
--- a/src/modules/06_evaluate/components/step/step2.vue
+++ b/src/modules/06_evaluate/components/step/step2.vue
@@ -225,8 +225,8 @@ async function fetchPathUpload(
     fileList: {
       fileName: type,
       metadata: {
-        subject: performance.value,
-        author: performanceOwner.value,
+        subject: formCommand.subject,
+        author: formCommand.author,
       },
     },
   };
diff --git a/src/modules/06_evaluate/components/step/step6.vue b/src/modules/06_evaluate/components/step/step6.vue
index 9cb7cd9..b6b9c92 100644
--- a/src/modules/06_evaluate/components/step/step6.vue
+++ b/src/modules/06_evaluate/components/step/step6.vue
@@ -33,10 +33,6 @@ const emit = defineEmits(["update:form"]);
 
 const fileEvaluation1 = ref<any>();
 
-const performance = ref<string>("");
-const performanceOwner = ref<string>("");
-const position = ref<string>("");
-
 /** form จัดเตรียมเอกสารเล่ม 2*/
 const formCommand = reactive<FormCommand>({
   commanderFullname: "",
@@ -92,9 +88,9 @@ async function fetchPathUpload(
     fileList: {
       fileName: type,
       metadata: {
-        subject: performance.value,
-        author: performanceOwner.value,
-        position: position.value,
+        subject: formCommand.subject,
+        author: formCommand.author,
+        position: formCommand.assignedPosition,
       },
     },
   };