diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue index 17fa74317..4b7a6ba63 100644 --- a/src/components/common/VnCard.vue +++ b/src/components/common/VnCard.vue @@ -31,7 +31,10 @@ const url = computed(() => { if (props.baseUrl) return `${props.baseUrl}/${route.params.id}`; return props.customUrl; }); - +const searchRightDataKey = computed(() => { + if (!props.searchDataKey) return route.name; + else return props.searchDataKey; +}); const arrayData = useArrayData(props.dataKey, { url: url.value, filter: props.filter, @@ -74,10 +77,9 @@ if (props.baseUrl) { :redirect="searchRedirect" /> - diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue index 5b6896656..ed4bea2ff 100644 --- a/src/pages/Order/Card/OrderCard.vue +++ b/src/pages/Order/Card/OrderCard.vue @@ -1,16 +1,44 @@ +