diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index 134cc079b..c61b07099 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -275,6 +275,7 @@ async function fetchDataDetail(id: string) {
       formBody.budgetSourceOther = data.budgetSourceOther;
       formBody.planType = data.planType ? data.planType : "";
       formBody.isNoUseBudget = data.isNoUseBudget ? data.isNoUseBudget : false;
+      formBody.org = data.org;
 
       dataPerson.citizenId = data.citizenId ? data.citizenId : "-";
       dataPerson.name = `${data.prefix}${data.firstName}  ${data.lastName}`;
@@ -930,7 +931,6 @@ onMounted(async () => {
             <div class="row q-col-gutter-md">
               <div class="col-3">
                 <datepicker
-                  
                   v-model="formBody.scholarshipYear"
                   :locale="'th'"
                   autoApply
@@ -1060,7 +1060,6 @@ onMounted(async () => {
               </div>
               <div class="col-3">
                 <datepicker
-                  
                   v-model="formBody.bookNoDate"
                   :locale="'th'"
                   autoApply
@@ -1103,7 +1102,6 @@ onMounted(async () => {
               </div>
               <div class="col-2">
                 <datepicker
-                  
                   v-model="formBody.bookApproveDate"
                   :locale="'th'"
                   autoApply
@@ -1198,7 +1196,6 @@ onMounted(async () => {
               </div>
               <div class="col-3">
                 <datepicker
-                  
                   v-model="formBody.contractDate"
                   :locale="'th'"
                   autoApply
@@ -1256,7 +1253,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.reportBackNoDate"
                       :locale="'th'"
                       autoApply
@@ -1295,7 +1291,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.reportBackDate"
                       :locale="'th'"
                       autoApply
@@ -1443,7 +1438,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.startDate"
                       :locale="'th'"
                       autoApply
@@ -1488,7 +1482,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.endDate"
                       :locale="'th'"
                       autoApply
@@ -1572,7 +1565,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.studyStartDate"
                       :locale="'th'"
                       autoApply
@@ -1613,7 +1605,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.studyEndDate"
                       :locale="'th'"
                       :readonly="checkRouteDetail"
@@ -1679,7 +1670,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.studyAbroadStartDate"
                       :locale="'th'"
                       autoApply
@@ -1722,7 +1712,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.studyAbroadEndDate"
                       :locale="'th'"
                       autoApply
@@ -1826,7 +1815,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.startDate"
                       :locale="'th'"
                       autoApply
@@ -1871,7 +1859,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.endDate"
                       :locale="'th'"
                       :readonly="checkRouteDetail"
@@ -1955,7 +1942,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.studyStartDate"
                       :locale="'th'"
                       :readonly="checkRouteDetail"
@@ -1996,7 +1982,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.studyEndDate"
                       :locale="'th'"
                       autoApply
@@ -2094,7 +2079,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.startDate"
                       :locale="'th'"
                       :readonly="checkRouteDetail"
@@ -2139,7 +2123,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.endDate"
                       :locale="'th'"
                       autoApply
@@ -2223,7 +2206,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.studyStartDate"
                       :locale="'th'"
                       :readonly="checkRouteDetail"
@@ -2264,7 +2246,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.studyEndDate"
                       :readonly="checkRouteDetail"
                       :locale="'th'"
@@ -2337,7 +2318,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.studyAbroadStartDate"
                       :locale="'th'"
                       autoApply
@@ -2380,7 +2360,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.studyAbroadEndDate"
                       :locale="'th'"
                       autoApply
@@ -2581,7 +2560,6 @@ onMounted(async () => {
 
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.startDate"
                       :locale="'th'"
                       autoApply
@@ -2630,7 +2608,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.endDate"
                       :locale="'th'"
                       autoApply
@@ -2717,7 +2694,6 @@ onMounted(async () => {
 
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.studyAbroadStartDate"
                       :locale="'th'"
                       autoApply
@@ -2764,7 +2740,6 @@ onMounted(async () => {
                   </div>
                   <div class="col-3">
                     <datepicker
-                      
                       v-model="formBody.studyAbroadEndDate"
                       :locale="'th'"
                       autoApply
@@ -2874,7 +2849,6 @@ onMounted(async () => {
               </div>
               <div class="col-3">
                 <datepicker
-                  
                   v-model="formBody.startDate"
                   :locale="'th'"
                   autoApply
@@ -2920,7 +2894,6 @@ onMounted(async () => {
               </div>
               <div class="col-3">
                 <datepicker
-                  
                   v-model="formBody.endDate"
                   :locale="'th'"
                   :readonly="checkRouteDetail"
@@ -2988,7 +2961,6 @@ onMounted(async () => {
               </div>
               <div class="col-3">
                 <datepicker
-                  
                   v-model="formBody.studyStartDate"
                   :locale="'th'"
                   :readonly="checkRouteDetail"
@@ -3034,7 +3006,6 @@ onMounted(async () => {
               </div>
               <div class="col-3">
                 <datepicker
-                  
                   v-model="formBody.studyEndDate"
                   :locale="'th'"
                   autoApply
@@ -3118,7 +3089,6 @@ onMounted(async () => {
               </div>
               <div class="col-3">
                 <datepicker
-                  
                   v-model="formBody.studyAbroadStartDate"
                   :locale="'th'"
                   autoApply
@@ -3159,7 +3129,6 @@ onMounted(async () => {
               </div>
               <div class="col-3">
                 <datepicker
-                  
                   v-model="formBody.studyAbroadEndDate"
                   :locale="'th'"
                   autoApply