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

package-lock.json

@@ -7738,7 +7738,7 @@
     },
     "node_modules/vue": {
       "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==",
       "dependencies": {
         "@vue/compiler-dom": "3.2.47",

package.json

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

src/api/05_placement/api.placement.ts

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

src/modules/05_placement/components/PersonalList/Table.vue

@@ -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');
   }
 });
 

src/modules/05_placement/interface/request/placement.ts

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