Merge branch 'develop' into nice_dev

# Conflicts: # src/api/11_discipline/api.discipline.ts
2023-11-27 17:34:51 +07:00 · 2023-11-27 17:34:51 +07:00 · eafbc65bf2
commit eafbc65bf2
parent 73a0384fa8
6 changed files with 104 additions and 28 deletions
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
@ -244,6 +244,7 @@ watch(
            :on-submit="onSubmit"
            :data="data"
            @submit:disciplinary="onSubmitDisciplinary"
+            :fetchData="fetchDetailDisciplinary"
          />
        </q-tab-panel>
      </q-tab-panels>