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

# Conflicts:
#	src/modules/01_metadata/components/person/Blood.vue
#	src/modules/01_metadata/store.ts
This commit is contained in:
Thanit Konmek 2023-06-19 15:54:18 +07:00
commit 8ce9660f3f
120 changed files with 10308 additions and 3451 deletions

View file

@ -208,8 +208,8 @@ const { loaderPage } = dataStore;
const mixin = useCounterMixin();
const { success, dateText, messageError, showLoader, hideLoader } = mixin;
const store = useManageDataStore();
const { manageData, changeManageColumns, getBlood } = store;
const rows = ref<RequestItemsHistoryObject[]>([]); //list data table
const { manageData, changeManageColumns, getBlood, dataBlood } = store;
const rows = ref<RequestItemsHistoryObject[]>(dataBlood.data); //list data table
const rowsHistory = ref<RequestItemsHistoryObject[]>([]); //select data history
const rawHistory = ref<RequestItemsHistoryObject[]>([]); //raw data history
const tittleHistory = ref<string>("ประวัติแก้ไขกลุ่มเลือด"); //