Skip to content

commit: T225 approval row documentType parity and dashboard quick acc… #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThienlocTran merged 1 commit into from
Aug 4, 2026
Merged

commit: T225 approval row documentType parity and dashboard quick acc… #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 46 additions & 42 deletions src/views/ApprovalsView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,6 @@ function isPendingApproval(status) {
}

function approveLabel(status) {
if (isPendingApproval(status)) return "Duyệt phiếu";
return "Duyệt phiếu";
}

Expand Down Expand Up @@ -481,43 +480,44 @@ function getRejectionReason(receipt) {
Đang tải danh sách phiếu chờ duyệt...
</p>

<DataTable
:columns="columns"
:rows="receipts"
empty-text="Không có phiếu nào đang chờ duyệt"
>
<template #code="{ row, value }">
<div class="document-cell">
<span class="document-code">{{ value || "-" }}</span>
<span
class="badge doc-badge"
:class="documentTypeBadgeClass(documentType)"
>{{ documentTypeLabel(documentType) }}</span
>
</div>
</template>
<template #warehouseName="{ value }">{{ value || "-" }}</template>
<template #supplierName="{ value }">{{ value || "-" }}</template>
<template #createdByName="{ value }">{{ value || "-" }}</template>
<template #submittedAt="{ value }">{{ formatDateTime(value) }}</template>
<template #status="{ value }">
<span class="badge" :class="statusClass(value)">{{
statusLabel(value)
}}</span>
</template>
<template #totalAmount="{ value }">{{ formatCurrency(value) }}</template>
<template #actions="{ row }">
<div class="actions">
<button
class="btn btn-sm"
type="button"
:disabled="isAnyActionRunning(row)"
@click="openDetail(row)"
>
Xem
</button>
<button
class="btn btn-sm btn-secondary"
<div v-if="!isLoading">
<DataTable
:columns="columns"
:rows="receipts"
empty-text="Không có phiếu nào đang chờ duyệt"
>
<template #code="{ row, value }">
<div class="document-cell">
<span class="document-code">{{ value || "-" }}</span>
<span
class="badge doc-badge"
:class="documentTypeBadgeClass(row.documentType)"
>{{ documentTypeLabel(row.documentType) }}</span
>
</div>
</template>
<template #warehouseName="{ value }">{{ value || "-" }}</template>
<template #supplierName="{ value }">{{ value || "-" }}</template>
<template #createdByName="{ value }">{{ value || "-" }}</template>
<template #submittedAt="{ value }">{{ formatDateTime(value) }}</template>
<template #status="{ value }">
<span class="badge" :class="statusClass(value)">{{
statusLabel(value)
}}</span>
</template>
<template #totalAmount="{ value }">{{ formatCurrency(value) }}</template>
<template #actions="{ row }">
<div class="actions">
<button
class="btn btn-sm"
type="button"
:disabled="isAnyActionRunning(row)"
@click="openDetail(row)"
>
Xem
</button>
<button
class="btn btn-sm btn-secondary"
type="button"
:disabled="isAnyActionRunning(row)"
@click="openHistory(row)"
Expand Down Expand Up @@ -578,7 +578,7 @@ function getRejectionReason(receipt) {
<div class="modal detail-modal">
<div class="modal-head between">
<h2 class="section-title">
Chi tiết phiếu {{ documentType === "out" ? "xuất" : "nhập" }} chờ
Chi tiết phiếu {{ (detailState.receipt?.documentType || documentType) === "out" ? "xuất" : "nhập" }} chờ
duyệt
</h2>
<button class="btn btn-icon" aria-label="Đóng" @click="closeDetail">
Expand Down Expand Up @@ -621,8 +621,8 @@ function getRejectionReason(receipt) {
<span class="detail-label">Loại phiếu</span
><span
class="badge doc-badge"
:class="documentTypeBadgeClass(documentType)"
>{{ documentTypeLabel(documentType) }}</span
:class="documentTypeBadgeClass(detailState.receipt.documentType)"
>{{ documentTypeLabel(detailState.receipt.documentType) }}</span
>
</div>
<div>
Expand All @@ -632,7 +632,11 @@ function getRejectionReason(receipt) {
}}</span>
</div>
<div>
<span class="detail-label">Nhà cung cấp</span
<span class="detail-label">{{
detailState.receipt.documentType === "out"
? "Khách hàng"
: "Nhà cung cấp"
}}</span
><span class="detail-value">{{
detailState.receipt.supplierName || "-"
}}</span>
Expand Down
11 changes: 10 additions & 1 deletion src/views/DashboardView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ function openRoute(path) {
</div>
</div>

<div class="quick-links">
<div v-if="visibleQuickAccess.length > 0" class="quick-links">
<button
v-for="item in visibleQuickAccess"
:key="item.title"
Expand All @@ -811,6 +811,15 @@ function openRoute(path) {
</span>
</button>
</div>
<div v-else class="state-card state-card--empty">
<div class="state-card__icon">
<i class="mdi mdi-link-variant"></i>
</div>
<div class="state-card__body">
<h3>Không có mục truy cập nhanh</h3>
<p>Bạn không có quyền truy cập vào các mục nhanh hiện tại.</p>
</div>
</div>
</section>
</div>
</div>
Expand Down