From dc8ce765b4651a72c8c68a921ee96c98751c3e29 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Wed, 14 Aug 2024 14:04:34 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=97?=
 =?UTF-8?q?=E0=B8=94=E0=B8=A5=E0=B8=AD=E0=B8=87=20=E0=B8=87=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/probation/FormAssign.vue       | 89 +++++++++----------
 .../probation/FormEvaluation/FormEvaluate.vue | 12 +--
 .../FormEvaluation/FormEvaluateScore.vue      | 36 ++++----
 .../probation/FormEvaluation/FormReport.vue   | 22 ++---
 .../FormEvaluation/FormSaveResult.vue         | 18 ++--
 .../FormEvaluation/FormSaveResultCommader.vue | 18 ++--
 .../components/probation/MainProbation.vue    | 18 +---
 .../components/probation/ProbationDetail.vue  |  8 +-
 .../components/probation/SummaryScore.vue     | 24 ++---
 .../components/probation/SummarySurvey.vue    |  4 +-
 src/modules/05_placement/router.ts            | 13 ---
 11 files changed, 113 insertions(+), 149 deletions(-)

diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue
index 1ef9299cc..b1b710b60 100644
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@@ -1240,7 +1240,7 @@ onMounted(async () => {
                         borderless
                         option-label="label"
                         option-value="value"
-                        :outlined="isEdit == true"
+                        outlined
                         v-model="monthSelect"
                         :label="`ระยะเวลา (เดือน)`"
                         bg-color="white"
@@ -1267,8 +1267,8 @@ onMounted(async () => {
                           <q-input
                             dense
                             borderless
+                            outlined
                             :readonly="isEdit != true"
-                            :outlined="isEdit == true"
                             :rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
                             hide-bottom-space
                             class="full-width datepicker"
@@ -1291,7 +1291,7 @@ onMounted(async () => {
                         :locale="'th'"
                         autoApply
                         borderless
-                        :readonly="isDatePicker2Readonly || isEdit != true"
+                        readonly
                         :enableTimePicker="false"
                         week-start="0"
                       >
@@ -1305,8 +1305,7 @@ onMounted(async () => {
                           <q-input
                             hide-bottom-space
                             dense
-                            borderless
-                            :outlined="isEdit == true"
+                            outlined
                             readonly
                             class="full-width datepicker"
                             :model-value="
@@ -1344,8 +1343,7 @@ onMounted(async () => {
                   :readonly="isEdit != true"
                   dense
                   hide-bottom-space
-                  borderless
-                  :outlined="isEdit == true"
+                  outlined
                   v-model="caretaker1"
                   :label="`ผู้ดูแลคนที่ 1`"
                   option-label="label"
@@ -1373,7 +1371,7 @@ onMounted(async () => {
                   :readonly="isEdit != true"
                   dense
                   borderless
-                  :outlined="isEdit == true"
+                  outlined
                   v-model="caretaker2"
                   :label="`ผู้ดูแลคนที่ 2`"
                   @filter="filterFnCaretaker2"
@@ -1401,7 +1399,7 @@ onMounted(async () => {
                   dense
                   hide-bottom-space
                   borderless
-                  :outlined="isEdit"
+                  outlined
                   v-model="caretaker1"
                   :label="`ผู้ดูแลคนที่ 1`"
                   option-label="label"
@@ -1417,7 +1415,7 @@ onMounted(async () => {
                   :readonly="!isEdit"
                   dense
                   borderless
-                  :outlined="isEdit"
+                  outlined
                   v-model="caretaker2"
                   :label="`ผู้ดูแลคนที่ 2`"
                 />
@@ -1464,7 +1462,7 @@ onMounted(async () => {
                         :readonly="isEdit != true"
                         dense
                         borderless
-                        :outlined="isEdit == true"
+                        outlined
                         class="bg-white"
                         type="textarea"
                         v-model="activity_desc[index]"
@@ -1480,7 +1478,7 @@ onMounted(async () => {
                         :readonly="isEdit != true"
                         dense
                         borderless
-                        :outlined="isEdit == true"
+                        outlined
                         class="bg-white"
                         type="textarea"
                         v-model="goal_desc[index]"
@@ -1550,7 +1548,7 @@ onMounted(async () => {
                           :readonly="isEdit != true"
                           dense
                           borderless
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="knowledge[index]"
                           :label="`ความรู้ความสามารถในการปฏิบัติงาน ${
                             index + 1
@@ -1746,7 +1744,7 @@ onMounted(async () => {
                           :readonly="isEdit != true"
                           dense
                           borderless
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="OtherLaw"
                           type="textarea"
                         />
@@ -1774,7 +1772,7 @@ onMounted(async () => {
                           dense
                           borderless
                           map-options
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="skill"
                           label="ด้านที่ 1"
                         >
@@ -1805,7 +1803,7 @@ onMounted(async () => {
                           :readonly="isEdit != true"
                           dense
                           borderless
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="skill2"
                           label="ด้านที่ 2"
                         >
@@ -1835,7 +1833,7 @@ onMounted(async () => {
                           dense
                           map-options
                           borderless
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="skill3"
                           label="ด้านที่ 3"
                         >
@@ -1865,7 +1863,7 @@ onMounted(async () => {
                           dense
                           map-options
                           borderless
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="skill4"
                           label="ด้านที่ 4"
                         >
@@ -1911,7 +1909,7 @@ onMounted(async () => {
                           dense
                           borderless
                           map-options
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="main"
                           label="ตัวที่ 1"
                         >
@@ -1942,7 +1940,7 @@ onMounted(async () => {
                           dense
                           borderless
                           map-options
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="main2"
                           label="ตัวที่ 2"
                         >
@@ -1973,7 +1971,7 @@ onMounted(async () => {
                           dense
                           map-options
                           borderless
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="main3"
                           label="ตัวที่ 3"
                         >
@@ -2004,7 +2002,7 @@ onMounted(async () => {
                           dense
                           borderless
                           map-options
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="main4"
                           label="ตัวที่ 4"
                         >
@@ -2035,7 +2033,7 @@ onMounted(async () => {
                           dense
                           map-options
                           borderless
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="main5"
                           label="ตัวที่ 5"
                         >
@@ -2071,7 +2069,7 @@ onMounted(async () => {
                           dense
                           borderless
                           map-options
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="group"
                           label="ตัวที่ 1"
                         >
@@ -2102,7 +2100,7 @@ onMounted(async () => {
                           dense
                           borderless
                           map-options
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="group2"
                           label="ตัวที่ 2"
                         >
@@ -2133,7 +2131,7 @@ onMounted(async () => {
                           :readonly="isEdit != true"
                           dense
                           borderless
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="group3"
                           label="ตัวที่ 3"
                         >
@@ -2237,7 +2235,7 @@ onMounted(async () => {
                     :readonly="isEdit != true"
                     dense
                     borderless
-                    :outlined="isEdit == true"
+                    outlined
                     v-model="Other"
                     bg-color="white"
                   />
@@ -2278,7 +2276,7 @@ onMounted(async () => {
                         :readonly="isEdit != true"
                         dense
                         borderless
-                        :outlined="isEdit == true"
+                        outlined
                         v-model="output_desc[index]"
                         label="ผลผลิตของงานที่คาดหวัง (ไม่เกิน 10 บรรทัด)"
                         bg-color="white"
@@ -2296,7 +2294,7 @@ onMounted(async () => {
                         :readonly="isEdit != true"
                         dense
                         borderless
-                        :outlined="isEdit == true"
+                        outlined
                         v-model="indicator_desc[index]"
                         label="ตัวชี้วัดความสําเร็จของงาน (ไม่เกิน 10 บรรทัด)"
                       />
@@ -2388,7 +2386,7 @@ onMounted(async () => {
                           :readonly="isEdit != true"
                           dense
                           borderless
-                          :outlined="isEdit == true"
+                          outlined
                           v-model="Other5"
                           label="กรอกอื่นๆ"
                           bg-color="white"
@@ -2479,7 +2477,7 @@ onMounted(async () => {
                     :readonly="isEdit != true"
                     dense
                     borderless
-                    :outlined="isEdit == true"
+                    outlined
                     v-model="fullname"
                     label="ชื่อ-นามสกุล"
                     bg-color="white"
@@ -2491,7 +2489,7 @@ onMounted(async () => {
                     :readonly="isEdit != true"
                     dense
                     borderless
-                    :outlined="isEdit == true"
+                    outlined
                     v-model="position"
                     label="ตำแหน่ง"
                     bg-color="white"
@@ -2520,7 +2518,7 @@ onMounted(async () => {
                         :rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
                         :readonly="isEdit != true"
                         dense
-                        :outlined="isEdit == true"
+                        outlined
                         :model-value="date1 != null ? date2Thai(date1) : null"
                         label="ลงวันที่"
                         bg-color="white"
@@ -2555,7 +2553,7 @@ onMounted(async () => {
                   :readonly="isEdit != true"
                   dense
                   borderless
-                  :outlined="isEdit == true"
+                  outlined
                   v-model="caretaker1"
                   label="ผู้ดูแลคนที่ 1"
                   @filter="filterFnCaretaker"
@@ -2581,7 +2579,7 @@ onMounted(async () => {
                   :readonly="!isEdit"
                   dense
                   borderless
-                  :outlined="isEdit"
+                  outlined
                   v-model="caretaker1"
                   label="ผู้ดูแลคนที่ 1"
                   @filter="filterFnCaretaker"
@@ -2621,7 +2619,7 @@ onMounted(async () => {
                         :readonly="isEdit != true"
                         dense
                         
-                        :outlined="isEdit == true"
+                        outlined
                         
                         :model-value="date2 != null ? date2Thai(date2) : null"
                         label="ลงวันที่"
@@ -2649,7 +2647,7 @@ onMounted(async () => {
                   :readonly="isEdit != true"
                   dense
                   borderless
-                  :outlined="isEdit == true"
+                  outlined
                   v-model="caretaker2"
                   label="ผู้ดูแลคนที่ 2"
                   @filter="filterFnCaretaker2"
@@ -2675,7 +2673,7 @@ onMounted(async () => {
                   :readonly="!isEdit"
                   dense
                   borderless
-                  :outlined="isEdit"
+                  outlined
                   v-model="caretaker2"
                   label="ผู้ดูแลคนที่ 2"
                   @filter="filterFnCaretaker2"
@@ -2712,8 +2710,7 @@ onMounted(async () => {
                     <template #trigger>
                       <q-input
                         hide-bottom-space
-                        :disable="!caretaker2"
-                        :readonly="isEdit != true"
+                        :readonly="isEdit != true || !caretaker2"
                         dense
                         :rules="
                           caretaker2
@@ -2721,7 +2718,7 @@ onMounted(async () => {
                             : []
                         "
                         
-                        :outlined="isEdit == true"
+                        outlined
                       
                         :model-value="
                           caretaker2 != null ? date2Thai(date3) : null
@@ -2759,7 +2756,7 @@ onMounted(async () => {
                   dense
                   borderless
                   :rules="[(val) => !!val || 'กรุณาเลือกผู้บังคับบัญชา']"
-                  :outlined="isEdit == true"
+                  outlined
                   v-model="commander"
                   label="ผู้บังคับบัญชา"
                   use-input
@@ -2786,7 +2783,7 @@ onMounted(async () => {
                   dense
                   :rules="[(val) => !!val || 'กรุณาเลือกผู้บังคับบัญชา']"
                   borderless
-                  :outlined="isEdit"
+                  outlined
                   v-model="commander"
                   label="ผู้บังคับบัญชา"
                   use-input
@@ -2827,7 +2824,7 @@ onMounted(async () => {
                         :readonly="isEdit != true"
                         dense
                         
-                        :outlined="isEdit == true"
+                        outlined
                       
                         :model-value="date4 != null ? date2Thai(date4) : null"
                         label="ลงวันที่"
@@ -2862,7 +2859,7 @@ onMounted(async () => {
                   :readonly="isEdit != true"
                   dense
                   borderless
-                  :outlined="isEdit == true"
+                  outlined
                   v-model="chairman"
                   label="ประธานกรรมการ"
                   :rules="[(val) => !!val || 'กรุณาเลือก ประธานกรรมการ']"
@@ -2889,7 +2886,7 @@ onMounted(async () => {
                   :readonly="!isEdit"
                   dense
                   borderless
-                  :outlined="isEdit"
+                  outlined
                   v-model="chairman"
                   :rules="[(val) => !!val || 'กรุณาเลือก ประธานกรรมการ']"
                   label="ประธานกรรมการ"
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
index fc80cf895..e1e4f3d06 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
@@ -625,7 +625,7 @@ onMounted(async () => {
               <q-item-section class="q-ml-md">
                 <q-item-label>
                   <q-input
-                    :disable="!status"
+                    :readonly="!status"
                     v-model="achievement_other.text"
                     label="กรอกอื่นๆ"
                     dense
@@ -812,7 +812,7 @@ onMounted(async () => {
                 <q-item-section>
                   <q-item-label>
                     <q-input
-                      :disable="!status"
+                      :readonly="!status"
                       v-model="behavio_orther.text"
                       label="กรอกอื่นๆ"
                       dense
@@ -858,7 +858,7 @@ onMounted(async () => {
               จุดเด่น (ไม่เกิน 5 บรรทัด)
             </div>
             <q-input
-              :disable="!status"
+              :readonly="!status"
               outlined
               dense
               v-model="behavio_strength_desc"
@@ -878,7 +878,7 @@ onMounted(async () => {
               สิ่งที่ควรปรับปรุง (ไม่เกิน 5 บรรทัด)
             </div>
             <q-input
-              :disable="!status"
+              :readonly="!status"
               outlined
               dense
               v-model="behavior_improve_desc"
@@ -1031,7 +1031,7 @@ onMounted(async () => {
               :options="option"
               option-label="label"
               label="ผู้บังคับบัญชา"
-              disable
+              readonly
             />
 
             <div class="col-xs-12 col-sm-4">
@@ -1060,7 +1060,7 @@ onMounted(async () => {
                       dateAutherise != null ? date2Thai(dateAutherise) : null
                     "
                     :label="`${'ลงวันที่'}`"
-                    :disable="!status"
+                    :readonly="!status"
                     :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
                   >
                     <template v-slot:prepend>
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
index 66d6c5b1f..3a71f7163 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
@@ -665,7 +665,7 @@ onMounted(async () => {
                       dense
                       lazy-rules
                       autogrow
-                      :disable="!status"
+                      :readonly="!status"
                       hide-bottom-space
                       outlined
                       class="bg-white"
@@ -852,7 +852,7 @@ onMounted(async () => {
                   <q-item-section>
                     <q-item-label>
                       <q-input
-                        :disable="!status"
+                        :readonly="!status"
                         v-model="behavio_orther.text"
                         label="กรอกอื่นๆ"
                         dense
@@ -1036,7 +1036,7 @@ onMounted(async () => {
                     outlined
                     dense
                     type="number"
-                    :disable="!status"
+                    :readonly="!status"
                     v-model="orientation"
                   />
                 </div>
@@ -1045,7 +1045,7 @@ onMounted(async () => {
                     outlined
                     dense
                     type="number"
-                    :disable="!status"
+                    :readonly="!status"
                     v-model="orientation_percent"
                   />
                 </div>
@@ -1058,7 +1058,7 @@ onMounted(async () => {
                     dense
                     outlined
                     type="number"
-                    :disable="!status"
+                    :readonly="!status"
                     v-model="self_learning"
                   />
                 </div>
@@ -1067,7 +1067,7 @@ onMounted(async () => {
                     outlined
                     dense
                     type="number"
-                    :disable="!status"
+                    :readonly="!status"
                     v-model="self_learning_percent"
                   />
                 </div>
@@ -1080,7 +1080,7 @@ onMounted(async () => {
                     outlined
                     dense
                     type="number"
-                    :disable="!status"
+                    :readonly="!status"
                     v-model="training_seminar"
                   />
                 </div>
@@ -1089,7 +1089,7 @@ onMounted(async () => {
                     outlined
                     dense
                     type="number"
-                    :disable="!status"
+                    :readonly="!status"
                     v-model="training_seminar_percent"
                   />
                 </div>
@@ -1104,7 +1104,7 @@ onMounted(async () => {
                     outlined
                     dense
                     type="number"
-                    :disable="!status"
+                    :readonly="!status"
                     v-model="other_training"
                   />
                 </div>
@@ -1113,7 +1113,7 @@ onMounted(async () => {
                     outlined
                     dense
                     type="number"
-                    :disable="!status"
+                    :readonly="!status"
                     v-model="other_training_percent"
                   />
                 </div>
@@ -1137,7 +1137,7 @@ onMounted(async () => {
             <div class="col-12 text-top0 items-center">สรุปผลการพัฒนา</div>
             <div class="col-12">
               <q-select
-                :disable="!status"
+                :readonly="!status"
                 class="col-xs-12"
                 dense
                 v-model="develop_result"
@@ -1160,7 +1160,7 @@ onMounted(async () => {
             </div>
             <div class="col-12">
               <q-select
-                :disable="!status"
+                :readonly="!status"
                 class="col-xs-12"
                 dense
                 v-model="evaluate_result"
@@ -1195,7 +1195,7 @@ onMounted(async () => {
                 outlined
                 label="ชื่อ-นามสกุล"
                 option-label="label"
-                disable
+                readonly
               />
               <div class="col-xs-12 col-sm-4">
                 <datepicker
@@ -1218,7 +1218,7 @@ onMounted(async () => {
                     <q-input
                       outlined
                       dense
-                      :disable="!status"
+                      :readonly="!status"
                       class="full-width datepicker col-3"
                       :model-value="
                         dateAutherise != null ? date2Thai(dateAutherise) : null
@@ -1253,7 +1253,7 @@ onMounted(async () => {
                 v-model="director_id2"
                 outlined
                 label="ชื่อ-นามสกุล"
-                disable
+                readonly
                 option-label="label"
               />
               <div class="col-xs-12 col-sm-4">
@@ -1277,7 +1277,7 @@ onMounted(async () => {
                     <q-input
                       outlined
                       dense
-                      :disable="!status"
+                      :readonly="!status"
                       class="full-width datepicker col-3"
                       :model-value="
                         director1_dated != null
@@ -1314,7 +1314,7 @@ onMounted(async () => {
                 v-model="director_id3"
                 outlined
                 label="ชื่อ-นามสกุล"
-                disable
+                readonly
                 option-label="label"
               />
               <div class="col-xs-12 col-sm-4">
@@ -1338,7 +1338,7 @@ onMounted(async () => {
                     <q-input
                       outlined
                       dense
-                      :disable="!status"
+                      :readonly="!status"
                       class="full-width datepicker col-3"
                       :model-value="
                         director2_dated != null
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index 933907e8c..16fe2eb4b 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -347,7 +347,7 @@ onMounted(() => {
                 <q-input
                   outlined
                   dense
-                  :disable="!status || checkRoutePermisson"
+                  :readonly="!status || checkRoutePermisson"
                   class="full-width datepicker"
                   :model-value="
                     date_start != null ? date2Thai(date_start) : null
@@ -389,7 +389,7 @@ onMounted(() => {
                 <q-input
                   outlined
                   dense
-                  :disable="!status || checkRoutePermisson"
+                  :readonly="!status || checkRoutePermisson"
                   class="full-width datepicker"
                   :model-value="
                     date_finish != null ? date2Thai(date_finish) : null
@@ -426,7 +426,7 @@ onMounted(() => {
               class="col-xs-12 col-sm-6"
               dense
               borderless
-              :disable="!status || checkRoutePermisson"
+              :readonly="!status || checkRoutePermisson"
               emit-value
               map-options
               option-label="label"
@@ -455,7 +455,7 @@ onMounted(() => {
                 ]"
                 hide-bottom-space
                 :options="optionsResult"
-                :disable="!status || checkRoutePermisson"
+                :readonly="!status || checkRoutePermisson"
                 dense
                 borderless
                 emit-value
@@ -498,7 +498,7 @@ onMounted(() => {
               dense
               borderless
               outlined
-              :disable="!status || checkRoutePermisson"
+              :readonly="!status || checkRoutePermisson"
               class="bg-white"
               type="textarea"
               v-model="reson"
@@ -544,7 +544,7 @@ onMounted(() => {
               :options="commander"
               label="ชื่อ-นามสกุล"
               option-label="label"
-              disable
+              readonly
             />
             <div class="col-xs-12 col-sm-4">
               <datepicker
@@ -567,7 +567,7 @@ onMounted(() => {
                   <q-input
                     outlined
                     dense
-                    :disable="!status || checkRoutePermisson"
+                    :readonly="!status || checkRoutePermisson"
                     class="full-width datepicker col-3"
                     :model-value="
                       chairman_dated != null ? date2Thai(chairman_dated) : null
@@ -602,7 +602,7 @@ onMounted(() => {
               v-model="director_id2"
               outlined
               label="ชื่อ-นามสกุล"
-              disable
+              readonly
               :options="optionDirector"
               option-label="label"
             />
@@ -627,7 +627,7 @@ onMounted(() => {
                   <q-input
                     outlined
                     dense
-                    :disable="!status || checkRoutePermisson"
+                    :readonly="!status || checkRoutePermisson"
                     class="full-width datepicker col-3"
                     :model-value="
                       director1_dated != null
@@ -666,7 +666,7 @@ onMounted(() => {
               outlined
               label="ชื่อ-นามสกุล"
               :options="optionDirector"
-              disable
+              readonly
               option-label="label"
             />
 
@@ -691,7 +691,7 @@ onMounted(() => {
                   <q-input
                     outlined
                     dense
-                    :disable="!status || checkRoutePermisson"
+                    :readonly="!status || checkRoutePermisson"
                     class="full-width datepicker col-3"
                     :model-value="
                       director2_dated != null
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
index d04f11b23..708d9244a 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
@@ -525,7 +525,7 @@ onMounted(async () => {
                   hide-bottom-space
                   :row="1"
                   :rules="evaluate_ouptutRules"
-                  :disable="!status"
+                  :readonly="!status"
                 />
               </q-item-section>
               <q-item-section side>
@@ -757,7 +757,7 @@ onMounted(async () => {
                     :rules="[
                       (val) => (val && val.length > 0) || 'กรุณากรอกข้อความ',
                     ]"
-                    :disable="!status"
+                    :readonly="!status"
                   />
                 </q-item-label>
               </q-item-section>
@@ -803,7 +803,7 @@ onMounted(async () => {
             :row="5"
             :rules="achievement_strengthRules"
             ref="achievement_strengthRef"
-            :disable="!status"
+            :readonly="!status"
           />
         </div>
         <div class="col-12 row">
@@ -822,7 +822,7 @@ onMounted(async () => {
             label="กรอกสิ่งที่ควรปรับปรุง"
             :row="5"
             ref="achievement_inproveRef"
-            :disable="!status"
+            :readonly="!status"
           />
         </div>
       </div>
@@ -986,7 +986,7 @@ onMounted(async () => {
                       :rules="[
                         (val) => (val && val.length > 0) || 'กรุณากรอกข้อความ',
                       ]"
-                      :disable="!status"
+                      :readonly="!status"
                     />
                   </q-item-label>
                 </q-item-section>
@@ -1032,7 +1032,7 @@ onMounted(async () => {
               :row="5"
               :rules="behavio_strengthRules"
               ref="behavio_strengthRef"
-              :disable="!status"
+              :readonly="!status"
             />
           </div>
           <div class="col-12 row">
@@ -1051,7 +1051,7 @@ onMounted(async () => {
               label="กรอกสิ่งที่ควรปรับปรุง"
               :row="5"
               ref="behavio_inproveRef"
-              :disable="!status"
+              :readonly="!status"
             />
           </div>
         </div>
@@ -1193,7 +1193,7 @@ onMounted(async () => {
               :options="option"
               label="ผู้บังคับบัญชา"
               option-label="label"
-              disable
+              readonly
             />
             <div class="col-xs-12 col-sm-4">
               <datepicker
@@ -1222,7 +1222,7 @@ onMounted(async () => {
                     "
                     :label="`${'ลงวันที่'}`"
                     :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
-                    :disable="!status"
+                    :readonly="!status"
                   >
                     <template v-slot:prepend>
                       <q-icon
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
index 9a834a31b..7f02b001c 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
@@ -539,7 +539,7 @@ onMounted(async () => {
                   hide-bottom-space
                   :row="1"
                   :rules="evaluate_ouptutRules"
-                  :disable="!status"
+                  :readonly="!status"
                 />
               </q-item-section>
               <q-item-section side>
@@ -771,7 +771,7 @@ onMounted(async () => {
                     :rules="[
                       (val) => (val && val.length > 0) || 'กรุณากรอกข้อความ',
                     ]"
-                    :disable="!status"
+                    :readonly="!status"
                   />
                 </q-item-label>
               </q-item-section>
@@ -817,7 +817,7 @@ onMounted(async () => {
             :row="5"
             :rules="achievement_strengthRules"
             ref="achievement_strengthRef"
-            :disable="!status"
+            :readonly="!status"
           />
         </div>
         <div class="col-12 row">
@@ -836,7 +836,7 @@ onMounted(async () => {
             label="กรอกสิ่งที่ควรปรับปรุง"
             :row="5"
             ref="achievement_inproveRef"
-            :disable="!status"
+            :readonly="!status"
           />
         </div>
       </div>
@@ -1003,7 +1003,7 @@ onMounted(async () => {
                       :rules="[
                         (val) => (val && val.length > 0) || 'กรุณากรอกข้อความ',
                       ]"
-                      :disable="!status"
+                      :readonly="!status"
                     />
                   </q-item-label>
                 </q-item-section>
@@ -1049,7 +1049,7 @@ onMounted(async () => {
               :row="5"
               :rules="behavio_strengthRules"
               ref="behavio_strengthRef"
-              :disable="!status"
+              :readonly="!status"
             />
           </div>
           <div class="col-12 row">
@@ -1068,7 +1068,7 @@ onMounted(async () => {
               label="กรอกสิ่งที่ควรปรับปรุง"
               :row="5"
               ref="behavio_inproveRef"
-              :disable="!status"
+              :readonly="!status"
             />
           </div>
         </div>
@@ -1217,7 +1217,7 @@ onMounted(async () => {
               :options="option"
               option-label="label"
               label="ผู้บังคับบัญชา"
-              disable
+              readonly
             />
             <div class="col-xs-12 col-sm-4">
               <datepicker
@@ -1246,7 +1246,7 @@ onMounted(async () => {
                     "
                     :label="`${'ลงวันที่'}`"
                     :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
-                    :disable="!status"
+                    :readonly="!status"
                   >
                     <template v-slot:prepend>
                       <q-icon
diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue
index 7294920a9..5fb22fd28 100644
--- a/src/modules/05_placement/components/probation/MainProbation.vue
+++ b/src/modules/05_placement/components/probation/MainProbation.vue
@@ -594,28 +594,12 @@ onMounted(async () => {
                   icon="mdi-eye"
                   @click="
                     router.push(
-                      `/probation/detail-view/${props.row.personal_id}`
+                      `/probation/detail/${props.row.personal_id}`
                     )
                   "
                 >
                   <q-tooltip>รายละเอียด</q-tooltip>
                 </q-btn>
-                <q-btn
-                  v-if="
-                    checkPermission($route)?.attrIsGet &&
-                    checkPermission($route)?.attrIsUpdate
-                  "
-                  flat
-                  dense
-                  round
-                  color="edit"
-                  icon="edit"
-                  @click="
-                    router.push(`/probation/detail/${props.row.personal_id}`)
-                  "
-                >
-                  <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-                </q-btn>
               </q-td>
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
                 <div v-if="col.name == 'no'">
diff --git a/src/modules/05_placement/components/probation/ProbationDetail.vue b/src/modules/05_placement/components/probation/ProbationDetail.vue
index 0a091b64e..ae7fee3cd 100644
--- a/src/modules/05_placement/components/probation/ProbationDetail.vue
+++ b/src/modules/05_placement/components/probation/ProbationDetail.vue
@@ -367,7 +367,7 @@ onMounted(async () => {
       <div class="row col-12 q-col-gutter-sm">
         <div>
           <q-btn
-            v-if="!checkRoutePermisson"
+            v-if="checkPermission($route)?.attrIsUpdate"
             @click="router.push(`/probation/add/${personalId}`)"
             flat
             round
@@ -444,7 +444,6 @@ onMounted(async () => {
             <q-tr :props="props">
               <q-td auto-width>
                 <q-btn
-                  v-if="checkPermission($route)?.attrIsGet"
                   flat
                   dense
                   round
@@ -459,10 +458,7 @@ onMounted(async () => {
                   <q-tooltip>รายละเอียด</q-tooltip>
                 </q-btn>
                 <q-btn
-                  v-if="
-                    checkPermission($route)?.attrIsGet &&
-                    checkPermission($route)?.attrIsUpdate &&
-                    !checkRoutePermisson
+                  v-if="checkPermission($route)?.attrIsUpdate
                   "
                   flat
                   dense
diff --git a/src/modules/05_placement/components/probation/SummaryScore.vue b/src/modules/05_placement/components/probation/SummaryScore.vue
index a1d4f8e06..9ae19de3a 100644
--- a/src/modules/05_placement/components/probation/SummaryScore.vue
+++ b/src/modules/05_placement/components/probation/SummaryScore.vue
@@ -266,7 +266,7 @@ onMounted(() => {
                 outlined
                 dense
                 type="number"
-                :disable="!status || checkRoutePermisson"
+                :readonly="!status || checkRoutePermisson"
                 v-model="develop_orientation_score"
               />
             </div>
@@ -276,7 +276,7 @@ onMounted(() => {
                 outlined
                 dense
                 type="number"
-                :disable="!status || checkRoutePermisson"
+                :readonly="!status || checkRoutePermisson"
                 v-model="develop_orientation_percent"
               />
             </div>
@@ -290,7 +290,7 @@ onMounted(() => {
                 dense
                 outlined
                 type="number"
-                :disable="!status || checkRoutePermisson"
+                :readonly="!status || checkRoutePermisson"
                 v-model="develop_self_learning_score"
               />
             </div>
@@ -300,7 +300,7 @@ onMounted(() => {
                 outlined
                 dense
                 type="number"
-                :disable="!status || checkRoutePermisson"
+                :readonly="!status || checkRoutePermisson"
                 v-model="develop_self_learning_percent"
               />
             </div>
@@ -314,7 +314,7 @@ onMounted(() => {
                 outlined
                 dense
                 type="number"
-                :disable="!status || checkRoutePermisson"
+                :readonly="!status || checkRoutePermisson"
                 v-model="develop_training_seminar_score"
               />
             </div>
@@ -324,7 +324,7 @@ onMounted(() => {
                 outlined
                 dense
                 type="number"
-                :disable="!status || checkRoutePermisson"
+                :readonly="!status || checkRoutePermisson"
                 v-model="develop_training_seminar_percent"
               />
             </div>
@@ -339,7 +339,7 @@ onMounted(() => {
                 outlined
                 dense
                 type="number"
-                :disable="!status || checkRoutePermisson"
+                :readonly="!status || checkRoutePermisson"
                 v-model="develop_other_training_score"
               />
             </div>
@@ -349,7 +349,7 @@ onMounted(() => {
                 outlined
                 dense
                 type="number"
-                :disable="!status || checkRoutePermisson"
+                :readonly="!status || checkRoutePermisson"
                 v-model="develop_other_training_percent"
               />
             </div>
@@ -386,7 +386,7 @@ onMounted(() => {
             option-value="value"
             map-options
             emit-value
-            :disable="!status || checkRoutePermisson"
+            :readonly="!status || checkRoutePermisson"
           />
         </div>
       </div>
@@ -405,7 +405,7 @@ onMounted(() => {
           autogrow
           hide-bottom-space
           :row="3"
-          :disable="!status || checkRoutePermisson"
+          :readonly="!status || checkRoutePermisson"
         />
       </div>
 
@@ -426,7 +426,7 @@ onMounted(() => {
                 option-value="value"
                 map-options
                 emit-value
-                :disable="!status || checkRoutePermisson"
+                :readonly="!status || checkRoutePermisson"
               />
             </div>
           </div>
@@ -455,7 +455,7 @@ onMounted(() => {
                   <q-input
                     outlined
                     dense
-                    :disable="!status || checkRoutePermisson"
+                    :readonly="!status || checkRoutePermisson"
                     class="full-width datepicker"
                     :model-value="
                       evaluate_date != null ? date2Thai(evaluate_date) : null
diff --git a/src/modules/05_placement/components/probation/SummarySurvey.vue b/src/modules/05_placement/components/probation/SummarySurvey.vue
index f8ee0dec4..b7c74dcaf 100644
--- a/src/modules/05_placement/components/probation/SummarySurvey.vue
+++ b/src/modules/05_placement/components/probation/SummarySurvey.vue
@@ -126,7 +126,7 @@ onMounted(() => {
       </div>
       <div class="col-12">
         <q-input
-          :disable="!status || checkRoutePermisson"
+          :readonly="!status || checkRoutePermisson"
           label="ความคิดเห็น"
           class="bg-white"
           dense
@@ -146,7 +146,7 @@ onMounted(() => {
       </div>
       <div class="col-12">
         <q-input
-          :disable="!status || checkRoutePermisson"
+          :readonly="!status || checkRoutePermisson"
           label="ความคิดเห็น"
           class="bg-white"
           dense
diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts
index 19de3b05d..1fc242c01 100644
--- a/src/modules/05_placement/router.ts
+++ b/src/modules/05_placement/router.ts
@@ -16,9 +16,6 @@ const mainProbation = () =>
 const probationDetail = () =>
   import("@/modules/05_placement/components/probation/ProbationDetail.vue");
 
-const probationDetailOnly = () =>
-  import("@/modules/05_placement/components/probation/ProbationDetail.vue");
-
 const probationFormEvaluation = () =>
   import("@/modules/05_placement/components/probation/MainDetail.vue");
 const probationFormEvaluationDetail = () =>
@@ -148,16 +145,6 @@ export default [
       Role: "STAFF",
     },
   },
-  {
-    path: "/probation/detail-view/:id",
-    name: "probationDetailOnly",
-    component: probationDetailOnly,
-    meta: {
-      Auth: true,
-      Key: "SYS_PROBATION",
-      Role: "STAFF",
-    },
-  },
   {
     path: "/probation/detail/:personalId/:form",
     name: "probationForm",