Merge commit '7e904c2178' into develop

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, reactive, watch,defineProps } from "vue";
+import { ref, reactive, watch, defineProps } from "vue";
 import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -32,10 +32,10 @@ const formPositionSelect = reactive<FormPositionSelectDialog>({
   positionArea: "",
 });
 const $q = useQuasar();
-const isSpecial = ref<boolean>(false)
+const isSpecial = ref<boolean>(false);
 const props = defineProps({
-  getData:Function
-})
+  getData: Function,
+});
 const { dialogConfirm, showLoader, success, hideLoader, messageError } =
   useCounterMixin();
 
@@ -85,8 +85,8 @@ function validateFormPositionEdit() {
 
 /** ฟังชั่น บันทึก */
 function saveSelectEdit() {
-  console.log(formPositionSelect.positionExecutive)
-  console.log(formPositionSelect.positionArea)
+  console.log(formPositionSelect.positionExecutive);
+  console.log(formPositionSelect.positionArea);
   dialogConfirm(
     $q,
     async () => {
@@ -96,10 +96,10 @@ function saveSelectEdit() {
         posDictField: formPositionSelect.positionField, //สายงาน
         posTypeId: formPositionSelect.positionType, //*ประเภทตำแหน่ง
         posLevelId: formPositionSelect.positionLevel, //*ระดับตำแหน่ง
-        posExecutiveId:formPositionSelect.positionExecutive, //ตำแหน่งทางการบริหาร
+        posExecutiveId: formPositionSelect.positionExecutive, //ตำแหน่งทางการบริหาร
         posDictExecutiveField: formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร
         posDictArea: formPositionSelect.positionArea, //ด้าน/สาขา
-        isSpecial:isSpecial.value
+        isSpecial: isSpecial.value,
       };
       await http
         .put(config.API.orgPosPositionById(formPositionSelect.positionId), body)
@@ -108,7 +108,7 @@ function saveSelectEdit() {
           clearFormPositionSelect();
           modal.value = false;
           editCheck.value = false;
-          props.getData?.()
+          props.getData?.();
         })
         .catch((err) => {
           messageError($q, err);
@@ -132,13 +132,10 @@ function onSubmitSelectEdit() {
         posDictField: formPositionSelect.positionField, //สายงาน
         posTypeId: formPositionSelect.positionType, //*ประเภทตำแหน่ง
         posLevelId: formPositionSelect.positionLevel, //*ระดับตำแหน่ง
-        posExecutiveId:formPositionSelect.positionExecutive, 
-        posDictExecutiveField: formPositionSelect.positionExecutiveField , //ด้านทางการบริหาร
+        posExecutiveId: formPositionSelect.positionExecutive,
+        posDictExecutiveField: formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร
         posDictArea: formPositionSelect.positionArea, //ด้าน/สาขา
-        isSpecial:isSpecial.value
-
-
-
+        isSpecial: isSpecial.value,
       };
       await http
         .post(config.API.orgPosPosition, body)
@@ -277,7 +274,7 @@ function close() {
 
         <q-card-section>
           <div class="row q-col-gutter-sm col-12">
-            <div class="col-6">
+            <div class="col-12">
               <q-input
                 ref="positionNameRef"
                 v-model="formPositionSelect.positionName"
@@ -291,6 +288,33 @@ function close() {
                 :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งในสายงาน'}`]"
               />
             </div>
+            <div class="col-6">
+              <q-input
+                ref="positionExecutiveFieldRef"
+                v-model="formPositionSelect.positionExecutiveField"
+                :class="inputEdit(isReadonly)"
+                dense
+                outlined
+                for="#positionExecutiveField"
+                label="ด้านทางการบริหาร"
+                lazy-rules
+                hide-bottom-space
+              />
+            </div>
+            <div class="col-6">
+              <q-input
+                ref="positionAreaRef"
+                v-model="formPositionSelect.positionArea"
+                :class="inputEdit(isReadonly)"
+                dense
+                outlined
+                for="#positionArea"
+                label="ด้าน/สาขา"
+                lazy-rules
+                hide-bottom-space
+              />
+            </div>
+
             <div class="col-6">
               <q-input
                 ref="positionFieldRef"
@@ -305,6 +329,7 @@ function close() {
                 :rules="[(val) => !!val || `${'กรุณากรอกสายงาน'}`]"
               />
             </div>
+
             <div class="col-6">
               <q-select
                 ref="positionTypeRef"
@@ -361,32 +386,7 @@ function close() {
                 clearable
               />
             </div>
-            <div class="col-6">
-              <q-input
-                ref="positionExecutiveFieldRef"
-                v-model="formPositionSelect.positionExecutiveField"
-                :class="inputEdit(isReadonly)"
-                dense
-                outlined
-                for="#positionExecutiveField"
-                label="ด้านทางการบริหาร"
-                lazy-rules
-                hide-bottom-space
-              />
-            </div>
-            <div class="col-6">
-              <q-input
-                ref="positionAreaRef"
-                v-model="formPositionSelect.positionArea"
-                :class="inputEdit(isReadonly)"
-                dense
-                outlined
-                for="#positionArea"
-                label="ด้าน/สาขา"
-                lazy-rules
-                hide-bottom-space
-              />
-            </div>
+
             <div class="col-6 self-center">
               <q-checkbox size="md" v-model="isSpecial" label="ฉ" />
             </div>

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

@@ -296,7 +296,7 @@ watch(
       <q-card-section class="q-pa-none">
         <form @submit.prevent="validateFormPositionEdit">
           <div class="row q-col-gutter-sm col-12 q-pa-sm">
-            <div class="col-6">
+            <div class="col-12">
               <q-input
                 ref="positionNameRef"
                 v-model="formPositionSelect.positionName"
@@ -314,6 +314,33 @@ watch(
                 "
               />
             </div>
+            <div class="col-6">
+              <q-input
+                ref="positionExecutiveFieldRef"
+                v-model="formPositionSelect.positionExecutiveField"
+                :class="inputEdit(isReadonly)"
+                dense
+                outlined
+                for="#positionExecutiveField"
+                label="ด้านทางการบริหาร"
+                lazy-rules
+                hide-bottom-space
+              />
+            </div>
+
+            <div class="col-6">
+              <q-input
+                ref="positionAreaRef"
+                v-model="formPositionSelect.positionArea"
+                :class="inputEdit(isReadonly)"
+                dense
+                outlined
+                for="#positionArea"
+                label="ด้าน/สาขา"
+                lazy-rules
+                hide-bottom-space
+              />
+            </div>
             <div class="col-6">
               <q-input
                 ref="positionFieldRef"
@@ -332,6 +359,7 @@ watch(
                 "
               />
             </div>
+
             <div class="col-6">
               <q-select
                 ref="positionTypeRef"
@@ -396,32 +424,7 @@ watch(
                 clearable
               />
             </div>
-            <div class="col-6">
-              <q-input
-                ref="positionExecutiveFieldRef"
-                v-model="formPositionSelect.positionExecutiveField"
-                :class="inputEdit(isReadonly)"
-                dense
-                outlined
-                for="#positionExecutiveField"
-                label="ด้านทางการบริหาร"
-                lazy-rules
-                hide-bottom-space
-              />
-            </div>
-            <div class="col-6">
-              <q-input
-                ref="positionAreaRef"
-                v-model="formPositionSelect.positionArea"
-                :class="inputEdit(isReadonly)"
-                dense
-                outlined
-                for="#positionArea"
-                label="ด้าน/สาขา"
-                lazy-rules
-                hide-bottom-space
-              />
-            </div>
+
             <div class="col-6 self-center">
               <q-checkbox size="md" v-model="isSpecial" label="ฉ" />
             </div>