Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me

# Conflicts: # src/modules/05_placement/components/Transfer/transferMain.vue
2023-08-11 13:30:36 +07:00 · 2023-08-11 13:30:36 +07:00 · 0116c7fef8
commit 0116c7fef8
parent 1dec63fddd 8a5ecbd827
34 changed files with 1754 additions and 593 deletions
--- a/src/modules/05_placement/components/Transfer/transferMain.vue
+++ b/src/modules/05_placement/components/Transfer/transferMain.vue
@ -501,7 +501,7 @@ const saveOrder = async () => {

      <q-card-actions align="right" class="bg-white text-teal">
        <q-btn
-          label="บันทึก"
+          label="ส่งไปออกคำสั่ง"
          @click="saveOrder"
          :disable="checkSelected"
          color="public"