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-05-07 15:01:09 +07:00
parent 56cfcd09bf
commit ad2d1fbfb6
31 changed files with 356 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/transaction/TransactionConfirmModal.vue
View File

@@ -412,7 +412,7 @@ export default {
this.coOwner = selectedPerson || null;
},
formatDate(date) {
return date ? dayjs(date).format("DD/MM/YYYY") : "-";
return date ? dayjs(date).format("L") : "-";
},
updateDueDate(newDate) {
this.editableDueDate = newDate;

6
app/components/transaction/TransactionDetail.vue
View File

@@ -212,15 +212,13 @@ async function handleFileUpload(uploadedFiles) {
>
<p class="column is-3">
<span>Từ ngày: </span>
<span class="has-text-weight-semibold">{{
txndetail.date ? $dayjs(txndetail.date).format("DD/MM/YYYY") : ""
}}</span>
<span class="has-text-weight-semibold">{{ txndetail.date ? $dayjs(txndetail.date).format("L") : "" }}</span>
</p>
<p class="column is-3">
<span>Đến ngày: </span>
<span class="has-text-weight-semibold">{{
txndetail.due_date ? $dayjs(txndetail.due_date).format("DD/MM/YYYY") : ""
txndetail.due_date ? $dayjs(txndetail.due_date).format("L") : ""
}}</span>
</p>
<p class="column is-3">

6
app/components/transaction/TransactionView.vue
View File

@@ -315,7 +315,7 @@
<div class="field">
<label class="label">{{ data && findFieldName("issued_date")[lang] }}</label>
<div class="control">
{{ record.issued_date ? $dayjs(record.issued_date).format("DD/MM/YYYY") : "/" }}
{{ record.issued_date ? $dayjs(record.issued_date).format("L") : "/" }}
</div>
</div>
</div>
@@ -395,7 +395,7 @@
<div class="field">
<label class="label">{{ data && findFieldName("create-time")[lang] }}</label>
<div class="control">
<span>{{ $dayjs(transaction.create_time).format("DD/MM/YYYY HH:mm") }}</span>
<span>{{ $dayjs(transaction.create_time).format("L HH:mm") }}</span>
</div>
</div>
</div>
@@ -1201,7 +1201,7 @@ export default {
const postProductNotePayload = {
ref: this.product.id,
user: id,
detail: `${username} ${this.isVietnamese ? "khóa sản phẩm trong" : "locked product for"} ${this.lockDurationMinutes} ${this.isVietnamese ? "phút đến lúc" : "minutes until"} ${this.$dayjs(lockedUntilValue).format("HH:mm:ss - DD/MM/YYYY")}`,
detail: `${username} ${this.isVietnamese ? "khóa sản phẩm trong" : "locked product for"} ${this.lockDurationMinutes} ${this.isVietnamese ? "phút đến lúc" : "minutes until"} ${this.$dayjs(lockedUntilValue).format("HH:mm:ss - L")}`,
};
try {