erp/web
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Viet An
2026-06-18 11:34:16 +07:00
parent c9456fddf8
commit 5302e685a4
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/components/orders/OrderDeliveryTab.vue
View File

@@ -7,7 +7,7 @@ const props = defineProps({
</script> </script>
<template> <template>
<div class="is-flex is-flex-direction-column is-gap-2"> <div class="is-flex is-flex-direction-column is-gap-1">
<div <div
class="p-4 rounded-md has-background-primary-95 is-flex is-justify-content-space-between is-align-items-center" class="p-4 rounded-md has-background-primary-95 is-flex is-justify-content-space-between is-align-items-center"
> >
@@ -32,14 +32,28 @@ const props = defineProps({
{{ capitalize(invoice.delivery__status) }} {{ capitalize(invoice.delivery__status) }}
</p> </p>
</div> </div>
<div class="rounded-md has-background-white-bis"> <div
class="rounded-md has-background-grey-100"
style="border: 1px solid var(--bulma-grey-90)"
>
<div class="p-4">
<p class="fs-14 has-text-grey-40">Địa chỉ giao hàng</p>
<p class="font-medium">{{ invoice.shipping_address }}</p>
</div>
<hr
class="m-0 has-background-grey-90"
style="height: 1px"
/>
<div class="p-4"> <div class="p-4">
<p class="fs-14 has-text-grey-40">Người nhận</p> <p class="fs-14 has-text-grey-40">Người nhận</p>
<p class="font-medium">{{ invoice.delivery__receiver_name }}</p> <p class="font-medium">{{ invoice.delivery__receiver_name }}</p>
</div> </div>
<hr class="m-0" /> <hr
class="m-0 has-background-grey-90"
style="height: 1px"
/>
<div class="p-4"> <div class="p-4">
<p class="fs-14 has-text-grey-40">Địa chỉ</p> <p class="fs-14 has-text-grey-40">Số điện thoại</p>
<p class="font-medium">{{ invoice.delivery__receiver_phone }}</p> <p class="font-medium">{{ invoice.delivery__receiver_phone }}</p>
</div> </div>
</div> </div>

3
app/components/orders/SelectedOrder.vue
View File

@@ -45,7 +45,7 @@ const activeTab = ref(tabs[0]);
<template> <template>
<div v-if="invoice"> <div v-if="invoice">
<div> <div class="block">
<div class="is-flex is-gap-1.5 is-align-items-center"> <div class="is-flex is-gap-1.5 is-align-items-center">
<span class="fs-17 font-bold">{{ invoice.code }}</span> <span class="fs-17 font-bold">{{ invoice.code }}</span>
<span <span
@@ -93,7 +93,6 @@ const activeTab = ref(tabs[0]);
</p> </p>
</div> </div>
</div> </div>
<hr />
<div class="buttons m-0"> <div class="buttons m-0">
<button class="button fs-14 is-flex-grow-1 is-primary">Xác nhận đơn</button> <button class="button fs-14 is-flex-grow-1 is-primary">Xác nhận đơn</button>
<button class="button fs-14 is-flex-grow-1">Ghi thanh toán</button> <button class="button fs-14 is-flex-grow-1">Ghi thanh toán</button>