diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index d35072519..b49f0b115 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -4,8 +4,8 @@ import { useI18n } from 'vue-i18n';
import FetchData from 'components/FetchData.vue';
import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
import VnSelectFilter from 'components/common/VnSelectFilter.vue';
-import VnInputDate from "components/common/VnInputDate.vue";
-import VnInput from "components/common/VnInput.vue";
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInput from 'components/common/VnInput.vue';
const { t } = useI18n();
const props = defineProps({
@@ -63,9 +63,7 @@ const sourceList = ref(null);
+ rounded
+ />
@@ -146,7 +145,8 @@ const sourceList = ref(null);
:label="t('toLanded')"
dense
outlined
- rounded />
+ rounded
+ />
@@ -155,9 +155,7 @@ const sourceList = ref(null);
:label="t('orderId')"
v-model="params.orderFk"
lazy-rules
- dense
- outlined
- rounded
+ is-outlined
/>
@@ -201,10 +199,7 @@ const sourceList = ref(null);
-
+
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 0d10110eb..464ab3dfc 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import { useStateStore } from 'stores/useStateStore';
-import { toCurrency, toDateHour } from 'src/filters';
+import { dashIfEmpty, toCurrency, toDateHour } from 'src/filters';
import VnLv from 'components/ui/VnLv.vue';
import CardSummary from 'components/ui/CardSummary.vue';
import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -64,10 +64,10 @@ const detailsColumns = ref([
-
+
- {{ entity?.address?.nickname || '-' }}
+ {{ dashIfEmpty(entity?.address?.nickname) }}
@@ -96,8 +96,12 @@ const detailsColumns = ref([
/>
- {{ entity?.address?.phone || '-' }}
-
+ {{ dashIfEmpty(entity?.address?.phone) }}
+