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

Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me

Browse source
This commit is contained in:
Thanit Konmek 2023-07-14 01:00:37 +07:00
commit 5bfdd3cc2a
6 changed files with 616 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/api/05_placement/api.placement.ts
View file

@ -44,4 +44,6 @@ export default {
//education
placementEducationId: (id: string) => `${placement}/education/${id}`,
// position
placementPosition: () => `${placement}/position/use`,
};

1022
src/modules/05_placement/components/PersonalList/OrgTree.vue
View file

File diff suppressed because it is too large Load diff

8
src/modules/05_placement/components/PersonalList/Table.vue
View file

@ -266,7 +266,7 @@ const selectData = (pid: string) => {
personalId.value = pid;
modal.value = true;
} else {
router.push("/placement/detail/" + pid);
router.push("/placement/personal-detail/" + pid);
}
};
@ -280,7 +280,7 @@ const editDetail = (
props: PartialTableName,
action: "disclaim" | "deferment" | "defermentInfo" | "disclaimInfo"
) => {
Name.value = props.fullName;
Name.value = props.name;
personalId.value = props.personalId;
editRow.value = false;
edit.value = true;
@ -376,9 +376,9 @@ const containStatus = ref<boolean>(false);
watch(containStatus, () => {
// console.log("containStatus===>", containStatus.value);
if (containStatus.value) {
rows.value = rowsAll.value.filter((x: any) => x.statusId != 'CONTAIN');
} else {
rows.value = rowsAll.value.filter((x: any) => x.statusId == 'CONTAIN');
} else {
rows.value = rowsAll.value.filter((x: any) => x.statusId != 'CONTAIN');
}
});

1
src/modules/05_placement/interface/request/placement.ts
View file

@ -40,6 +40,7 @@ interface TableName {
interface PartialTableName {
personalId: string;
fullName: string;
name: string;
idCard: string;
profilePhoto: string;
organizationName: string;