Merge branch 'develop'

src/modules/05_leave/views/Main.vue

@@ -135,10 +135,17 @@ async function fetchStatsTable() {
                 : el.leaveTypeName === "ลากิจส่วนตัว"
                 ? "text-deep-purple"
                 : "text-indigo",
-            value: el.leavePercent,
+            value: Math.round(
-            all: el.leaveLimit,
+              (Number(el.leaveCountApprove) /
+                (Number(el.leaveLimit) + Number(el.leaveExtend))) *
+                100
+            ),
+            all: Number(el.leaveLimit) + Number(el.leaveExtend),
             use: el.leaveCountApprove,
-            remain: Number(el.leaveLimit) - Number(el.leaveCountApprove),
+            remain:
+              Number(el.leaveLimit) +
+              Number(el.leaveExtend) -
+              Number(el.leaveCountApprove),
           }));
       });
       stat.forEach((item) => itemPie.value.push(...item));

src/modules/06_evaluate/components/ExpertPageDetail.vue

@@ -256,16 +256,16 @@ async function onClickDowloadFile(
     {
       govAge: profile.value.government
         ? `${
-            profile.value.government.govAge.day !== 0
+            profile.value.government.govAge.year !== 0
-              ? `${profile.value.government.govAge.day} วัน`
+              ? `${profile.value.government.govAge.year} ปี`
               : ""
           } ${
             profile.value.government.govAge.month !== 0
               ? `${profile.value.government.govAge.month} เดือน`
               : ""
           } ${
-            profile.value.government.govAge.year !== 0
+            profile.value.government.govAge.day !== 0
-              ? `${profile.value.government.govAge.year} ปี`
+              ? `${profile.value.government.govAge.day} วัน`
               : ""
           }`
         : ``,
@@ -292,13 +292,17 @@ async function onClickDowloadFile(
           },
         }
       : null,
-    tp === "EV1_006" ? { commanderFullname: formData.commanderFullname } : null,
+    tp === "EV1_006" || tp === "EV1_008"
-    tp === "EV1_006" ? { commanderPosition: formData.commanderPosition } : null,
+      ? { commanderFullname: formData.commanderFullname }
+      : null,
+    tp === "EV1_006" || tp === "EV1_008"
+      ? { commanderPosition: formData.commanderPosition }
+      : null,
     tp === "EV1_006" ? { commanderOrg: "" } : null,
-    tp === "EV1_006"
+    tp === "EV1_006" || tp === "EV1_008"
       ? { commanderAboveFullname: formData.commanderAboveFullname }
       : null,
-    tp === "EV1_006"
+    tp === "EV1_006" || tp === "EV1_008"
       ? { commanderAbovePosition: formData.commanderAbovePosition }
       : null,
     tp === "EV1_006" ? { commanderAboveOrg: "" } : null,
@@ -311,7 +315,10 @@ async function onClickDowloadFile(
       ? { dateRetireLaw: dataPerson.formData.dateRetireLaw }
       : null,
 
-    tp === "EV1_010" ? { subject: formData.subject } : null
+    tp === "EV1_010" ? { subject: formData.subject } : null,
+    { typeTh: "เชี่ยวชาญ" },
+    { posNoWithSym: `(${dataPerson.formData.posNo})` },
+    { orgNoNewLine: dataPerson.formData.org }
   );
 
   const body = {