fix bug

src/modules/05_placement/components/PersonalDetail/Information/Information.vue

@@ -87,8 +87,6 @@ const onCancel = async () => {
       `ข้อมูลมีการแก้ไข`,
       `ยืนยันยกเลิกการแก้ไขใช่หรือไม่?`
     );
-
-    
   } else {
     edit.value = false;
   }
@@ -252,7 +250,6 @@ const getClass = (val: boolean) => {
   };
 };
 
-
 function checkEdit() {
   onEdit.value = true;
 }
@@ -470,7 +467,6 @@ function checkEdit() {
             :class="getClass(edit)"
             :readonly="!edit"
             :borderless="!edit"
-            :rules="[(val:string) => !!val || `${'กรุณาเลือก หมู่เลือด'}`]"
             :outlined="edit"
             dense
             lazy-rules
@@ -556,10 +552,6 @@ function checkEdit() {
             :readonly="!edit"
             :borderless="!edit"
             v-model="informaData.telephone"
-            :rules="[
-              (val:string) => !!val || `${'กรุณากรอก เบอร์โทร'}`,
-              (val:string) => val.length >= 10 || `${'กรุณากรอกข้อมูลเบอร์โทรให้ครบ'}`,
-            ]"
             :label="`${'เบอร์โทร'}`"
             mask="##########"
           />

src/modules/06_retirement/components/ListRetirement/AddList.vue

@@ -135,8 +135,8 @@ const totalList = ref<number>(0);
 
 // fecth profile
 const fecthProfile = async () => {
+  showLoader();
   if (props?.dataProfile?.type === "OFFICER") {
-    showLoader();
     formPagePersonList.keyword =
       formPagePersonList.keyword === null ? "" : formPagePersonList.keyword;
     await http
@@ -154,7 +154,9 @@ const fecthProfile = async () => {
           fullname: e.prefix + e.firstName + " " + e.lastName,
           position: e.position,
           level:
-            e.posTypeName && e.posLevelName ? e.posTypeName + " (" + e.posLevelName + ")" : "-",
+            e.posTypeName && e.posLevelName
+              ? e.posTypeName + " (" + e.posLevelName + ")"
+              : "-",
           organizationOrganization: findOrgChildName(e),
         }));
       })
@@ -187,9 +189,7 @@ const fecthProfile = async () => {
           fullname: e.prefix + e.firstName + " " + e.lastName,
           position: e.position,
           level:
-            e.posType && e.posLevel
+            e.posType && e.posLevel ? e.posType + " (" + e.posLevel + ")" : "-",
-              ? e.posType + " (" + e.posLevel + ")"
-              : "-",
           organizationOrganization: findOrgName(e),
         }));
       })

src/modules/06_retirement/components/ListRetirement/TableList.vue

@@ -636,12 +636,7 @@ function updatemodalPersonal(modal: boolean) {
                 }}{{ props.row.firstName ? props.row.firstName : "" }}
                 {{ props.row.lastName ? props.row.lastName : "" }}</q-td
               >
-              <!-- <q-td
+
-                class="table_ellipsis"
-                key="organizationOrganization"
-                :props="props"
-                >{{ props.row.organizationOrganization }}</q-td
-              > -->
               <q-td key="position" :props="props">{{
                 props.row.position ? props.row.position : "-"
               }}</q-td>
@@ -697,7 +692,7 @@ function updatemodalPersonal(modal: boolean) {
                   flat
                   round
                   color="primary"
-                  icon="mdi-pencil"
+                  :icon="props.row.remove === 'EDIT' ? 'info' : 'mdi-pencil'"
                   dense
                   @click.stop="
                     (modalNote = true),
@@ -724,7 +719,7 @@ function updatemodalPersonal(modal: boolean) {
                   flat
                   round
                   class="text-red-14"
-                  icon="mdi-delete"
+                  :icon="props.row.remove === 'REMOVE' ? 'info' : 'mdi-delete'"
                   dense
                   @click.stop="
                     (modalNote = true),

src/modules/13_salary/store/SalaryEmployeeListsStore.ts

@@ -125,7 +125,7 @@ export const useSalaryEmployeeListSDataStore = defineStore(
     const itemDownloadOct = ref<DataOption[]>([
       {
         id: "emp2-01",
-        name: "บัญชีการคำนวณวงเงินเลื่อนขั้นค่าจางลูกจ้างประจำกรุงเทพมหานคร",
+        name: "บัญชีการคำนวณวงเงินเลื่อนขั้นค่าจ้างลูกจ้างประจำกรุงเทพมหานคร",
       },
       {
         id: "emp2-02",

src/modules/13_salary/views/salaryEmployeeRate.vue

@@ -208,7 +208,7 @@ function clickDownload() {
     .get(config.API.salaryReportemployeeByid(salaryEmployeeId.value))
     .then((res) => {
       const dataList = res.data.result;
-      genReportXLSX(dataList, "อัตราเงินเดือน");
+      genReportXLSX(dataList, "อัตราค่าจ้าง");
     })
     .catch((e) => {
       messageError($q, e);