diff --git a/bms-front/src/views/price/billing/bill.vue b/bms-front/src/views/price/billing/bill.vue index 9c279d1d..6a65856b 100644 --- a/bms-front/src/views/price/billing/bill.vue +++ b/bms-front/src/views/price/billing/bill.vue @@ -123,13 +123,11 @@ 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: 'customerActiveStatus', align: 'center', width: 100, slot: 'customerActiveStatus' }, + { label: '客户状态', prop: 'customerActiveStatus', align: 'center', width: 100, slot: 'customerActiveStatus' }, { label: '额度欠费', prop: 'creditArrearsStatus', align: 'center', width: 100, slot: 'creditArrearsStatus' }, { label: '下单时间', prop: 'orderTime', align: 'center', width: 170, parseTime: true }, { label: '销售员', prop: 'belongSaler', minWidth: 100, showOverflowTooltip: true }, - { label: '销售员编码', prop: 'belongSalerCode', minWidth: 110, showOverflowTooltip: true }, { label: '结算员', prop: 'settlementMan', minWidth: 100, showOverflowTooltip: true }, - { label: '结算员编码', prop: 'settlementManCode', minWidth: 110, showOverflowTooltip: true }, // { label: '客服员', prop: 'serviceMan', minWidth: 100, showOverflowTooltip: true }, { label: '操作', prop: 'action', align: 'center', width: 90, fixed: 'right', slot: 'action', showInToolbar: false } ] @@ -147,7 +145,7 @@ function queryList(params) { } function handleView(row) { - title.value = '计费详情 #' + (row.orderNo || row.billId) + title.value = '计费详情' open.value = true loading.value = true detail.value = null diff --git a/bms-front/src/views/price/billing/components/BillDetail.vue b/bms-front/src/views/price/billing/components/BillDetail.vue index 0c803906..85f838fa 100644 --- a/bms-front/src/views/price/billing/components/BillDetail.vue +++ b/bms-front/src/views/price/billing/components/BillDetail.vue @@ -21,7 +21,7 @@ {{ detail.settlementMan || '-' }} {{ detail.serviceMan || '-' }} {{ displayCustomer(detail) }} - {{ customerActiveLabel(detail.customerActiveStatus) }} + {{ customerActiveLabel(detail.customerActiveStatus) }} {{ creditArrearsLabel(detail.creditArrearsStatus) }} {{ detail.warehouseCode || '-' }} {{ detail.shipperName || '-' }}