Merge branch 'develop' of github.com:Frappet/hrms-mgt into develop

src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue

@@ -18,6 +18,7 @@ import type {
   ResListSalary,
   ResType,
 } from "@/modules/04_registryPerson/interface/response/Salary";
+import type { DataCardPos } from "@/modules/04_registryPerson/interface/index/government";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 import DialogHistory from "@/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue";
@@ -338,7 +339,7 @@ const posExecutiveOptionMain = ref<DataOption[]>([]);
 
 const docOption = ref<DataOption2[]>(store.optionTemplateDoc);
 
-const cardData = ref<any[]>([
+const cardData = ref<DataCardPos[]>([
   {
     label: "ระยะเวลาดำรงตำแหน่งในสายงาน",
     data: [],
@@ -827,9 +828,7 @@ onMounted(async () => {
         </div>
         <div class="col-12"><q-separator /></div>
         <q-card-section class="q-pt-none" style="min-height: 200px">
-          <li v-for="data in item.data" :key="data.id">
-            {{ data.name }} {{ data.time }}
-          </li>
+          <li v-for="data in item.data">{{ data.name }} {{ data.time }}</li>
         </q-card-section>
       </q-card>
     </div>

src/modules/04_registryPerson/interface/index/government.ts

@@ -47,4 +47,14 @@ interface RequestItemsHistoryObject {
   createdFullName: string | null;
   createdAt: Date;
 }
-export type { RequestItemsHistoryObject, FormMain };
+
+interface DataCardPos {
+  label: string;
+  data?: Data[];
+}
+
+interface Data {
+  name: string;
+  time: string;
+}
+export type { RequestItemsHistoryObject, FormMain, DataCardPos };

src/modules/21_report/components/CardPosition.vue

@@ -6,6 +6,8 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 
+import type { DataCardPos } from "@/modules/04_registryPerson/interface/index/government";
+
 const $q = useQuasar();
 const { messageError, formatDatePosition } = useCounterMixin();
 
@@ -19,7 +21,7 @@ const props = defineProps({
   type: { type: String, default: "" },
 });
 
-const cardData = ref<any[]>([
+const cardData = ref<DataCardPos[]>([
   {
     label: "ระยะเวลาดำรงตำแหน่งในสายงาน",
     data: [],
@@ -93,7 +95,7 @@ onMounted(() => {
             <q-item-section>
               <q-item-label class="text-grey-6">{{ item.label }}</q-item-label>
               <q-item-label
-                ><li v-for="data in item.data" :key="data.id">
+                ><li v-for="data in item.data">
                   {{ data.name }} {{ data.time }}
                 </li>
               </q-item-label>