Merge branch 'develop' into dev

src/modules/04_registryPerson/views/edit/components/DialogForm.vue

@@ -295,7 +295,7 @@ async function onDefineData(index: number) {
 
   if (newData) {
     const salaryNew = newData.salaryNew;
-    const salaryOld = newData.salaryOld;
+    const salaryOld = newData?.salaryOld;
 
     formData.commandCode = salaryNew.commandCode;
     formData.commandNo = salaryNew.commandNo;
@@ -325,32 +325,34 @@ async function onDefineData(index: number) {
     formData.posNumCodeSit = salaryNew.posNumCodeSit;
     formData.posNumCodeSitAbb = salaryNew.posNumCodeSitAbb;
 
-    formReadonly.commandCode = salaryOld.commandCode;
+    if (salaryOld) {
-    formReadonly.commandNo = salaryOld.commandNo;
+      formReadonly.commandCode = salaryOld.commandCode;
-    formReadonly.commandYear = salaryOld.commandYear;
+      formReadonly.commandNo = salaryOld.commandNo;
-    formReadonly.commandDateAffect = salaryOld.commandDateAffect;
+      formReadonly.commandYear = salaryOld.commandYear;
-    formReadonly.commandDateSign = salaryOld.commandDateSign;
+      formReadonly.commandDateAffect = salaryOld.commandDateAffect;
-    formReadonly.posNoAbb = salaryOld.posNoAbb;
+      formReadonly.commandDateSign = salaryOld.commandDateSign;
-    formReadonly.posNo = salaryOld.posNo;
+      formReadonly.posNoAbb = salaryOld.posNoAbb;
-    formReadonly.positionName = salaryOld.positionName;
+      formReadonly.posNo = salaryOld.posNo;
-    formReadonly.positionType = salaryOld.positionType;
+      formReadonly.positionName = salaryOld.positionName;
-    formReadonly.positionLevel = salaryOld.positionLevel;
+      formReadonly.positionType = salaryOld.positionType;
-    formReadonly.positionCee = salaryOld.positionCee;
+      formReadonly.positionLevel = salaryOld.positionLevel;
-    formReadonly.positionLine = salaryOld.positionLine;
+      formReadonly.positionCee = salaryOld.positionCee;
-    formReadonly.positionPathSide = salaryOld.positionPathSide;
+      formReadonly.positionLine = salaryOld.positionLine;
-    formReadonly.positionExecutive = salaryOld.positionExecutive;
+      formReadonly.positionPathSide = salaryOld.positionPathSide;
-    formReadonly.positionExecutiveField = salaryOld.positionExecutiveField;
+      formReadonly.positionExecutive = salaryOld.positionExecutive;
-    formReadonly.amount = salaryOld.amount;
+      formReadonly.positionExecutiveField = salaryOld.positionExecutiveField;
-    formReadonly.positionSalaryAmount = salaryOld.positionSalaryAmount;
+      formReadonly.amount = salaryOld.amount;
-    formReadonly.mouthSalaryAmount = salaryOld.mouthSalaryAmount;
+      formReadonly.positionSalaryAmount = salaryOld.positionSalaryAmount;
-    formReadonly.orgRoot = salaryOld.orgRoot;
+      formReadonly.mouthSalaryAmount = salaryOld.mouthSalaryAmount;
-    formReadonly.orgChild1 = salaryOld.orgChild1;
+      formReadonly.orgRoot = salaryOld.orgRoot;
-    formReadonly.orgChild2 = salaryOld.orgChild2;
+      formReadonly.orgChild1 = salaryOld.orgChild1;
-    formReadonly.orgChild3 = salaryOld.orgChild3;
+      formReadonly.orgChild2 = salaryOld.orgChild2;
-    formReadonly.orgChild4 = salaryOld.orgChild4;
+      formReadonly.orgChild3 = salaryOld.orgChild3;
-    formReadonly.remark = salaryOld.remark;
+      formReadonly.orgChild4 = salaryOld.orgChild4;
-    formReadonly.posNumCodeSit = salaryOld.posNumCodeSit;
+      formReadonly.remark = salaryOld.remark;
-    formReadonly.posNumCodeSitAbb = salaryOld.posNumCodeSitAbb;
+      formReadonly.posNumCodeSit = salaryOld.posNumCodeSit;
+      formReadonly.posNumCodeSitAbb = salaryOld.posNumCodeSitAbb;
+    }
   }
 }
 

src/modules/04_registryPerson/views/edit/components/FormPosition.vue

@@ -33,9 +33,9 @@ const posExecutiveOptions = defineModel<DataOption[]>("posExecutiveOptions", {
   required: true,
 });
 
-const props = defineProps({
+const props = defineProps<{
-  updateSelectType: { type: Function, defult: () => {} },
+  updateSelectType?: (value: any) => void;
-});
+}>();
 
 /**
  * ฟิลเตอร์ข้อมูลจาก input
@@ -364,6 +364,8 @@ function classInput(val: boolean) {
         :label="empType === 'officer' ? 'ตำแหน่งในสายงาน' : 'ตำแหน่ง'"
         :rules="isAddPosition ? [(val: string) => !!val || `${empType === 'officer' ? 'ตำแหน่งในสายงาน' : 'ตำแหน่ง'}` ] :[]"
         hide-bottom-space
+        autocomplete="on"
+        name="positionName"
       />
     </div>
 
@@ -388,6 +390,7 @@ function classInput(val: boolean) {
         hide-selected
         fill-input
         clearable
+        @clear="formData.positionLevel = ''"
         input-debounce="0"
         @update:model-value="props.updateSelectType"
         @filter="(inputValue: string,
@@ -461,6 +464,8 @@ function classInput(val: boolean) {
         v-model="formData.positionLine"
         hide-bottom-space
         :label="`${'สายงาน'}`"
+        autocomplete="on"
+        name="positionLine"
       />
       <!-- <q-select
         outlined
@@ -505,6 +510,8 @@ function classInput(val: boolean) {
         v-model="formData.positionPathSide"
         hide-bottom-space
         :label="`${'ด้าน/สาขา'}`"
+        autocomplete="on"
+        name="positionPathSide"
       />
       <!-- <q-select
         :class="classInput(isReadonly)"
@@ -549,6 +556,8 @@ function classInput(val: boolean) {
         v-model="formData.positionExecutive"
         hide-bottom-space
         :label="`${'ตำแหน่งทางการบริหาร'}`"
+        autocomplete="on"
+        name="positionExecutive"
       />
       <!-- <q-select
         :class="classInput(isReadonly)"
@@ -593,6 +602,8 @@ function classInput(val: boolean) {
         v-model="formData.positionExecutiveField"
         hide-bottom-space
         :label="`${'ด้านทางการบริหาร'}`"
+        autocomplete="on"
+        name="positionExecutiveField"
       />
     </div>
 
@@ -693,7 +704,8 @@ function classInput(val: boolean) {
             borderless
             v-model="formData.orgRoot"
             hide-bottom-space
-            :label="`${'หน่วยงาน'}`"
+            autocomplete="on"
+            name="organization"
           />
         </div>
 
@@ -708,6 +720,8 @@ function classInput(val: boolean) {
             v-model="formData.orgChild1"
             hide-bottom-space
             :label="`${'ส่วนราชการระดับ 1'}`"
+            autocomplete="on"
+            name="organization"
           />
         </div>
 
@@ -722,6 +736,8 @@ function classInput(val: boolean) {
             v-model="formData.orgChild2"
             hide-bottom-space
             :label="`${'ส่วนราชการระดับ 2'}`"
+            autocomplete="on"
+            name="organization"
           />
         </div>
 
@@ -736,6 +752,8 @@ function classInput(val: boolean) {
             v-model="formData.orgChild3"
             hide-bottom-space
             :label="`${'ส่วนราชการระดับ 3'}`"
+            autocomplete="on"
+            name="organization"
           />
         </div>
 
@@ -750,6 +768,8 @@ function classInput(val: boolean) {
             v-model="formData.orgChild4"
             hide-bottom-space
             :label="`${'ส่วนราชการระดับ 4'}`"
+            autocomplete="on"
+            name="organization"
           />
         </div>
       </div>

src/modules/04_registryPerson/views/edit/components/Table.vue

@@ -307,8 +307,6 @@ const isAddPosition = ref<boolean>(true); // สถานะการเพิ
 /** function fetch ข้อมูลรายการตำแหน่งเงินเดือน*/
 async function fetchData() {
   isLoad.value = true;
-  rowsMain.value = [];
-  rows.value = [];
   const paht =
     tabs.value === "PENDING"
       ? `/${empType.value}/${profileId.value}`