diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue index 26df2e3ba..a88540ebf 100644 --- a/src/components/common/VnInputDate.vue +++ b/src/components/common/VnInputDate.vue @@ -9,18 +9,14 @@ const $props = defineProps({ type: Boolean, default: false, }, - emitDateFormat: { - type: Boolean, - default: false, - }, }); const { t } = useI18n(); const requiredFieldRule = (val) => !!val || t('globals.fieldRequired'); const dateFormat = 'DD/MM/YYYY'; -const isPopupOpen = ref(false); -const hover = ref(false); +const isPopupOpen = ref(); +const hover = ref(); const mask = ref(); onMounted(() => { @@ -101,7 +97,7 @@ watch( name="close" size="xs" v-if=" - ($attrs.clearable != undefined || $attrs.clearable) && + ($attrs.clearable == undefined || $attrs.clearable) && hover && model && !$attrs.disable diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue index 29d10cac2..08a99ec56 100644 --- a/src/components/common/VnInputTime.vue +++ b/src/components/common/VnInputTime.vue @@ -20,6 +20,17 @@ const requiredFieldRule = (val) => !!val || t('globals.fieldRequired'); const dateFormat = 'HH:mm'; const isPopupOpen = ref(); const hover = ref(); + +const styleAttrs = computed(() => { + return props.isOutlined + ? { + dense: true, + outlined: true, + rounded: true, + } + : {}; +}); + const formattedTime = computed({ get() { if (!model.value || model.value?.length <= 5) return model.value; @@ -41,16 +52,6 @@ const formattedTime = computed({ }, }); -const styleAttrs = computed(() => { - return props.isOutlined - ? { - dense: true, - outlined: true, - rounded: true, - } - : {}; -}); - function dateToTime(newDate) { return date.formatDate(new Date(newDate), dateFormat); } @@ -79,7 +80,7 @@ watch( name="close" size="xs" v-if=" - ($attrs.clearable != undefined || $attrs.clearable) && + ($attrs.clearable == undefined || $attrs.clearable) && hover && model && !$attrs.disable diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue index 9071cc6eb..a3ae99da6 100644 --- a/src/pages/Item/Card/ItemLastEntries.vue +++ b/src/pages/Item/Card/ItemLastEntries.vue @@ -200,16 +200,10 @@ onUnmounted(() => (stateStore.rightDrawer = false)); - +
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue index 2c056acc6..2fbe849d1 100644 --- a/src/pages/Item/ItemRequestFilter.vue +++ b/src/pages/Item/ItemRequestFilter.vue @@ -192,7 +192,6 @@ const decrement = (paramsObj, key) => { v-model="params.from" @update:model-value="searchFn()" is-outlined - emit-date-format /> @@ -203,7 +202,6 @@ const decrement = (paramsObj, key) => { v-model="params.to" @update:model-value="searchFn()" is-outlined - emit-date-format /> diff --git a/src/pages/Monitor/SalesClientsTable.vue b/src/pages/Monitor/SalesClientsTable.vue index 3f2389471..8008b1fda 100644 --- a/src/pages/Monitor/SalesClientsTable.vue +++ b/src/pages/Monitor/SalesClientsTable.vue @@ -169,7 +169,6 @@ const columns = computed(() => [ [