From 46bfcad15698abb5a35109a563a8aa45bf03d47f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 8 Feb 2024 15:08:58 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80?=
 =?UTF-8?q?=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/04_registry/components/Salary.vue | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/modules/04_registry/components/Salary.vue b/src/modules/04_registry/components/Salary.vue
index ee95a94aa..46dd9062d 100644
--- a/src/modules/04_registry/components/Salary.vue
+++ b/src/modules/04_registry/components/Salary.vue
@@ -1826,39 +1826,39 @@ const clickHistory = async (row: RequestItemsObject) => {
         rowsHistory.value.push({
           id: e.id,
           date: new Date(e.date),
-          amount: e.amount,
-          positionSalaryAmount: e.positionSalaryAmount,
-          mouthSalaryAmount: e.mouthSalaryAmount,
+          amount: e.amount ?? "_",
+          positionSalaryAmount: e.positionSalaryAmount ?? "_",
+          mouthSalaryAmount: e.mouthSalaryAmount ?? "_",
           oc: e.oc,
           ocId: e.ocId,
-          position: e.position,
+          position: e.position ?? "_",
           positionId: e.positionId,
-          positionName: e.positionName,
-          posNo: e.posNo,
+          positionName: e.positionName ?? "_",
+          posNo: e.posNo ?? "_",
           posNoId: e.posNoId,
-          positionLine: e.positionLine,
-          positionLineName: e.positionLineName,
-          positionLineId: e.positionLineId,
-          positionPathSide: e.positionPathSide,
-          positionPathSideId: e.positionPathSideId,
-          positionPathSideName: e.positionPathSideName,
-          positionType: e.positionType,
-          positionTypeId: e.positionTypeId,
-          positionLevel: e.positionLevel,
-          positionLevelId: e.positionLevelId,
-          positionExecutive: e.positionExecutive,
-          positionExecutiveId: e.positionExecutiveId,
-          positionExecutiveName: e.positionExecutiveName,
-          positionExecutiveSide: e.positionExecutiveSide,
-          positionExecutiveSideId: e.positionExecutiveSideId,
-          salaryClass: e.salaryClass,
-          salaryStatus: e.salaryStatus,
-          salaryRef: e.salaryRef,
-          refCommandNo: e.refCommandNo,
-          createdFullName: e.createdFullName,
-          orgName: e.orgName,
-          agencyName: e.agencyName,
-          cLevel: e.cLevel,
+          positionLine: e.positionLine ?? "_",
+          positionLineName: e.positionLineName ?? "_",
+          positionLineId: e.positionLineId ?? "_",
+          positionPathSide: e.positionPathSide ?? "_",
+          positionPathSideId: e.positionPathSideId ?? "_",
+          positionPathSideName: e.positionPathSideName ?? "_",
+          positionType: e.positionType ?? "_",
+          positionTypeId: e.positionTypeId ?? "_",
+          positionLevel: e.positionLevel ?? "_",
+          positionLevelId: e.positionLevelId ?? "_",
+          positionExecutive: e.positionExecutive ?? "_",
+          positionExecutiveId: e.positionExecutiveId ?? "_",
+          positionExecutiveName: e.positionExecutiveName ?? "_",
+          positionExecutiveSide: e.positionExecutiveSide ?? "_",
+          positionExecutiveSideId: e.positionExecutiveSideId ?? "_",
+          salaryClass: e.salaryClass ?? "_",
+          salaryStatus: e.salaryStatus ?? "_",
+          salaryRef: e.salaryRef ?? "_",
+          refCommandNo: e.refCommandNo ?? "_",
+          createdFullName: e.createdFullName ?? "_",
+          orgName: e.orgName ?? "_",
+          agencyName: e.agencyName ?? "_",
+          cLevel: e.cLevel ?? "_",
           createdAt: new Date(e.createdAt),
         });
       });