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

This commit is contained in:
Thanit Konmek 2023-08-23 17:42:48 +07:00
commit 41cb1f814e
8 changed files with 770 additions and 545 deletions

View file

@ -149,13 +149,10 @@ const visibleColumns = ref<string[]>([
const action = ref<string>("");
const fileUpload = ref<any>(null);
const fileInputRef = ref<any>(null);
onMounted(() => {
retireld.value = retireld_params.toString();
console.log(retireld_params);
fecthlistprofile(retireld.value);
fecthCheck(retireld.value);
});
const round = ref<number>();
const typeReport = ref<string>("");
@ -188,6 +185,9 @@ const fecthlistprofile = async (id: string) => {
remove: e.remove,
}));
console.log(statusReport.value);
if (statusReport.value == false) {
fecthCheck(retireld.value);
} else statusUpload.value = true;
})
.catch((e) => {
messageError($q, e);
@ -200,7 +200,6 @@ const fecthCheck = async (id: string) => {
await http
.get(config.API.checkfileupload(id))
.then((res) => {
console.log(res);
statusUpload.value = res.data.result;
})
.catch((err) => {