ฉ

src/modules/01_metadataNew/components/position/01ListPosition.vue

@@ -13,12 +13,13 @@ import type {
 import type { QTableProps } from "quasar";
 import DialogAddPosition from "@/modules/01_metadataNew/components/position/DialogAddPosition.vue";
 
-const editPosition = ref<boolean>(false)
+const editPosition = ref<boolean>(false);
 const modalAddPosition = ref<boolean>(false);
 const levelOpsMain = ref<DataOption[]>([]);
 const dataLevel = ref<any>();
 const levelOps = ref<DataOption[]>([]);
 
+const isSpecial = ref<boolean>(false)
 const formPositionSelect = reactive<FormPositionSelect>({
   positionId: "",
   posTypeId: "",
@@ -29,6 +30,7 @@ const formPositionSelect = reactive<FormPositionSelect>({
   positionExecutive: "",
   positionExecutiveField: "",
   positionArea: "",
+  isSpecial: false,
 });
 
 const rows = ref<RowDetailPositions[]>([]);
@@ -179,6 +181,7 @@ function copyDetiail(data: RowDetailPositions) {
  * @param data ข้อมูลตำแหน่ง
  */
 function editDetiail(data: RowDetailPositions) {
+  console.log(data)
   formPositionSelect.positionId = data.id;
   formPositionSelect.posTypeId = data.posTypeId;
   formPositionSelect.positionName = data.positionName;
@@ -188,8 +191,9 @@ function editDetiail(data: RowDetailPositions) {
   formPositionSelect.positionExecutive = data.posExecutiveId;
   formPositionSelect.positionExecutiveField = data.positionExecutiveField;
   formPositionSelect.positionArea = data.positionArea;
+  formPositionSelect.isSpecial = data.isSpecial;
   modalAddPosition.value = true;
-  editPosition.value = true
+  editPosition.value = true;
 }
 
 /**
@@ -372,8 +376,17 @@ onMounted(() => {
             <div v-if="col.name == 'no'">
               {{ props.rowIndex + 1 }}
             </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 ? col.value:'-' }}
             </div>
           </q-td>
           <q-td auto-width>

src/modules/01_metadataNew/components/position/DialogAddPosition.vue

@@ -32,7 +32,7 @@ const formPositionSelect = reactive<FormPositionSelectDialog>({
   positionArea: "",
 });
 const $q = useQuasar();
-
+const isSpecial = ref<boolean>(false)
 const props = defineProps({
   getData:Function
 })
@@ -102,6 +102,7 @@ function saveSelectEdit() {
             : formPositionSelect.positionExecutive, //ตำแหน่งทางการบริหาร
         posDictExecutiveField: formPositionSelect.positionExecutiveField!==null?formPositionSelect.positionExecutiveField:'', //ด้านทางการบริหาร
         posDictArea: formPositionSelect.positionArea !== null ? formPositionSelect.positionArea:'', //ด้าน/สาขา
+        isSpecial:isSpecial.value
       };
       await http
         .put(config.API.orgPosPositionById(formPositionSelect.positionId), body)
@@ -135,11 +136,15 @@ function onSubmitSelectEdit() {
         posTypeId: formPositionSelect.positionType, //*ประเภทตำแหน่ง
         posLevelId: formPositionSelect.positionLevel, //*ระดับตำแหน่ง
         posExecutiveId:
-          formPositionSelect.positionExecutive == ""
+          formPositionSelect.positionExecutive == null
-            ? null
+            ? ''
             : formPositionSelect.positionExecutive, //ตำแหน่งทางการบริหาร
-        posDictExecutiveField: formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร
+        posDictExecutiveField: formPositionSelect.positionExecutiveField == null ? '':formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร
-        posDictArea: formPositionSelect.positionArea, //ด้าน/สาขา
+        posDictArea: formPositionSelect.positionArea == null ? '':formPositionSelect.positionArea, //ด้าน/สาขา
+        isSpecial:isSpecial.value
+
+
+
       };
       await http
         .post(config.API.orgPosPosition, body)
@@ -245,6 +250,7 @@ watch(
         formPositionSelect.positionExecutiveField =
           dataList.positionExecutiveField;
         formPositionSelect.positionArea = dataList.positionArea;
+        isSpecial.value = dataList.isSpecial;
       }
     }
   }
@@ -386,6 +392,9 @@ function close() {
                 hide-bottom-space
               />
             </div>
+            <div class="col-6 self-center">
+              <q-checkbox size="md" v-model="isSpecial" label="ฉ" />
+            </div>
           </div>
         </q-card-section>
         <q-separator />

src/modules/01_metadataNew/interface/request/position/index.ts

@@ -60,6 +60,7 @@ interface FormPositionSelect {
   positionExecutive: string;
   positionExecutiveField: string;
   positionArea: string;
+  isSpecial: boolean;
 }
 interface ListMenu {
   label: string;
@@ -81,6 +82,7 @@ interface RowDetailPositions {
   posTypeId: string;
   posLevelId: string;
   posExecutiveId: string;
+  isSpecial: boolean;
 }
 
 interface RowListForm {