Merge branch 'develop' into dev-tee

src/modules/05_placement/components/PersonalDetail/Information/Address.vue

@@ -77,7 +77,7 @@ const currentAddress = reactive<AddressData>({
 });
 
 onMounted(async () => {
-  // await getNewData();
+  await getNewData();
   emit("update:statusEdit", false);
 });
 
@@ -126,13 +126,13 @@ const filterSelector = (val: any, update: Function, refData: string) => {
 
 const refreshData = async () => {
   myform.value.reset();
-  await props.fetch();
+  // await props.fetch();
   await fetchProvince();
-  // await getNewData();
+  await getNewData();
 };
 
 const getNewData = async () => {
-  await props.fetch();
+  // await props.fetch();
   await fetchProvince();
 };
 
@@ -181,9 +181,9 @@ const editData = async () => {
     .finally(async () => {
       edit.value = false;
       emit("update:statusEdit", false);
-      // await getNewData();
-      await props.fetch();
-      await fetchProvince();
+      await getNewData();
+      // await props.fetch();
+      // await fetchProvince();
     });
 };
 

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

@@ -143,19 +143,15 @@ const closeModal = () => {
 
 // เปิดโมเดล
 const openModalOrder = () => {
-  console.log(filters.value);
-
   openModal();
+  console.log("filters===>",filters.value)
   const row = filters.value.filter(
     (r: ResponseData) =>
-      (r.status == "WAITTING" ||
-        r.status == "PENDING" ||
-        r.status == "APPROVE") &&
-      r.createdAt &&
+      (r.status == "APPROVE") &&
       r.organizationPositionOld &&
       r.positionTypeOld &&
-      r.positionLevel &&
-      r.posNo &&
+      r.positionLevelOld &&
+      r.positionNumberOld &&
       r.salary !== null &&
       r.organization &&
       r.date