Merge branch 'develop' into devTee

src/modules/04_registry/components/DialogFooter.vue

@@ -19,6 +19,17 @@
       :color="!next ? 'grey-7' : 'public'"
     />
     <q-space />
+    <q-btn
+      v-if="modalEdit == true"
+      flat
+      round
+      color="blue"
+      @click="props.coppy"
+      icon="content_copy"
+    >
+      <q-tooltip>คัดลอกข้อมูล</q-tooltip></q-btn
+    >
+
     <q-btn
       v-if="modalEdit == true"
       flat
@@ -100,6 +111,10 @@ const props = defineProps({
     type: Function,
     default: () => console.log("not function"),
   },
+  coppy: {
+    type: Function,
+    default: () => console.log("not function"),
+  },
 });
 const emit = defineEmits([
   "update:editvisible",

src/modules/04_registry/components/Information/top.vue

@@ -15,7 +15,7 @@
         {{ header }}
       </div>
     </div>
-    <div v-if="!profileStore.isVerified">
+    <div v-if="profileStore.isEdit">
       <div class="q-gutter-sm q-mx-sm" v-if="addData == false">
         <q-btn
           size="12px"

src/modules/04_registry/components/Profile.vue

@@ -796,13 +796,13 @@ import TrainVue from "@/modules/04_registry/components/Train.vue";
 import InsigniaVue from "@/modules/04_registry/components/Insignia.vue";
 import CoinedVue from "@/modules/04_registry/components/Coin.vue";
 import AssessmentVue from "@/modules/04_registry/components/Assessment.vue";
-// import SalaryVue from "@/modules/04_registry/components/Salary.vue";
-// import SalaryEmployeeVue from "@/modules/04_registry/components/SalaryEmployee.vue";
-// import SalaryEmployeeTempVue from "@/modules/04_registry/components/SalaryEmployeeTemp.vue";
+import SalaryVue from "@/modules/04_registry/components/Salary.vue";
+import SalaryEmployeeVue from "@/modules/04_registry/components/SalaryEmployee.vue";
+import SalaryEmployeeTempVue from "@/modules/04_registry/components/SalaryEmployeeTemp.vue";
 
-import SalaryVue from "@/modules/04_registry/components/salaryNew/Salary.vue";
-import SalaryEmployeeVue from "@/modules/04_registry/components/salaryNew/SalaryEmployee.vue";
-import SalaryEmployeeTempVue from "@/modules/04_registry/components/salaryNew/SalaryEmployeeTemp.vue";
+// import SalaryVue from "@/modules/04_registry/components/salaryNew/Salary.vue";
+// import SalaryEmployeeVue from "@/modules/04_registry/components/salaryNew/SalaryEmployee.vue";
+// import SalaryEmployeeTempVue from "@/modules/04_registry/components/salaryNew/SalaryEmployeeTemp.vue";
 
 import DisciplineVue from "@/modules/04_registry/components/Discipline.vue";
 import LeaveVue from "@/modules/04_registry/components/Leave.vue";
@@ -918,7 +918,21 @@ const roleRegistryverify = ref<boolean>(false);
 function onClickVerified() {
   dialogConfirm(
     $q,
-    async () => {},
+    async () => {
+      showLoader();
+      await http
+        .put(config.API.profileVerified(profileId.value))
+        .then((res) => {
+          checIsVerified();
+          success($q, "ยืนยันการตรวจสอบข้อมูลสำเร็จ");
+        })
+        .catch((e) => {
+          messageError($q, e);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    },
     "ยืนยันการตรวจสอบข้อมูล",
     "ต้องการยืนยันการตรวจสอบข้อมูลนี้หรือไม่?"
   );
@@ -927,7 +941,21 @@ function onClickVerified() {
 function onClickUnlock() {
   dialogConfirm(
     $q,
-    async () => {},
+    async () => {
+      showLoader();
+      await http
+        .put(config.API.profileVerifiedUnlock(profileId.value))
+        .then((res) => {
+          checIsVerified();
+          success($q, "ปลดล็อคให้แก้ไขข้อมูลสำเร็จ");
+        })
+        .catch((e) => {
+          messageError($q, e);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    },
     "ยืนยันการปลดให้แก้ไขข้อมูล",
     "ต้องการยืนยันการปลดให้แก้ไขข้อมูลนี้หรือไม่?"
   );
@@ -941,7 +969,7 @@ onMounted(async () => {
       "registryverify"
     );
   }
-  console.log(roleKeyregistry.value, roleRegistryverify.value);
+
   await changeTab("information");
   await fetchData();
   await checIsVerified();
@@ -985,13 +1013,16 @@ async function checIsVerified() {
     .then((res) => {
       const data = res.data.result;
 
-      profileStore.isVerified = data.isVerified
-        ? true
-        : roleRegistryverify.value
-        ? true
-        : roleKeyregistry.value
-        ? false
-        : false;
+      profileStore.isVerified = data.isVerified;
+      if (roleRegistryverify.value || roleKeyregistry.value) {
+        if (data.isVerified || roleRegistryverify.value) {
+          profileStore.isEdit = false;
+        } else {
+          profileStore.isEdit = true;
+        }
+      } else {
+        profileStore.isEdit = true;
+      }
     })
     .catch((err) => {
       messageError($q, err);

src/modules/04_registry/components/Table.vue

@@ -69,6 +69,8 @@
   >
     <template v-slot:header="props">
       <q-tr :props="props">
+        <q-th auto-width v-if="name === 'ตำแหน่ง/เงินเดือน'" />
+        <q-th auto-width v-if="name === 'ตำแหน่ง/เงินเดือน'" />
         <q-th v-for="col in props.cols" :key="col.name" :props="props">
           <span class="text-weight-medium">{{ col.label }}</span>
         </q-th>