diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue index 7e52a2dbb..fc810626d 100644 --- a/src/components/CardProfile.vue +++ b/src/components/CardProfile.vue @@ -20,7 +20,7 @@ const { findOrgNameOldHtml, findOrgNameHtml } = useCounterMixin(); /** propsDataProfile*/ const props = defineProps({ - data: { type: Object as PropType, required: true }, + data: { type: Object as PropType, default: () => ({}) }, type: { type: String, default: "" }, }); diff --git a/src/modules/05_placement/views/02_transferMain.vue b/src/modules/05_placement/views/02_transferMain.vue index 463bde065..362da553b 100644 --- a/src/modules/05_placement/views/02_transferMain.vue +++ b/src/modules/05_placement/views/02_transferMain.vue @@ -349,7 +349,6 @@ onMounted(async () => { { const tabsMain = ref("DRAFT"); @@ -104,7 +103,6 @@ export const useCommandListStore = defineStore("commandListStore", () => { async function fetchCommandType() { //เช็คค่าของ listCommand if (listCommand.value.length === 0) { - // showLoader(); try { const res = await http.get(config.API.commandType); const data = res.data.result; @@ -116,9 +114,7 @@ export const useCommandListStore = defineStore("commandListStore", () => { return listCommand.value; } catch (err) { - messageError($q, err); - } finally { - // hideLoader(); + console.log(err); } } else { return listCommand.value; diff --git a/src/modules/19_condition/components/DialogCondition.vue b/src/modules/19_condition/components/DialogCondition.vue index 278d6a487..c3a2bef95 100644 --- a/src/modules/19_condition/components/DialogCondition.vue +++ b/src/modules/19_condition/components/DialogCondition.vue @@ -20,8 +20,8 @@ const modal = defineModel("modal", { required: true }); const props = defineProps({ fetchData: { type: Function, required: true }, dataCondition: { - type: Object as PropType, - required: true, + type: Object as PropType, + default: () => ({}), }, }); diff --git a/src/style/quasar-variables.sass b/src/style/quasar-variables.sass index 0cb640aa1..ff7054a05 100644 --- a/src/style/quasar-variables.sass +++ b/src/style/quasar-variables.sass @@ -199,5 +199,5 @@ h3.resigtry-tab-title .filter-card background-color: #f1f1f1b0 -.dp__menu +.modalfix position: fixed !important diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index 31bdd52b8..a5a3c4240 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -1205,9 +1205,8 @@ function onViewDetailNoti(url: string) { + - -