Merge pull request #1527 from Frappet/fix/discipline

Fix/discipline

src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue

@@ -264,7 +264,8 @@ onMounted(() => {
                 <q-btn
                   v-if="
                     checkPermission($route)?.attrIsGet &&
-                    checkPermission($route)?.attrIsUpdate
+                    checkPermission($route)?.attrIsUpdate && 
+                    props.row.statusMain != 'SEND_DISCIPLINARY'
                   "
                   flat
                   dense

src/modules/11_discipline/components/PopupSendToNext.vue

@@ -194,7 +194,7 @@ watch(
           :visible-columns="props.visibleColumns"
           selection="multiple"
           v-model:selected="selected"
-          :pagination="initialPagination"
+          v-model:pagination="initialPagination"
         >
           <template v-slot:header-selection="scope">
             <q-checkbox

src/modules/11_discipline/store/InvestigateFactStore.ts

@@ -248,6 +248,7 @@ export const useInvestigateFactStore = defineStore(
             ? date2Thai(e.dateReceived as Date)
             : "-",
           status: e.status ? convertStatus(e.status) : "-",
+          statusMain: e.status ? e.status : "",
         };
       });
     }