From 8337d743685132a2906f64985d829fc78f2f51f6 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 22 Jan 2025 17:52:40 +0700
Subject: [PATCH 1/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=81?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=9A=E0=B8=A1=E0=B8=AD=E0=B8=9A=E0=B8=AB=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=AF=20?=
 =?UTF-8?q?=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=80=E0=B9=80=E0=B8=AA=E0=B8=94?=
 =?UTF-8?q?=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/probation/api.probation.ts            |  1 +
 .../components/03_AssignPage.vue              |  2 +-
 .../15_probationReport/interface/Main.ts      |  8 +++++++
 src/modules/15_probationReport/views/main.vue | 22 +++++++++++--------
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/api/probation/api.probation.ts b/src/api/probation/api.probation.ts
index 003d1eb..0d4be07 100644
--- a/src/api/probation/api.probation.ts
+++ b/src/api/probation/api.probation.ts
@@ -21,6 +21,7 @@ export default {
     `${probation}/data-options/knowledge?personal_id=${personalId}`,
   probationsGetAssign: (assignId: string) =>
     `${probation}/assign/probation-assign?assign_id=${assignId}`,
+  probationsGetAssignNew: (assignId: string) => `${probation}/assign?assign_id=${assignId}`,
   summarySurveyDetail: (id: string) => `${probation}/survey?assign_id=${id}`,
   summaryDetail: () => `${probation}/survey`,
   saveEditAssign: (personalId: string) =>
diff --git a/src/modules/15_probationReport/components/03_AssignPage.vue b/src/modules/15_probationReport/components/03_AssignPage.vue
index 47c6631..6ebcfdc 100644
--- a/src/modules/15_probationReport/components/03_AssignPage.vue
+++ b/src/modules/15_probationReport/components/03_AssignPage.vue
@@ -763,7 +763,7 @@ async function DataSave(id: string) {
 /** get ข้อมูลรายการมอบหมาย */
 async function getAssign() {
   await http
-    .get(config.API.probationsGetAssign(probationStore.assignId))
+    .get(config.API.probationsGetAssignNew(probationStore.assignId))
     .then((res) => {
       isEdit.value = false;
       const data = res.data.result;
diff --git a/src/modules/15_probationReport/interface/Main.ts b/src/modules/15_probationReport/interface/Main.ts
index 5f56050..ef1950a 100644
--- a/src/modules/15_probationReport/interface/Main.ts
+++ b/src/modules/15_probationReport/interface/Main.ts
@@ -71,6 +71,13 @@ interface ProbationReportType {
   pass_result: number;
   evaluate_date: Date;
 }
+
+interface FileType{
+  path:string
+  pathname:string
+  fileName:string
+  title:string
+}
 export type {
   ListDataText,
   DataSurvey,
@@ -78,4 +85,5 @@ export type {
   AppointTopicMain,
   AppointTopic,
   ProbationReportType,
+  FileType
 };
diff --git a/src/modules/15_probationReport/views/main.vue b/src/modules/15_probationReport/views/main.vue
index ba9a0ec..e8a2d86 100644
--- a/src/modules/15_probationReport/views/main.vue
+++ b/src/modules/15_probationReport/views/main.vue
@@ -11,6 +11,7 @@ import { useProbationReport } from "@/modules/15_probationReport/store";
 import type {
   DataSurvey,
   ProbationReportType,
+  FileType
 } from "@/modules/15_probationReport/interface/Main";
 
 import SurveyPage from "@/modules/15_probationReport/components/01_SurveyPage.vue";
@@ -25,9 +26,12 @@ const { showLoader, hideLoader, messageError } = mixin;
 
 const dataSurvey = ref<any>(null);
 const isData = ref<boolean>(true);
-const dataProbation = ref<string>("");
-const dataResult1 = ref<string>("");
-const dataResult2 = ref<string>("");
+const dataProbation = ref<FileType[]>([]);
+const dataResult1 = ref<FileType[]>([]);
+const dataResult2 = ref<FileType[]>([]);
+// const dataProbation = ref<string>("");
+// const dataResult1 = ref<string>("");
+// const dataResult2 = ref<string>("");
 
 const formDataResult = ref<ProbationReportType>({
   develop_orientation_score: 0,
@@ -115,15 +119,15 @@ async function getSalary(
   id: string,
   name: string,
   group: string,
-  val: Ref<string>
+  val: Ref<FileType[]>
 ) {
   await http
     .get(config.API.developmentSalaryFile(name, group, id))
     .then((res) => {
-      val.value = res.data.fileName;
+      val.value = res.data;
     })
     .catch((e) => {
-      messageError($q, e);
+      // messageError($q, e);
     });
 }
 
@@ -170,16 +174,16 @@ onMounted(async () => {
           >
             <q-tab name="SURVEY" label="แบบสํารวจความคิดเห็น" />
             <q-tab
-              v-if="dataResult1"
+              v-if="dataResult1.length > 0"
               name="RESULT1"
               label="ผลการประเมินการฯ ครั้งที่ 1"
             />
             <q-tab
-              v-if="dataResult2"
+              v-if="dataResult2.length > 0"
               name="RESULT2"
               label="ผลการประเมินการฯ ครั้งที่ 2"
             />
-            <q-tab v-if="dataProbation" name="ASSIGN" label="แบบมอบหมายงานฯ" />
+            <q-tab v-if="dataProbation.length > 0" name="ASSIGN" label="แบบมอบหมายงานฯ" />
           </q-tabs>
 
           <q-separator />

From fcbce0f9943c835b5e074113ecca2e096c002d7d Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 22 Jan 2025 17:53:59 +0700
Subject: [PATCH 2/5] no message

---
 src/modules/15_probationReport/views/main.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/modules/15_probationReport/views/main.vue b/src/modules/15_probationReport/views/main.vue
index e8a2d86..c0813df 100644
--- a/src/modules/15_probationReport/views/main.vue
+++ b/src/modules/15_probationReport/views/main.vue
@@ -11,7 +11,7 @@ import { useProbationReport } from "@/modules/15_probationReport/store";
 import type {
   DataSurvey,
   ProbationReportType,
-  FileType
+  FileType,
 } from "@/modules/15_probationReport/interface/Main";
 
 import SurveyPage from "@/modules/15_probationReport/components/01_SurveyPage.vue";
@@ -124,7 +124,7 @@ async function getSalary(
   await http
     .get(config.API.developmentSalaryFile(name, group, id))
     .then((res) => {
-      val.value = res.data;
+      val.value = res.data ? res.data : [];
     })
     .catch((e) => {
       // messageError($q, e);
@@ -183,7 +183,11 @@ onMounted(async () => {
               name="RESULT2"
               label="ผลการประเมินการฯ ครั้งที่ 2"
             />
-            <q-tab v-if="dataProbation.length > 0" name="ASSIGN" label="แบบมอบหมายงานฯ" />
+            <q-tab
+              v-if="dataProbation.length > 0"
+              name="ASSIGN"
+              label="แบบมอบหมายงานฯ"
+            />
           </q-tabs>
 
           <q-separator />

From 3e3147686c6752368c16c47ca53e3ddb8c4b489d Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 22 Jan 2025 18:02:37 +0700
Subject: [PATCH 3/5] =?UTF-8?q?=E0=B8=A5=E0=B8=9A=E0=B8=9B=E0=B8=B8?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/03_AssignPage.vue              | 90 +------------------
 1 file changed, 3 insertions(+), 87 deletions(-)

diff --git a/src/modules/15_probationReport/components/03_AssignPage.vue b/src/modules/15_probationReport/components/03_AssignPage.vue
index 6ebcfdc..bacc4b0 100644
--- a/src/modules/15_probationReport/components/03_AssignPage.vue
+++ b/src/modules/15_probationReport/components/03_AssignPage.vue
@@ -1094,42 +1094,12 @@ onMounted(async () => {
 </script>
 
 <template>
-  <q-form
-    greedy
-    @submit.prevent
-    @validation-success="
-      probationStore.assignId !== undefined
-        ? saveEdit(probationStore.assignId)
-        : saveData(personalId)
-    "
-  >
+  <q-form>
     <div class="q-pa-sm">
       <div class="toptitle text-dark col-12 row items-center">
-        <q-btn
-          icon="mdi-arrow-left"
-          unelevated
-          round
-          dense
-          flat
-          color="primary"
-          class="q-mr-sm"
-          @click="router.go(-1)"
-          v-if="routeName == 'probationWorkAdd'"
-        />
-
-        <div v-if="routeName == 'probationWorkAdd'">
-          เพิ่มแบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ
-        </div>
-        <div v-else class="col-12 row q-gutter-md">
+        <div class="col-12 row q-gutter-md">
           <div>แบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ</div>
-          <q-btn
-            v-if="!isEdit"
-            size="12px"
-            flat
-            dense
-            icon="mdi-download"
-            color="primary"
-          >
+          <q-btn size="12px" flat dense icon="mdi-download" color="primary">
             <q-tooltip>ดาวน์โหลด</q-tooltip>
             <q-menu>
               <q-list style="min-width: 150px">
@@ -1156,50 +1126,6 @@ onMounted(async () => {
               </q-list>
             </q-menu>
           </q-btn>
-
-          <div v-if="!isEdit">
-            <q-btn
-              v-if="
-                !checkRoutePermisson &&
-                probationStore.dataPermissions?.tab1.isEdit
-              "
-              dense
-              flat
-              round
-              color="edit"
-              @click="edit()"
-              icon="edit"
-            >
-              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-            </q-btn>
-          </div>
-
-          <div v-else>
-            <q-btn
-              v-if="!checkRoutePermisson"
-              dense
-              flat
-              round
-              color="red"
-              @click="cancel()"
-              icon="mdi-undo"
-            >
-              <q-tooltip>ยกเลิก</q-tooltip>
-            </q-btn>
-            <!-- @click="saveEdit(assignId)" -->
-            <q-btn
-              v-if="!checkRoutePermisson"
-              dense
-              flat
-              class="q-ml-md"
-              round
-              color="public"
-              type="submit"
-              icon="mdi-content-save-outline"
-            >
-              <q-tooltip>บันทึกข้อมูล</q-tooltip>
-            </q-btn>
-          </div>
         </div>
       </div>
 
@@ -2889,16 +2815,6 @@ onMounted(async () => {
             </div>
           </div>
         </div>
-        <q-separator v-show="routeName == 'probationWorkAdd'" />
-        <div
-          v-show="routeName == 'probationWorkAdd'"
-          class="flex justify-end q-pa-sm q-gutter-sm"
-        >
-          <q-btn unelevated label="บันทึก" type="submit" color="public"
-            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
-          >
-        </div>
-        <!-- @click="saveData(personalId)" -->
       </div>
     </div>
   </q-form>

From 5920adfb8843fbd1d89ac788e6fddd451c86f591 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 23 Jan 2025 09:14:48 +0700
Subject: [PATCH 4/5] fix

---
 src/modules/03_retire/views/addRetire.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue
index 30e535c..c5ee0bc 100644
--- a/src/modules/03_retire/views/addRetire.vue
+++ b/src/modules/03_retire/views/addRetire.vue
@@ -219,13 +219,17 @@ onMounted(async () => {
             style="padding-bottom: 0px"
           >
             <div class="q-pl-sm text-grey-7" v-if="dataDetail.cancelReason">
-              เหตุผลการขอยกเลิก:
+              เหตุผลการขอยกเลิก :
               <spen class="text-red">{{ dataDetail.cancelReason }}</spen>
             </div>
 
             <q-space />
             <q-btn
-              v-if="dataDetail.statusMain !== 'CANCEL' && checkCancleLeave"
+              v-if="
+                dataDetail.statusMain !== 'CANCEL' &&
+                dataDetail.statusMain !== 'DONECANCEL' &&
+                checkCancleLeave
+              "
               unelevated
               color="orange"
               label="ยกเลิกการลาออก"
@@ -235,7 +239,8 @@ onMounted(async () => {
 
             <q-btn
               v-else-if="
-                dataDetail.statusMain === 'CANCEL' &&
+                (dataDetail.statusMain === 'CANCEL' ||
+                  dataDetail.statusMain === 'DONECANCEL') &&
                 dataStore.officerType == 'OFFICER'
               "
               unelevated

From 8ad8e9354a742bdb8882546dd986e6afda006a0f Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Thu, 23 Jan 2025 11:12:35 +0700
Subject: [PATCH 5/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=9F?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=A5=E0=B9=80=E0=B8=95=E0=B8=AD=E0=B8=A3=E0=B9=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../10_registry/04_Achievement/03_Insignia.vue    | 15 ++++++++++++++-
 src/modules/10_registry/Dialog/DialogHistory.vue  |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/modules/10_registry/04_Achievement/03_Insignia.vue b/src/modules/10_registry/04_Achievement/03_Insignia.vue
index 2f6984e..5a8d4fc 100644
--- a/src/modules/10_registry/04_Achievement/03_Insignia.vue
+++ b/src/modules/10_registry/04_Achievement/03_Insignia.vue
@@ -23,7 +23,8 @@ const rowsHistoryData = ref<InsigniaFormType[]>([]);
 const $q = useQuasar();
 const mode = ref<boolean>($q.screen.gt.xs);
 const mixin = useCounterMixin();
-const { showLoader, hideLoader, messageError, date2Thai,onSearchDataTable } = mixin;
+const { showLoader, hideLoader, messageError, date2Thai, onSearchDataTable } =
+  mixin;
 
 const modalHistory = ref<boolean>(false);
 /** ตัวแปรข้อมูล */
@@ -78,6 +79,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "insigniaId",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (val, row) => {
+      return `${row.insignia.name} (${row.insignia.shortName})`;
+    },
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
@@ -87,6 +91,9 @@ const columns = ref<QTableProps["columns"]>([
     label: "ลำดับชั้น",
     sortable: true,
     field: (v) => v.insignia.insigniaType.name,
+    format: (val, row) => {
+      return `${row.insignia.insigniaType.name}`;
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -278,6 +285,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
     field: "insigniaId",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (val, row) => {
+      return `${row.insignia.name} (${row.insignia.shortName})`;
+    },
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
@@ -287,6 +297,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
     label: "ลำดับชั้น",
     sortable: true,
     field: (v) => v.insignia.insigniaType.name,
+    format: (val, row) => {
+      return `${row.insignia.insigniaType.name}`;
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
diff --git a/src/modules/10_registry/Dialog/DialogHistory.vue b/src/modules/10_registry/Dialog/DialogHistory.vue
index 79d3222..f7e76fe 100644
--- a/src/modules/10_registry/Dialog/DialogHistory.vue
+++ b/src/modules/10_registry/Dialog/DialogHistory.vue
@@ -24,6 +24,7 @@ const props = defineProps({
 });
 function close() {
   modal.value = false;
+  filter.value = ''
 }
 
 function dateThaiRange(val: [Date, Date]) {