Merge branch 'develop' into nice

src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue

@@ -1136,8 +1136,6 @@ onMounted(() => {
                 label="เงินค่าตอบแทนพิเศษ"
                 mask="###,###,###,###"
                 reverse-fill-mask
-                :rules="empType !== '-temp'? [(val:string) => !!val || `${'กรุณากรอกเงินค่าตอบแทนพิเศษ'}`]:[]"
-                lazy-rules
                 hide-bottom-space
               />
             </div>
@@ -1198,13 +1196,10 @@ onMounted(() => {
                 ref="docRef"
                 outlined
                 dense
-                lazy-rules
                 borderless
                 v-model="formDataSalary.doc"
                 :label="`${'เอกสารอ้างอิง'}`"
                 type="textarea"
-                hide-bottom-space
-                :rules="empType !== '-temp'? [(val: number) => !!val  || `${'กรุณากรอกเอกสารอ้างอิง'}`]:[]"
               />
             </div>
           </div>

src/modules/14_KPI/views/detail.vue

@@ -10,7 +10,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
 
 import DialogHeader from "@/components/DialogHeader.vue";
-import type { FormProfile } from "@/modules/14_KPI/interface/request/Index";
+import type { FormProfile } from "@/modules/14_KPI/interface/request/index";
 import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
 
 // const modalScore = ref<boolean>(false);

src/modules/14_KPI/views/detailView.vue

@@ -332,7 +332,7 @@ function openGovernment() {
 }
 
 function openStatus() {
-  router.push(`/probation-detail/${store.dataEvaluation.profileId}`);
+  router.push(`/probation-detail/${store.dataEvaluation.id}`);
 }
 
 function sendToEvauator() {

src/modules/14_KPI/views/mainDetail.vue

@@ -33,6 +33,9 @@ const mode = ref<any>($q.screen.gt.xs);
 const profileImg = ref<string>("");
 const router = useRouter();
 const route = useRoute();
+const id = ref<string>(route.params.id as string);
+
+
 const idEva = ref<string>(route.params.id as string);
 const formData = reactive<any>({
   prefix: "",
@@ -115,10 +118,12 @@ function onResize(size: any) {
 /**
  * fetch ข้แมูลส่วนตัว
  */
+
+ // เส้นเก่าที่เคยใช้     .get(config.API.kpiEvaluationUser + `/admin/${id.value}`)
 async function getMain() {
   showLoader();
   await http
-    .get(config.API.profilePosition + `/${idEva.value}`)
+    .get(config.API.kpiEvaluationUser + `/admin/${id.value}`)
     .then(async (res) => {
       const data = await res.data.result;
       formData.prefix = data.prefix;

src/views/MainLayout.vue

@@ -84,7 +84,7 @@ const modalLoginLinkage = ref<boolean>(false); //เข้าสู่ระบ
 // landing page redirect
 const landingPageUrl = ref<string>(getLandingUrl());
 function getLandingUrl() {
-  return `${configParam.landingPageUrl}/landing`;
+  return configParam.landingPageUrl;
 }
 
 async function fetchmsgNoread() {