src/components/CardProfile.vue

@@ -43,9 +43,9 @@ async function fetchDataProfile(data: DataProfile) {
     profile.avatar = data?.avatar ? data.avatar : "";
   }
   profile.id = data.profileId;
-  profile.fullName = `${data.rank ? data.rank : data.prefix ?? ""}${
-    data.firstName ?? ""
-  } ${data.lastName ?? ""} `;
+  profile.fullName = `${data.prefix ?? ""}${data.firstName ?? ""} ${
+    data.lastName ?? ""
+  } `;
 
   if (data["posTypeNameOld"] !== undefined) {
     profile.position =

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

@@ -48,7 +48,6 @@ const informaData = ref<FormAddPerson>({
   employeeType: null,
   employeeClass: null,
   profileType: null,
-  rank: "",
 });
 
 // รายการข้อมูลทั้งหมด
@@ -61,7 +60,6 @@ const Ops = ref<InformationOps>({
   religionOps: [],
   employeeClassOps: [],
   employeeTypeOps: [],
-  rankOps: [],
 });
 // ข้อมูลเมื่อเลือกแล้ว
 const OpsFilter = ref<InformationOps>({
@@ -73,7 +71,6 @@ const OpsFilter = ref<InformationOps>({
   religionOps: [],
   employeeClassOps: [],
   employeeTypeOps: [],
-  rankOps: [],
 });
 
 // รูป profile
@@ -138,16 +135,6 @@ async function fetchPerson() {
       });
       Ops.value.religionOps = optionreligions;
       OpsFilter.value.religionOps = optionreligions;
-
-      let rank: DataOption[] = [];
-      data.rank.map((r: DataOptioninfo) => {
-        rank.push({
-          id: r.id.toString(),
-          name: r.name.toString(),
-        });
-      });
-      Ops.value.rankOps = rank;
-      OpsFilter.value.rankOps = rank;
     })
     .catch((e) => {
       messageError($q, e);
@@ -217,13 +204,7 @@ function filterSelector(val: string, update: Function, refData: string) {
         );
       });
       break;
-    case "rankOps":
-      update(() => {
-        Ops.value.rankOps = OpsFilter.value.rankOps.filter(
-          (v: DataOption) => v.name.toLowerCase().indexOf(newVal) > -1
-        );
-      });
-      break;
+
     default:
       break;
   }
@@ -246,7 +227,7 @@ function onSubmit() {
   if (fileData.value != null) formData.append("File", fileData.value); //แก้ไขรูป
   if (informaData.value.citizenId != undefined)
     formData.append("citizenId", informaData.value.citizenId);
-  if (informaData.value.prefix != undefined && informaData.value.prefix != "")
+  if (informaData.value.prefix != undefined)
     formData.append("prefix", informaData.value.prefix);
   if (informaData.value.firstName != undefined)
     formData.append("firstName", informaData.value.firstName);
@@ -275,8 +256,6 @@ function onSubmit() {
     formData.append("employeeType", informaData.value.employeeType);
   if (informaData.value.employeeClass != undefined)
     formData.append("employeeClass", informaData.value.employeeClass);
-  if (informaData.value.rank != undefined && informaData.value.rank != "")
-    formData.append("rank", informaData.value.rank);
 
   dialogConfirm($q, async () => {
     showLoader();
@@ -310,15 +289,6 @@ function updateBirthDate(v: Date) {
   age.value = calculateAge(v);
 }
 
-function prefixRankRule() {
-  return [
-    () =>
-      !!informaData.value.rank ||
-      !!informaData.value.prefix ||
-      "กรุณาเลือกคำนำหน้าชื่อ หรือยศ",
-  ];
-}
-
 /**
  * ทำงานเมื่อมีการเรียกใช้ Components
  */
@@ -413,7 +383,7 @@ onMounted(async () => {
             </div>
             <q-card-section class="q-px-lg">
               <div class="row q-col-gutter-sm">
-                <div class="col-2">
+                <div class="col-3">
                   <q-input
                     bg-color="white"
                     outlined
@@ -434,14 +404,13 @@ onMounted(async () => {
                     mask="#############"
                   />
                 </div>
-                <div class="col-2">
+                <div class="col-3">
                   <q-select
                     bg-color="white"
                     v-model="informaData.prefix"
                     label="คำนำหน้าชื่อ"
                     outlined
                     dense
-                    clearable
                     lazy-rules
                     class="inputgreen"
                     :options="Ops.prefixOps"
@@ -449,8 +418,11 @@ onMounted(async () => {
                     option-value="name"
                     map-options
                     hide-bottom-space
-                    :rules="prefixRankRule()"
-                    reactive-rules
+                    :rules="[
+                      (val:string) => {
+                        return val.length > 0 || 'กรุณาเลือกคำนำหน้าชื่อ';
+                      },
+                    ]"
                     emit-value
                     use-input
                     hide-selected
@@ -460,32 +432,6 @@ onMounted(async () => {
                     )"
                   />
                 </div>
-                <div class="col-2">
-                  <q-select
-                    bg-color="white"
-                    v-model="informaData.rank"
-                    label="ยศ"
-                    outlined
-                    dense
-                    lazy-rules
-                    clearable
-                    class="inputgreen"
-                    :options="Ops.rankOps"
-                    option-label="name"
-                    option-value="name"
-                    map-options
-                    hide-bottom-space
-                    :rules="prefixRankRule()"
-                    reactive-rules
-                    emit-value
-                    use-input
-                    hide-selected
-                    fill-input
-                    @filter="(inputValue:string,
-                    doneFn: Function) => filterSelector(inputValue, doneFn, 'rankOps'
-                    )"
-                  />
-                </div>
                 <div class="col-3">
                   <q-input
                     bg-color="white"

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

@@ -113,7 +113,6 @@ const Ops = ref<InformationOps>({
     { id: "gov", name: "งบประมาณเงินอุดหนุนรัฐบาล" },
     { id: "bkk", name: "งบประมาณกรุงเทพมหานคร" },
   ],
-  rankOps: [],
 });
 const OpsFilter = ref<InformationOps>({
   prefixOps: [],
@@ -130,7 +129,6 @@ const OpsFilter = ref<InformationOps>({
     { id: "gov", name: "งบประมาณเงินอุดหนุนรัฐบาล" },
     { id: "bkk", name: "งบประมาณกรุงเทพมหานคร" },
   ],
-  rankOps: [],
 });
 
 /** ฟังก์ชันดึงข้อมูลรายการข้อมูลเกี่ยวกับบุคคล (dropdown list)*/
@@ -188,16 +186,6 @@ async function fetchPerson() {
       });
       Ops.value.religionOps = optionreligions;
       OpsFilter.value.religionOps = optionreligions;
-
-      let rank: DataOption[] = [];
-      data.rank.map((r: DataOptioninfo) => {
-        rank.push({
-          id: r.id.toString(),
-          name: r.name.toString(),
-        });
-      });
-      Ops.value.rankOps = rank;
-      OpsFilter.value.rankOps = rank;
     })
     .catch((e) => {
       messageError($q, e);
@@ -227,9 +215,9 @@ async function getData() {
       }
       rows.value = list;
       profileId.value = data.profileId;
-      title.value.fullname = `${data.rank ? data.rank : data.prefix ?? ""}${
-        data.firstName ?? ""
-      } ${data.lastName ?? ""}`;
+      title.value.fullname = `${data.prefix ?? ""}${data.firstName ?? ""} ${
+        data.lastName ?? ""
+      }`;
       title.value.organizationPositionOld = data.organizationPositionOld ?? "-";
       title.value.positionLevelOld = data.positionLevelOld ?? "-";
       title.value.positionTypeOld = data.positionTypeOld ?? "-";
@@ -242,7 +230,6 @@ async function getData() {
           (data.prefix == "00000000-0000-0000-0000-000000000000"
             ? null
             : data.prefix) ?? "",
-        rank: data.rank ?? "",
         firstname: data.firstName ?? "",
         lastname: data.lastName ?? "",
         birthDate:
@@ -308,7 +295,6 @@ async function fetchData(data: any) {
       (data.prefix == "00000000-0000-0000-0000-000000000000"
         ? null
         : data.prefix) ?? "",
-    rank: data.rank ?? "",
     firstname: data.firstName ?? "",
     lastname: data.lastName ?? "",
     birthDate: data.dateOfBirth !== null ? new Date(data.dateOfBirth) : null,
@@ -450,14 +436,6 @@ function filterSelector(val: string, update: Function, refData: string) {
       });
       break;
 
-    case "rankOps":
-      update(() => {
-        Ops.value.rankOps = OpsFilter.value.rankOps.filter(
-          (v: DataOption) => v.name.toLowerCase().indexOf(newVal) > -1
-        );
-      });
-      break;
-
     default:
       break;
   }
@@ -492,7 +470,6 @@ function saveData() {
         positionNumberOld: posNo.value,
         amount: 0,
         amountOld: salary.value,
-        rank: informaData.value.rank,
       };
       showLoader();
       http
@@ -540,15 +517,6 @@ function updateBirthDate(v: Date) {
   informaData.value.age = calculateAge(v);
 }
 
-function prefixRankRule() {
-  return [
-    () =>
-      !!informaData.value.rank ||
-      !!informaData.value.prefixId ||
-      "กรุณาเลือกคำนำหน้าชื่อ หรือยศ",
-  ];
-}
-
 /** ทำงานเมื่อมีการเรียกใช้ Components*/
 onMounted(async () => {
   await fetchPerson();
@@ -630,7 +598,7 @@ onMounted(async () => {
               <div class="col-xs-12">
                 <div class="text-weight-bold text-grey">ข้อมูลส่วนตัว</div>
               </div>
-              <div class="col-xs-6 col-sm-2 col-md-2">
+              <div class="col-xs-6 col-sm-3 col-md-3">
                 <q-input
                   :class="getClass(edit)"
                   hide-bottom-space
@@ -646,7 +614,7 @@ onMounted(async () => {
                   mask="#############"
                 />
               </div>
-              <div class="col-xs-6 col-sm-2 col-md-2">
+              <div class="col-xs-6 col-sm-3 col-md-3">
                 <selector
                   :hide-dropdown-icon="!edit"
                   hide-bottom-space
@@ -666,42 +634,10 @@ onMounted(async () => {
                   option-value="name"
                   :label="`${'คำนำหน้าชื่อ'}`"
                   use-input
-                  clearable
                   input-debounce="0"
-                  :rules="prefixRankRule()"
-                  reactive-rules
                   @filter="(inputValue:string, doneFn:Function) => filterSelector(inputValue, doneFn,'prefixOps' ) "
                 />
               </div>
-
-              <div class="col-xs-6 col-sm-2 col-md-2">
-                <selector
-                  :hide-dropdown-icon="!edit"
-                  hide-bottom-space
-                  :class="getClass(edit)"
-                  :readonly="!edit"
-                  :borderless="!edit"
-                  :outlined="edit"
-                  dense
-                  lazy-rules
-                  v-model="informaData.rank"
-                  emit-value
-                  map-options
-                  hide-selected
-                  fill-input
-                  :rules="prefixRankRule()"
-                  option-label="name"
-                  :options="Ops.rankOps"
-                  option-value="name"
-                  :label="`${'ยศ'}`"
-                  reactive-rules
-                  use-input
-                  input-debounce="0"
-                  @filter="(inputValue:string, doneFn:Function) => filterSelector(inputValue, doneFn,'rankOps' ) "
-                  clearable
-                />
-              </div>
-
               <div class="col-xs-6 col-sm-3 col-md-3">
                 <q-input
                   :class="getClass(edit)"

src/modules/05_placement/interface/index/ProfileType.ts

@@ -7,7 +7,6 @@ interface InformationOps {
   religionOps: DataOption[];
   employeeClassOps: DataOption[];
   employeeTypeOps: DataOption[];
-  rankOps: DataOption[];
 }
 
 //ข้อมูลส่วนตัว
@@ -64,7 +63,6 @@ interface FormAddPerson {
   employeeType: string | null;
   employeeClass: string | null;
   profileType: string | null;
-  rank?: string;
 }
 
 const defaultInformation: Information = {
@@ -85,7 +83,6 @@ const defaultInformation: Information = {
   employeeType: null,
   employeeClass: null,
   profileType: null,
-  rank: null,
 };
 
 export { defaultInformation };

src/modules/05_placement/views/03_receiveMain.vue

@@ -110,9 +110,7 @@ const columns = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     format(val, row) {
-      return ` ${row.rank ? row.rank : row.prefix ?? ""}${
-        row.firstName ?? ""
-      } ${row.lastName ?? ""}`;
+      return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
     },
   },
   {