(ฉ)

src/modules/02_organizationalNew/components/DialogAddPosition.vue

@@ -23,6 +23,7 @@ import type {
   DataPosition,
 } from "@/modules/02_organizationalNew/interface/response/organizational";
 
+const isSpecial = ref<boolean>(false)
 const props = defineProps({
   emitSearch: Function,
   data: Object,
@@ -114,6 +115,7 @@ function onSubmitSelectEdit() {
             : null, //ตำแหน่งทางการบริหาร
         posDictExecutiveField: formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร
         posDictArea: formPositionSelect.positionArea, //ด้าน/สาขา
+        isSpecial:isSpecial.value
       };
       await http
         .post(config.API.orgPosPosition, body)
@@ -145,6 +147,7 @@ async function clearFormPositionSelect() {
   formPositionSelect.positionExecutive = "";
   formPositionSelect.positionExecutiveField = "";
   formPositionSelect.positionArea = "";
+  isSpecial.value = false
   setTimeout(async () => {
     isDisValidate.value = await false;
   }, 1000);
@@ -374,6 +377,9 @@ watch(
                 hide-bottom-space
               />
             </div>
+            <div class="col-6 self-center">
+              <q-checkbox size="md" v-model="isSpecial" label="ฉ" />
+            </div>
           </div>
           <q-separator />
           <q-card-actions align="right" class="bg-white text-teal q-pa-sm">

src/modules/02_organizationalNew/components/DialogFormPosition.vue

@@ -34,7 +34,7 @@ const props = defineProps({
   rowId: { type: String, default: "" },
   fetchDataTable: Function,
   getSummary: Function,
-  shortName: {type: String, required: true}
+  shortName: { type: String, required: true },
 });
 
 const modalAdd = ref<boolean>(false);
@@ -521,7 +521,7 @@ watch(
   }
 );
 
-async function addPosition(data: RowDetailPositions) { 
+async function addPosition(data: RowDetailPositions) {
   const isIdExist = await rows.value.some(
     (item: any) =>
       item.posExecutiveId == data.posExecutiveId &&
@@ -573,6 +573,7 @@ async function clearFormPositionSelect() {
   formPositionSelect.positionExecutive = "";
   formPositionSelect.positionExecutiveField = "";
   formPositionSelect.positionArea = "";
+
   setTimeout(async () => {
     isDisValidate.value = await false;
   }, 1000);
@@ -706,7 +707,15 @@ async function emitSearch(keyword: string, typeSelect: string) {
                             >
                               {{ col.value ? col.value : "-" }}
                             </div>
-
+                            <div v-else-if="col.name === 'posLevelName'">
+                              {{
+                                props.row.posLevelName
+                                  ? props.row.isSpecial == true
+                                    ? `${props.row.posLevelName} (ฉ)`
+                                    : props.row.posLevelName
+                                  : "-"
+                              }}
+                            </div>
                             <div v-else-if="col.name === 'positionArea'">
                               {{ col.value ? col.value : "-" }}
                             </div>
@@ -862,6 +871,15 @@ async function emitSearch(keyword: string, typeSelect: string) {
                             >
                               {{ col.value ? col.value : "-" }}
                             </div>
+                            <div v-else-if="col.name === 'posLevelName'">
+                              {{
+                                props.row.posLevelName
+                                  ? props.row.isSpecial == true
+                                    ? `${props.row.posLevelName} (ฉ)`
+                                    : props.row.posLevelName
+                                  : "-"
+                              }}
+                            </div>
 
                             <div v-else-if="col.name === 'positionArea'">
                               {{ col.value ? col.value : "-" }}

src/modules/02_organizationalNew/components/TreeTable.vue

@@ -460,7 +460,14 @@ async function onClickDownloadReport(val: string, name: string) {
         </q-btn>
       </div>
 
-      <q-btn v-if="store.typeOrganizational === 'draft'" flat round dense color="deep-purple" icon="save_alt">
+      <q-btn
+        v-if="store.typeOrganizational === 'draft'"
+        flat
+        round
+        dense
+        color="deep-purple"
+        icon="save_alt"
+      >
         <q-menu>
           <q-list
             dense
@@ -558,7 +565,15 @@ async function onClickDownloadReport(val: string, name: string) {
             <div v-else-if="col.name === 'posMasterNo'">
               {{ props.row.isSit ? col.value + " " + "(ทับที่)" : col.value }}
             </div>
-
+            <div v-else-if="col.name === 'posLevelName'">
+              {{
+                props.row.posLevelName
+                  ? props.row.isSpecial == true
+                    ? `${props.row.posLevelName} (ฉ)`
+                    : props.row.posLevelName
+                  : "-"
+              }}
+            </div>
             <div v-else>
               {{ col.value ? col.value : "-" }}
             </div>