From a968d67b2e8a83bd4cd81d53b78c3943e6fafd62 Mon Sep 17 00:00:00 2001 From: wuweihua <88888888> Date: Thu, 10 Sep 2026 17:13:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E8=B4=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../price/domain/vo/TmsPriceQuoteResult.java | 1 + .../service/impl/PrcBillServiceImpl.java | 1 + bms-front/src/views/price/billing/bill.vue | 139 +------- .../price/billing/components/BillDetail.vue | 308 ++++++++++++++++++ bms-front/src/views/price/set/detail.vue | 3 - 5 files changed, 313 insertions(+), 139 deletions(-) create mode 100644 bms-front/src/views/price/billing/components/BillDetail.vue diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteResult.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteResult.java index bf1d318c..a696dc59 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteResult.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/vo/TmsPriceQuoteResult.java @@ -34,6 +34,7 @@ public class TmsPriceQuoteResult implements Serializable private BigDecimal weightMin; private BigDecimal weightMax; private String weightLabel; + private Date bizDate; /** bms_product_country.effective_date */ private Date effectiveDate; diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcBillServiceImpl.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcBillServiceImpl.java index 33d9150a..55211068 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcBillServiceImpl.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcBillServiceImpl.java @@ -234,6 +234,7 @@ public class PrcBillServiceImpl implements IPrcBillService r.setPayableTotal(bill.getPayableTotal()); r.setCurrency(bill.getCurrency()); r.setRoundMode(bill.getRoundMode()); + r.setBizDate(bill.getBizDate()); List lines = new ArrayList(); if (fees != null) { diff --git a/bms-front/src/views/price/billing/bill.vue b/bms-front/src/views/price/billing/bill.vue index 0afa54dd..6368b727 100644 --- a/bms-front/src/views/price/billing/bill.vue +++ b/bms-front/src/views/price/billing/bill.vue @@ -24,88 +24,14 @@ - -
- -
-
订单信息
- - {{ detail.orderNo || '-' }} - {{ detail.trackingNo || '-' }} - {{ displayCustomer(detail) }} - {{ detail.warehouseCode || '-' }} - {{ detail.shipperName || '-' }} - {{ detail.consigneeName || '-' }} - {{ (detail.countryName || '-') + ' (' + (detail.countryCode || '-') + ')' }} - {{ detail.destPostcode || '-' }} - {{ detail.pieces != null ? detail.pieces : '-' }} - {{ dimLabel(detail) }} - {{ formatMoney(detail.actualWeight) }} - {{ formatMoney(detail.volumeWeight) }} - {{ formatMoney(detail.volume) }} - {{ formatDateTime(detail.orderTime) }} - {{ detail.orderRemark || '-' }} - - -
计费信息
- - {{ (detail.productName || '-') + ' (' + (detail.productCode || '-') + ')' }} - {{ detail.chargeWeight ?? detail.weight ?? '-' }} - {{ detail.weightLabel || '-' }} - {{ formatDate(detail.bizDate) }} - - {{ sourceLabel(detail.matchSource) }} - - {{ detail.priceSetName || '-' }} {{ detail.priceSetCode ? '(' + detail.priceSetCode + ')' : '' }} - - - - {{ roundModeLabel(detail.roundMode) }} - {{ formatMoney(detail.freightRate) }} - {{ formatMoney(detail.freightAmount) }} - {{ formatMoney(detail.registrationFee) }} - {{ formatMoney(detail.surchargeAmount) }} - - {{ formatMoney(detail.payableTotal) }} - - {{ detail.matchMessage || '-' }} - - - - - - - - - - - - - - - - - - - -
-
-
+ + + diff --git a/bms-front/src/views/price/set/detail.vue b/bms-front/src/views/price/set/detail.vue index a60724f8..d10ce7b6 100644 --- a/bms-front/src/views/price/set/detail.vue +++ b/bms-front/src/views/price/set/detail.vue @@ -59,7 +59,6 @@ - @@ -140,8 +139,6 @@ - -