Merge branch 'develop' into devTee

src/app.config.ts

@@ -56,7 +56,7 @@ const generatePopupPath = (routeName: any) => {
 	if (routeName.includes("scholarship")) {
 		return `${path}/manual/chapter-10-user-scholarship`;
 	}
-	if (routeName.includes("retire")) {
+	if (routeName.includes("Retire")) {
 		return `${path}/manual/chapter-11-user-retire`;
 	} else {
 		return manualConfig[routeName as keyof typeof manualConfig];

src/modules/11_probation/views/mainDetail.vue

@@ -30,7 +30,7 @@ const mode = ref<any>($q.screen.gt.xs);
 const profileImg = ref<string>("");
 const router = useRouter();
 const route = useRoute();
-const idEva = ref<string>(route.params.id as string)
+const idEva = ref<string>(route.params.id as string);
 const formData = reactive<any>({
   prefix: "",
   firstName: "",
@@ -115,7 +115,7 @@ function onMobile(type: string) {
 function getMain() {
   showLoader();
   http
-    .get(config.API.orgPosition+`/${idEva.value}`)
+    .get(config.API.orgPosition + `/${idEva.value}`)
     .then(async (res) => {
       const data = res.data.result;
       formData.prefix = data.prefix;
@@ -185,8 +185,7 @@ onMounted(async () => {
           flat
           color="primary"
           class="q-mr-sm"
-          @click="router.go(-1)
-          "
+          @click="router.go(-1)"
         />
         รายละเอียดงานที่ได้รับมอบหมาย
       </div>
@@ -366,12 +365,8 @@ onMounted(async () => {
                 </template>
 
                 <template v-if="$q.screen.gt.xs" v-slot:body="props">
-                  <q-tr :props="props" class="cursor-pointer">
-                    <q-td
-                      v-for="(col, index) in props.cols"
-                      :key="col.name"
-                      @click="onDetail(props.row.id)"
-                    >
+                  <q-tr :props="props">
+                    <q-td v-for="(col, index) in props.cols" :key="col.name">
                       <div v-if="col.name == 'no'">
                         {{ props.rowIndex + 1 }}
                       </div>