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
package-lock.json generated
View file

@ -7738,7 +7738,7 @@
}, },
"node_modules/vue": { "node_modules/vue": {
"version": "3.2.47", "version": "3.2.47",
"resolved": "https://npm.joolsoft.com/vue/-/vue-3.2.47.tgz", // "resolved": "https://npm.joolsoft.com/vue/-/vue-3.2.47.tgz",
"integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==", "integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==",
"dependencies": { "dependencies": {
"@vue/compiler-dom": "3.2.47", "@vue/compiler-dom": "3.2.47",

2
package.json
View file

@ -4,7 +4,7 @@
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "run-p type-check build-only", "build": "run-p build-only",
"preview": "vite preview", "preview": "vite preview",
"test:unit": "vitest --environment jsdom --root src/", "test:unit": "vitest --environment jsdom --root src/",
"test:e2e": "start-server-and-test preview :4173 'cypress run --e2e'", "test:e2e": "start-server-and-test preview :4173 'cypress run --e2e'",

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

@ -44,4 +44,6 @@ export default {
//education //education
placementEducationId: (id: string) => `${placement}/education/${id}`, 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; personalId.value = pid;
modal.value = true; modal.value = true;
} else { } else {
router.push("/placement/detail/" + pid); router.push("/placement/personal-detail/" + pid);
} }
}; };
@ -280,7 +280,7 @@ const editDetail = (
props: PartialTableName, props: PartialTableName,
action: "disclaim" | "deferment" | "defermentInfo" | "disclaimInfo" action: "disclaim" | "deferment" | "defermentInfo" | "disclaimInfo"
) => { ) => {
Name.value = props.fullName; Name.value = props.name;
personalId.value = props.personalId; personalId.value = props.personalId;
editRow.value = false; editRow.value = false;
edit.value = true; edit.value = true;
@ -376,9 +376,9 @@ const containStatus = ref<boolean>(false);
watch(containStatus, () => { watch(containStatus, () => {
// console.log("containStatus===>", containStatus.value); // console.log("containStatus===>", containStatus.value);
if (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'); 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 { interface PartialTableName {
personalId: string; personalId: string;
fullName: string; fullName: string;
name: string;
idCard: string; idCard: string;
profilePhoto: string; profilePhoto: string;
organizationName: string; organizationName: string;