fixing column บรรจุ แต่งตั้ง ย้าย

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

@@ -23,8 +23,7 @@ const {
   messageError,
   dialogConfirm,
   hideLoader,
-  findOrgName,
-  findPosMasterNo,
+  findPosMasterNoOld,
   date2Thai,
 } = mixin;
 
@@ -51,26 +50,17 @@ const columns2 = ref<QTableProps["columns"]>([
     },
   },
   {
-    name: "posNo",
+    name: "posMasterNoOld",
     align: "left",
     label: "เลขที่ตำแหน่ง",
     sortable: true,
-    field: "posNo",
+    field: "posMasterNoOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return findPosMasterNo(row);
+      return findPosMasterNoOld(row);
     },
   },
-  {
-    name: "position",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    sortable: true,
-    field: "position",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "positionLevel",
     align: "left",
@@ -80,20 +70,25 @@ const columns2 = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return `${row.posTypeName} (${row.posLevelName})`;
+      let name = "";
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
+      } else name = "-";
+      return name;
     },
   },
   {
     name: "organizationPositionOld",
     align: "left",
-    label: "สังกัด",
+    label: "ตำแหน่งและหน่วยงานเดิม",
     sortable: true,
     field: "organizationPositionOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format(val, row) {
-      return findOrgName(row);
-    },
   },
   {
     name: "organization",
@@ -128,8 +123,7 @@ const columns2 = ref<QTableProps["columns"]>([
 const visibleColumns2 = ref<string[]>([
   "no",
   "name",
-  "posNo",
-  "position",
+  "posMasterNoOld",
   "positionLevel",
   "organizationPositionOld",
   "organization",

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

@@ -30,8 +30,7 @@ const {
   hideLoader,
   success,
   dialogRemove,
-  findOrgName,
-  findPosMasterNo,
+  findPosMasterNoOld,
 } = mixin;
 
 // หัวตาราง
@@ -58,26 +57,17 @@ const columns = ref<QTableProps["columns"]>([
     },
   },
   {
-    name: "posNo",
+    name: "posMasterNoOld",
     align: "left",
     label: "เลขที่ตำแหน่ง",
     sortable: true,
-    field: "posNo",
+    field: "posMasterNoOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return findPosMasterNo(row);
+      return findPosMasterNoOld(row);
     },
   },
-  {
-    name: "position",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    sortable: true,
-    field: "position",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "positionLevel",
     align: "left",
@@ -88,12 +78,12 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
     format(val, row) {
       let name = "";
-      if (row.posTypeName && row.posLevelName) {
-        name = `${row.posTypeName} (${row.posLevelName})`;
-      } else if (row.posTypeName) {
-        name = `${row.posTypeName}`;
-      } else if (row.posLevelName) {
-        name = `(${row.posLevelName})`;
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
       } else name = "-";
       return name;
     },
@@ -101,14 +91,11 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "organizationPositionOld",
     align: "left",
-    label: "สังกัด",
+    label: "ตำแหน่งและหน่วยงานเดิม",
     sortable: true,
     field: "organizationPositionOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format(val, row) {
-      return findOrgName(row);
-    },
   },
   {
     name: "organization",
@@ -143,8 +130,7 @@ const columns = ref<QTableProps["columns"]>([
 const visibleColumns = ref<string[]>([
   "no",
   "name",
-  "posNo",
-  "position",
+  "posMasterNoOld",
   "positionLevel",
   "organizationPositionOld",
   "organization",
@@ -324,7 +310,7 @@ onMounted(async () => {
                         : ''
                     "
                   >
-                    {{ col.value ? col.value : "-" }}
+                    {{ col.value == null ? "" : col.value }}
                   </div>
                 </q-td>
                 <q-td auto-width>

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

@@ -231,9 +231,9 @@ onMounted(() => {
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="positionTypeOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
+                :rules="[(val) => !!val || `${'กรุณากรอกประเภทตำแหน่ง'}`]"
                 hide-bottom-space
-                :label="`${'ตำแหน่งประเภท'}`"
+                :label="`${'ประเภทตำแหน่ง'}`"
               />
             </div>
           </div>
@@ -247,9 +247,9 @@ onMounted(() => {
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="positionLevelOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกระดับ'}`]"
+                :rules="[(val) => !!val || `${'กรุณากรอกระดับตำแหน่ง'}`]"
                 hide-bottom-space
-                :label="`${'ระดับ'}`"
+                :label="`${'ระดับตำแหน่ง'}`"
               />
             </div>
           </div>