diff --git a/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcBillingBillListExportRow.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcBillingBillListExportRow.java index b0ed036f..4919e8e0 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcBillingBillListExportRow.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcBillingBillListExportRow.java @@ -45,6 +45,8 @@ public class PrcBillingBillListExportRow implements Serializable private BigDecimal payTotal; @Excel(name = "计价来源", width = 16) private String matchSourceLabel; + @Excel(name = "订单状态", width = 12) + private String orderStatusLabel; @Excel(name = "计费状态", width = 14) private String billingFailStatusLabel; @Excel(name = "客户状态", width = 12) @@ -54,9 +56,9 @@ public class PrcBillingBillListExportRow implements Serializable @Excel(name = "计费时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date bizDate; - @Excel(name = "下单时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "提货时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date orderTime; + private Date pickupDate; @Excel(name = "销售员", width = 12) private String belongSaler; @Excel(name = "结算员", width = 12) diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/support/OrderBillExportSupport.java b/bms-back/bms-system/src/main/java/com/bms/price/service/support/OrderBillExportSupport.java index 74e39ca9..4ff075f8 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/support/OrderBillExportSupport.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/support/OrderBillExportSupport.java @@ -193,11 +193,12 @@ public final class OrderBillExportSupport row.setIncomeTotal(bill.getIncomeTotal()); row.setPayTotal(bill.getPayTotal()); row.setMatchSourceLabel(matchSourceLabel(bill.getMatchSource())); + row.setOrderStatusLabel(orderStatusLabel(bill.getOrderStatus())); row.setBillingFailStatusLabel(billingFailStatusLabel(bill.getBillingFailStatus())); row.setCustomerActiveStatusLabel(customerActiveLabel(bill.getCustomerActiveStatus())); row.setCreditArrearsStatusLabel(creditArrearsLabel(bill.getCreditArrearsStatus())); row.setBizDate(bill.getBizDate()); - row.setOrderTime(bill.getOrderTime()); + row.setPickupDate(bill.getPickupDate()); row.setBelongSaler(bill.getBelongSaler()); row.setSettlementMan(bill.getSettlementMan()); row.setServiceMan(bill.getServiceMan()); diff --git a/bms-front/src/utils/exportFieldDefs.js b/bms-front/src/utils/exportFieldDefs.js index fcdf24c1..a710d035 100644 --- a/bms-front/src/utils/exportFieldDefs.js +++ b/bms-front/src/utils/exportFieldDefs.js @@ -63,11 +63,12 @@ export const BILLING_BILL_EXPORT_FIELDS = [ { prop: 'incomeTotal', label: '应收总额' }, { prop: 'payTotal', label: '应付总额' }, { prop: 'matchSourceLabel', label: '计价来源' }, + { prop: 'orderStatusLabel', label: '订单状态' }, { prop: 'billingFailStatusLabel', label: '计费状态' }, { prop: 'customerActiveStatusLabel', label: '客户状态' }, { prop: 'creditArrearsStatusLabel', label: '额度欠费' }, { prop: 'bizDate', label: '计费时间' }, - { prop: 'orderTime', label: '下单时间' }, + { prop: 'pickupDate', label: '提货时间' }, { prop: 'belongSaler', label: '销售员' }, { prop: 'settlementMan', label: '结算员' }, { prop: 'serviceMan', label: '客服员' } diff --git a/bms-front/src/views/price/billing/bill.vue b/bms-front/src/views/price/billing/bill.vue index 952f7c33..c4ac2069 100644 --- a/bms-front/src/views/price/billing/bill.vue +++ b/bms-front/src/views/price/billing/bill.vue @@ -93,6 +93,9 @@ + @@ -342,6 +345,13 @@ const orderStatusMap = { const orderStatusOptions = Object.keys(orderStatusMap).map(k => ({ label: orderStatusMap[k], value: Number(k) })) const orderStatusAllValues = computed(() => orderStatusOptions.map(o => o.value)) +function orderStatusLabel(status) { + if (status == null || status === '') return '-' + const key = String(status) + if (Object.prototype.hasOwnProperty.call(orderStatusMap, key)) return orderStatusMap[key] + return String(status) +} + function selectedValues(model, key) { const value = model?.[key] return Array.isArray(value) ? value : [] @@ -440,12 +450,13 @@ const columns = [ { label: '应收总额', prop: 'incomeTotal', align: 'right', width: 120, slot: 'incomeTotal' }, { label: '应付总额', prop: 'payTotal', align: 'right', width: 120, slot: 'payTotal' }, { label: '计价来源', prop: 'matchSource', align: 'center', width: 130, slot: 'matchSource' }, + { label: '订单状态', prop: 'orderStatus', align: 'center', width: 110, slot: 'orderStatus' }, { label: '计费状态', prop: 'billingFailStatus', align: 'center', width: 120, slot: 'billingFailStatus' }, { label: '客户状态', prop: 'customerActiveStatus', align: 'center', width: 100, slot: 'customerActiveStatus' }, { label: '额度欠费', prop: 'creditArrearsStatus', align: 'center', width: 100, slot: 'creditArrearsStatus' }, // { label: '退费状态', prop: 'refundStatus', align: 'center', width: 100, slot: 'refundStatus' }, { label: '计费时间', prop: 'bizDate', align: 'center', width: 170, parseTime: true }, - { label: '下单时间', prop: 'orderTime', align: 'center', width: 170, parseTime: true }, + { label: '提货时间', prop: 'pickupDate', align: 'center', width: 170, parseTime: true }, { label: '销售员', prop: 'belongSaler', minWidth: 100, showOverflowTooltip: true }, { label: '结算员', prop: 'settlementMan', minWidth: 100, showOverflowTooltip: true }, { label: '客服员', prop: 'serviceMan', minWidth: 100, showOverflowTooltip: true },