diff --git a/src/api/registry/api.registry.ts b/src/api/registry/api.registry.ts index b3c917ffd..f09b87edd 100644 --- a/src/api/registry/api.registry.ts +++ b/src/api/registry/api.registry.ts @@ -15,11 +15,10 @@ export default { // ประวัติส่วนตัว profileNewProfileByProfileId: (profileId: string) => - `${registryNew}${profileId}`, - profileNewProfileById: (dataId: string) => - `${registryNew}${dataId}`, + `${registryNew}${profileId}`, + profileNewProfileById: (dataId: string) => `${registryNew}${dataId}`, profileNewProfileHisById: (dataId: string) => - `${registryNew}history/${dataId}`, + `${registryNew}history/${dataId}`, // บันทึกวันที่ไม่ได้รับเงินเดือนฯ profileNewNoPaid: `${registryNew}nopaid`, @@ -98,30 +97,34 @@ export default { profileNewOtherHisById: (dataId: string) => `${registryNew}other/history/${dataId}`, - // ข้อมูลครอบครัว -profileNewFamily: `${registryNew}family`, -profileNewFamilyByProfileId: (profileId: string) => -`${registryNew}family/${profileId}`, -profileNewFamilyByFamilyId: (familyId: string) => -`${registryNew}family/${familyId}`, -profileNewFamilyeHisByFamilyId: (familyId: string) => -`${registryNew}family/history/${familyId}`, + // ข้อมูลครอบครัว + profileNewFamily: `${registryNew}family`, + profileNewFamilyByProfileId: (profileId: string) => + `${registryNew}family/${profileId}`, + profileNewFamilyByFamilyId: (familyId: string) => + `${registryNew}family/${familyId}`, + profileNewFamilyeHisByFamilyId: (familyId: string) => + `${registryNew}family/history/${familyId}`, - // วินัย -profileNewDiscipline: `${registryNew}discipline`, -profileNewDisciplineByProfileId: (profileId: string) => -`${registryNew}discipline/${profileId}`, -profileNewDisciplineByDisciplineId: (disciplineId: string) => -`${registryNew}discipline/${disciplineId}`, -profileNewDisciplineHisByDisciplineId: (disciplineId: string) => -`${registryNew}discipline/history/${disciplineId}`, + // วินัย + profileNewDiscipline: `${registryNew}discipline`, + profileNewDisciplineByProfileId: (profileId: string) => + `${registryNew}discipline/${profileId}`, + profileNewDisciplineByDisciplineId: (disciplineId: string) => + `${registryNew}discipline/${disciplineId}`, + profileNewDisciplineHisByDisciplineId: (disciplineId: string) => + `${registryNew}discipline/history/${disciplineId}`, - // ปฏิบัติราชการพิเศษ -profileNewDuty: `${registryNew}duty`, -profileNewDutyByProfileId: (profileId: string) => -`${registryNew}duty/${profileId}`, -profileNewDutyByDutyId: (dutyId: string) => -`${registryNew}duty/${dutyId}`, -profileNewDutyHisByDutyId: (dutyId: string) => -`${registryNew}duty/history/${dutyId}`, + // ปฏิบัติราชการพิเศษ + profileNewDuty: `${registryNew}duty`, + profileNewDutyByProfileId: (profileId: string) => + `${registryNew}duty/${profileId}`, + profileNewDutyByDutyId: (dutyId: string) => `${registryNew}duty/${dutyId}`, + profileNewDutyHisByDutyId: (dutyId: string) => + `${registryNew}duty/history/${dutyId}`, + + /** ตำแหน่งเงินเดือน*/ + profileSalaryNew: `${env.API_URI}/org/profileSalary`, + profileSalaryNewById: (id: string) => + `${env.API_URI}/org/profileSalary/${id}`, }; diff --git a/src/modules/04_registry/components/Insignia.vue b/src/modules/04_registry/components/Insignia.vue index 9c9af62f4..f20faedc4 100644 --- a/src/modules/04_registry/components/Insignia.vue +++ b/src/modules/04_registry/components/Insignia.vue @@ -588,7 +588,7 @@ const OpsFilter = ref({ insigniaOptions: [], }); -const note = ref(); +const note = ref(); const insigniaType = ref(); const year = ref(0); const no = ref(); @@ -1356,7 +1356,7 @@ const selectData = async (props: DataProps) => { refCommandDateInput.value = props.row.refCommandDate ? convertDateDisplay(props.row.refCommandDate as Date) : ""; - note.value = props.row.note; + note.value = props?.row?.note; await checkRowPage(); }; @@ -1451,6 +1451,7 @@ const clickHistory = async (row: RequestItemsObject) => { e.refCommandDate == null ? null : new Date(e.refCommandDate), createdFullName: e.createdFullName, createdAt: new Date(e.createdAt), + note: e.note, }); }); }) diff --git a/src/modules/04_registry/interface/request/Insignia.ts b/src/modules/04_registry/interface/request/Insignia.ts index 1a6266697..456adc6e4 100644 --- a/src/modules/04_registry/interface/request/Insignia.ts +++ b/src/modules/04_registry/interface/request/Insignia.ts @@ -17,11 +17,12 @@ interface RequestItemsObject { section: string; page: string; receiveDate: Date; - dateAnnounce: Date|string|null; + dateAnnounce: Date | string | null; refCommandNo: string; - refCommandDate: Date | null|string; + refCommandDate: Date | null | string; createdFullName: string; createdAt: Date; + note: string | null; } //columns diff --git a/src/modules/04_registry/interface/response/Insignia.ts b/src/modules/04_registry/interface/response/Insignia.ts index 4d26152a0..a68ed690f 100644 --- a/src/modules/04_registry/interface/response/Insignia.ts +++ b/src/modules/04_registry/interface/response/Insignia.ts @@ -17,6 +17,7 @@ interface ResponseObject { refCommandDate: Date | null; createdFullName: string; createdAt: Date; + note: string; } export type { ResponseObject }; diff --git a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue index 2f405bcf4..c456aa56a 100644 --- a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue +++ b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue @@ -1,6 +1,9 @@