hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'nice_dev' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-02-09 15:53:19 +07:00
commit ca7c6db5d8
4 changed files with 102 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/modules/04_registry/components/Information/Government.vue
View file

@ -387,7 +387,7 @@
"
class="table_ellipsis"
>
{{ date2Thai(col.value) }}
{{ col.value }}
</div>
<div v-else class="table_ellipsis">
{{ col.value }}
@ -409,7 +409,10 @@ import http from "@/plugins/http";
import config from "@/app.config";
import HistoryTable from "@/components/TableHistory.vue";
import type { RequestItemsHistoryObject } from "@/modules/04_registry/interface/request/Government";
import type { ResponseObject } from "@/modules/04_registry/interface/response/Government";
import type {
ResponseObject,
RowHistory,
} from "@/modules/04_registry/interface/response/Government";
import { useRoute } from "vue-router";
import { useProfileDataStore } from "@/modules/04_registry/store";
import { storeToRefs } from "pinia";
@ -442,7 +445,7 @@ const { birthDate, retireText } = storeToRefs(profileStore);
const edit = ref<boolean>(false);
const govermentData = ref<Goverment>(defaultGoverment);
const myform = ref<any>();
const rowsHistory = ref<RequestItemsHistoryObject[]>([]); //select data history
const rowsHistory = ref<RowHistory[]>([]); //select data history
const tittleHistory = ref<string>("ประวัติแก้ไขข้อมูลราชการ"); //
const filterHistory = ref<string>(""); //search data table history
const modalHistory = ref<boolean>(false); //modal ประวัติการแก้ไขข้อมูล
@ -784,24 +787,24 @@ const clickHistory = async () => {
rowsHistory.value = [];
data.map((e: RequestItemsHistoryObject) => {
rowsHistory.value.push({
oc: e.oc,
position: e.position,
positionPathSide: e.positionPathSide,
posNo: e.posNo,
positionLine: e.positionLine,
positionType: e.positionType,
positionLevel: e.positionLevel,
positionExecutive: e.positionExecutive,
positionExecutiveSide: e.positionExecutiveSide,
dateAppoint: new Date(e.dateAppoint),
dateStart: new Date(e.dateStart),
retireDate: e.retireDate,
govAge: e.govAge,
govAgeAbsent: e.govAgeAbsent,
govAgePlus: e.govAgePlus,
reasonSameDate: e.reasonSameDate,
createdFullName: e.createdFullName,
createdAt: new Date(e.createdAt),
oc: e.oc ?? "-",
position: e.position ?? "-",
positionPathSide: e.positionPathSide ?? "-",
posNo: e.posNo ?? "-",
positionLine: e.positionLine ?? "-",
positionType: e.positionType ?? "-",
positionLevel: e.positionLevel ?? "-",
positionExecutive: e.positionExecutive ?? "-",
positionExecutiveSide: e.positionExecutiveSide ?? "-",
dateAppoint: date2Thai(e.dateAppoint) ?? "-",
dateStart: date2Thai(e.dateStart) ?? "-",
retireDate: e.retireDate ?? "-",
govAge: e.govAge ?? "-",
govAgeAbsent: e.govAgeAbsent ?? "-",
govAgePlus: e.govAgePlus ?? "-",
reasonSameDate: e.reasonSameDate ?? "-",
createdFullName: e.createdFullName ?? "-",
createdAt: date2Thai(e.createdAt) ?? "-",
});
});
})