Merge branch 'develop' into devTee

src/modules/05_placement/components/AppointEmployee/DialogOrders.vue

@@ -377,6 +377,6 @@ watch(
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="commandType"
-    :persons-id="selected.map((r) => r.id)"
+    :persons="selected"
   />
 </template>

src/modules/05_placement/components/AppointMent/DialogOrders.vue

@@ -406,6 +406,6 @@ watch(
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="commandType"
-    :persons-id="selected.map((r) => r.id)"
+    :persons="selected"
   />
 </template>

src/modules/05_placement/components/Help-Government/DialogOrders.vue

@@ -333,6 +333,6 @@ watch(
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="'C-PM-15'"
-    :persons-id="selected.map((r) => r.id)"
+    :persons="selected"
   />
 </template>

src/modules/05_placement/components/Other/DialogOrders.vue

@@ -325,6 +325,6 @@ watch(
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="commandType"
-    :persons-id="selected.map((r) => r.id)"
+    :persons="selected"
   />
 </template>

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

@@ -211,6 +211,8 @@ watch(
     if (modal.value === true) {
       rows.value = props.rows ? props.rows : [];
       selected.value = [];
+      commandType.value = "";
+      filter.value = "";
       const status = DataStore.DataMainOrig.find((x: any) => x.id == examId);
       if (status?.examTypeName !== "") {
         const data = await storeCommand.getCommandTypes();
@@ -464,6 +466,6 @@ watch(
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="commandType"
-    :persons-id="selected.map((r) => r.id)"
+    :persons="selected"
   />
 </template>

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

@@ -351,7 +351,6 @@ async function getTable() {
             posmasterId: data.posmasterId,
             statusNameCheck: convertContainStatus(data.statusId),
             deferment: data.isRelief,
-
             statusName:
               data.isRelief === true &&
               data.statusId == "PREPARE-CONTAIN" &&
@@ -373,6 +372,11 @@ async function getTable() {
               data.nodeShortName +
               "" +
               data.posMasterNo,
+            prefix: data.prefix,
+            firstName: data.firstname,
+            lastName: data.lastname,
+            citizenId: data.citizenId,
+            id: data.id,
           };
           rowsAll.value.push(rowData);
         });

src/modules/05_placement/components/Receive/DialogOrders.vue

@@ -310,6 +310,6 @@ watchEffect(() => {
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="'C-PM-14'"
-    :persons-id="selected.map((r) => r.id)"
+  :persons="selected"
   />
 </template>

src/modules/05_placement/components/Repatriate/DialogOrders.vue

@@ -292,6 +292,6 @@ watch(
   <DialogCreateCommand
     v-model:modal="modalCommand"
     :command-type-code="'C-PM-16'"
-    :persons-id="selected.map((r) => r.id)"
+ :persons="selected"
   />
 </template>

src/modules/05_placement/components/Transfer/DialogOrders.vue

@@ -255,6 +255,6 @@ watch(
   <DialogCreateCommand
     v-model:modal="modalCommand"
     command-type-code="C-PM-13"
-    :persons-id="selected.map((r) => r.id)"
+   :persons="selected"
   />
 </template>