From b6ab59e5ee304f629e9348240268dadd6de4e301 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 23 Apr 2025 14:18:10 +0700
Subject: [PATCH] =?UTF-8?q?Bug=20=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Achievement/01_ProfessionalLicense.vue    |  9 ++---
 .../GovernmentInformation/02_Discipline.vue   | 13 +++----
 .../02_NameChangeHistory.vue                  | 36 +++++++++++++++++--
 .../detail/Salary/01_PositionSalary.vue       |  2 ++
 .../detail/Salary/02_NotReceiveSalary.vue     |  6 ++--
 5 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
index 8fc8a1551..67e9f06f3 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -240,20 +240,17 @@ async function uploadfile(subId: string) {
 
     //อัพโหลไฟล์
     await uploadFile(uploadUrl, fileUpload.value);
-    await updateIsUpload();
+    await updateIsUpload(subId);
   } catch (err) {
     messageError($q, err);
   }
 }
 
 /** ฟังก์ชันอัพเดทสถานะอัพโหลด*/
-async function updateIsUpload() {
+async function updateIsUpload(subId: string) {
   await http
     .patch(
-      config.API.profileNewCertificateByCertificateId(
-        editId.value,
-        empType.value
-      ),
+      config.API.profileNewCertificateByCertificateId(subId, empType.value),
       {
         isUpload: fileUpload.value ? true : false,
       }
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
index b754ac899..62dbb8150 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
@@ -400,21 +400,18 @@ async function uploadfile(id: string) {
 
     //อัพโหลไฟล์
     await uploadFile(uploadUrl, fileUpload.value);
-    await updateIsUpload();
+    await updateIsUpload(id);
   } catch (err) {
     messageError($q, err);
   }
 }
 
 /** ฟังก์ชันอัพเดทสถานะอัพโหลด*/
-async function updateIsUpload() {
+async function updateIsUpload(id: string) {
   await http
-    .patch(
-      config.API.profileNewDisciplineByDisciplineId(id.value, empType.value),
-      {
-        isUpload: fileUpload.value ? true : false,
-      }
-    )
+    .patch(config.API.profileNewDisciplineByDisciplineId(id, empType.value), {
+      isUpload: fileUpload.value ? true : false,
+    })
     .then(() => {
       fileUpload.value = null;
     });
diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
index c70426561..7f4b94024 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
@@ -618,7 +618,7 @@ onMounted(async () => {
                   <q-btn
                     v-if="scope.queuedFiles.length > 0"
                     icon="clear_all"
-                    @click="scope.removeQueuedFiles"
+                    @click="scope.removeQueuedFiles, (fileUpload = undefined)"
                     round
                     dense
                     flat
@@ -628,7 +628,7 @@ onMounted(async () => {
                   <q-btn
                     v-if="scope.uploadedFiles.length > 0"
                     icon="done_all"
-                    @click="scope.removeUploadedFiles"
+                    @click="scope.removeUploadedFiles, (fileUpload = undefined)"
                     round
                     dense
                     flat
@@ -663,7 +663,7 @@ onMounted(async () => {
                   <q-btn
                     v-if="scope.isUploading"
                     icon="clear"
-                    @click="scope.abort"
+                    @click="scope.abort, (fileUpload = undefined)"
                     round
                     dense
                     flat
@@ -672,6 +672,36 @@ onMounted(async () => {
                   </q-btn>
                 </div>
               </template>
+
+              <template v-slot:list="scope">
+                <q-list separator>
+                  <q-item v-for="file in scope.files" :key="file.__key">
+                    <q-item-section>
+                      <q-item-label class="full-width ellipsis">
+                        {{ file.name }}
+                      </q-item-label>
+
+                      <q-item-label caption>
+                        {{ file.__sizeLabel }} / {{ file.__progressLabel }}
+                      </q-item-label>
+                    </q-item-section>
+
+                    <q-item-section top side>
+                      <q-btn
+                        class="gt-xs"
+                        size="12px"
+                        flat
+                        dense
+                        round
+                        icon="delete"
+                        @click="
+                          scope.removeFile(file), (fileUpload = undefined)
+                        "
+                      />
+                    </q-item-section>
+                  </q-item>
+                </q-list>
+              </template>
             </q-uploader>
             <div
               v-if="alertUpload && dialogStatus === 'create'"
diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
index adce3ddfb..61f5a4cb3 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -679,6 +679,7 @@ function onSubmit() {
         ...formData,
         commandDateAffect: convertDateToAPI(formData.commandDateAffect),
         commandDateSign: convertDateToAPI(formData.commandDateSign),
+        commandName: store.convertCommandCodeName(formData.commandCode),
         amount: Number(String(formData.amount)?.replace(/,/g, "")),
         amountSpecial: Number(
           String(formData.amountSpecial)?.replace(/,/g, "")
@@ -690,6 +691,7 @@ function onSubmit() {
           String(formData.mouthSalaryAmount)?.replace(/,/g, "")
         ),
       });
+
       await fetchListSalary();
       onClickCloseDialog();
       success($q, "บันทึกข้อมูลสำเร็จ");
diff --git a/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
index c148fe868..d6ab74c1f 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
@@ -233,16 +233,16 @@ async function uploadfile(id: string) {
 
     //อัพโหลไฟล์
     await uploadFile(uploadUrl, fileUpload.value);
-    await updateIsUpload();
+    await updateIsUpload(id);
   } catch (err) {
     messageError($q, err);
   }
 }
 
 /** ฟังก์ชันอัพเดทสถานะอัพโหลด*/
-async function updateIsUpload() {
+async function updateIsUpload(id: string) {
   await http
-    .patch(config.API.profileNewNoPaidById(id.value, empType.value), {
+    .patch(config.API.profileNewNoPaidById(id, empType.value), {
       isUpload: fileUpload.value ? true : false,
     })
     .then(() => {