优化计费逻辑

bms-front/src/api/price/billing.js

@@ -57,6 +57,14 @@ export function listBill(query) {
   })
 }
 
+export function listOrderBill(query) {
+  return request({
+    url: '/price/billing/orderBill/list',
+    method: 'get',
+    params: query
+  })
+}
+
 /** Receivable bill detail */
 export function getBill(billId) {
   return request({

bms-front/src/components/BasicTable/index.vue

@@ -40,8 +40,31 @@
       />
     </el-row>
 
+    <!-- 虚拟滚动：只渲染可视行 -->
+    <div
+      v-if="virtual"
+      ref="virtualHostRef"
+      class="basic-table-virtual"
+      v-loading="loading"
+    >
+      <el-table-v2
+        v-if="virtualWidth > 0 && tableData.length"
+        :columns="virtualColumns"
+        :data="tableData"
+        :width="virtualWidth"
+        :height="virtualHeight"
+        :row-height="32"
+        :header-height="32"
+        :row-key="virtualRowKey"
+        fixed
+        :row-event-handlers="virtualRowHandlers"
+      />
+      <el-empty v-else-if="!loading" />
+    </div>
+
     <!-- 表格 -->
     <el-table
+      v-else
       ref="tableRef"
       v-loading="loading"
       :data="tableData"
@@ -58,7 +81,7 @@
       @sort-change="(c) => $emit('sort-change', c)"
     >
       <!-- 多选列 -->
-      <el-table-column v-if="selection" type="selection" width="55" align="center" />
+      <el-table-column v-if="selection" type="selection" width="55" align="center" :fixed="leftFixed ? 'left' : false" />
 
       <!-- 序号列 -->
       <el-table-column v-if="showIndex" type="index" label="序号" width="55" align="center" />
@@ -116,6 +139,7 @@
 </template>
 
 <script setup>
+import { ElCheckbox, ElTooltip, TableV2Alignment, TableV2FixedDir } from 'element-plus'
 /**
  * 公共表格组件 BasicTable
  * 集成搜索栏 + 工具栏 + 表格 + 分页，基于 columns/searchColumns 配置驱动，内置复用 BasicForm、RightToolbar、Pagination、DictTag。
@@ -283,6 +307,11 @@ const props = defineProps({
   autoLoad: {
     type: Boolean,
     default: true
+  },
+  // Render only visible rows. Needs a bounded height; falls back to the viewport.
+  virtual: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -327,6 +356,7 @@ watch(
 
 // 实际渲染的列（visible !== false）
 const visibleColumns = computed(() => tableColumns.value.filter((c) => c.visible !== false))
+const leftFixed = computed(() => visibleColumns.value.some((c) => c.fixed === 'left' || c.fixed === true))
 
 // 参与显隐工具栏的列（有 label 且未禁用工具栏显示）
 const toolbarColumns = computed(() =>
@@ -375,6 +405,7 @@ async function getList() {
     const res = await props.query(params)
     tableData.value = res?.rows || []
     total.value = res?.total || 0
+    if (props.virtual) selectionList.value = []
   } catch (e) {
     console.error('BasicTable 加载失败', e)
     // 查询失败时清空旧结果，避免用户误以为旧列表是本次查询结果。
@@ -426,9 +457,17 @@ function getSelectionIds() {
   return selectionIds.value
 }
 function clearSelection() {
+  if (props.virtual) {
+    handleSelectionChange([])
+    return
+  }
   tableRef.value?.clearSelection()
 }
 function toggleRowSelection(row, selected) {
+  if (props.virtual) {
+    toggleVirtualRow(row, selected !== false)
+    return
+  }
   tableRef.value?.toggleRowSelection(row, selected)
 }
 function getTableRef() {
@@ -463,13 +502,257 @@ defineExpose({
   data: tableData
 })
 
+const virtualHostRef = ref()
+const virtualWidth = ref(0)
+const virtualHeight = ref(480)
+let virtualResizeObserver = null
+
+function measureVirtual() {
+  const host = virtualHostRef.value
+  if (!host) return
+  virtualWidth.value = Math.max(0, Math.floor(host.clientWidth))
+  const passed = Number(props.height)
+  if (Number.isFinite(passed) && passed > 0) {
+    virtualHeight.value = passed
+    return
+  }
+  const top = host.getBoundingClientRect().top
+  virtualHeight.value = Math.max(240, Math.floor(window.innerHeight - top - 70))
+}
+
+function virtualRowId(row) {
+  if (!row) return undefined
+  if (typeof props.rowKey === 'function') return props.rowKey(row)
+  if (props.rowKey) return row[props.rowKey]
+  return row.id
+}
+
+const virtualRowKey = computed(() => (typeof props.rowKey === 'string' && props.rowKey) ? props.rowKey : 'id')
+
+function isRowSelected(row) {
+  const key = virtualRowId(row)
+  return selectionList.value.some((item) => virtualRowId(item) === key)
+}
+
+function allRowsSelected() {
+  return tableData.value.length > 0 && tableData.value.every((row) => isRowSelected(row))
+}
+
+function someRowsSelected() {
+  return selectionList.value.length > 0 && !allRowsSelected()
+}
+
+function toggleVirtualRow(row, checked) {
+  const key = virtualRowId(row)
+  const next = selectionList.value.filter((item) => virtualRowId(item) !== key)
+  if (checked) next.push(row)
+  handleSelectionChange(next)
+}
+
+function toggleVirtualAll(checked) {
+  handleSelectionChange(checked ? tableData.value.slice() : [])
+}
+
+function renderVirtualCheckbox(checked, indeterminate, onChange) {
+  return h(ElCheckbox, {
+    modelValue: checked,
+    indeterminate,
+    'onUpdate:modelValue': onChange,
+    onClick: (event) => event.stopPropagation()
+  })
+}
+
+function columnWidth(col) {
+  const width = Number(col.width || col.minWidth)
+  return Number.isFinite(width) && width > 0 ? width : 140
+}
+
+function columnAlign() {
+  return TableV2Alignment.LEFT
+}
+
+function columnFixed(col) {
+  if (col.fixed === 'left' || col.fixed === true) return TableV2FixedDir.LEFT
+  if (col.fixed === 'right') return TableV2FixedDir.RIGHT
+  return undefined
+}
+
+function renderVirtualText(col, row, rowIndex) {
+  let text = row ? row[col.prop] : ''
+  if (col.parseTime) {
+    text = proxy.parseTime(text, col.parseTime === true ? undefined : col.parseTime)
+  } else if (col.formatter) {
+    text = col.formatter(row, col, text, rowIndex)
+  }
+  if (text == null || text === '') return ''
+  return String(text)
+}
+
+const virtualColumns = computed(() => {
+  const cols = []
+  if (props.selection) {
+    cols.push({
+      key: '__selection',
+      dataKey: '__selection',
+      width: 55,
+      align: TableV2Alignment.CENTER,
+      fixed: leftFixed.value ? TableV2FixedDir.LEFT : undefined,
+      headerCellRenderer: () => renderVirtualCheckbox(allRowsSelected(), someRowsSelected(), toggleVirtualAll),
+      cellRenderer: ({ rowData }) => renderVirtualCheckbox(isRowSelected(rowData), false, (checked) => toggleVirtualRow(rowData, checked))
+    })
+  }
+  if (props.showIndex) {
+    cols.push({
+      key: '__index',
+      dataKey: '__index',
+      title: '#',
+      width: 55,
+      align: TableV2Alignment.CENTER,
+      cellRenderer: ({ rowIndex }) => String((queryParams.pageNum - 1) * queryParams.pageSize + rowIndex + 1)
+    })
+  }
+  visibleColumns.value.forEach((col) => {
+    const slotFn = slots[`col-${col.prop}`]
+    const headerSlot = slots[`header-${col.prop}`]
+    const column = {
+      key: String(col.key || col.prop),
+      dataKey: col.prop,
+      title: col.label,
+      width: columnWidth(col),
+      align: columnAlign(col),
+      fixed: columnFixed(col),
+      cellRenderer: ({ rowData, rowIndex }) => {
+        if (col.dict) {
+          return h(resolveComponent('DictTag'), {
+            options: getDictOptions(col.dict),
+            value: rowData[col.prop]
+          })
+        }
+        if (slotFn) {
+          return h('div', { class: 'basic-table-vcell' }, slotFn({ row: rowData, $index: rowIndex }))
+        }
+        const text = renderVirtualText(col, rowData, rowIndex)
+        if (!text) return h('div', { class: 'basic-table-vcell' }, '')
+        return h(ElTooltip, {
+          content: text,
+          placement: 'top',
+          showAfter: 300,
+          enterable: false
+        }, {
+          default: () => h('div', { class: 'basic-table-vcell' }, text)
+        })
+      }
+    }
+    if (headerSlot) column.headerCellRenderer = () => headerSlot({ column: col })
+    cols.push(column)
+  })
+  return cols
+})
+
+const virtualRowHandlers = {
+  onClick({ rowData, event }) {
+    emit('row-click', rowData, null, event)
+  }
+}
+
+watch(() => props.height, () => nextTick(measureVirtual))
+
 if (props.autoLoad) {
   onMounted(getList)
 }
+
+onMounted(() => {
+  if (!props.virtual) return
+  nextTick(() => {
+    measureVirtual()
+    if (virtualHostRef.value && typeof ResizeObserver !== 'undefined') {
+      virtualResizeObserver = new ResizeObserver(() => measureVirtual())
+      virtualResizeObserver.observe(virtualHostRef.value)
+    }
+    window.addEventListener('resize', measureVirtual)
+  })
+})
+
+onBeforeUnmount(() => {
+  if (virtualResizeObserver) virtualResizeObserver.disconnect()
+  window.removeEventListener('resize', measureVirtual)
+})
 </script>
 
 <style scoped>
 .basic-table {
   width: 100%;
 }
+.basic-table-virtual {
+  width: 100%;
+  min-height: 240px;
+  border: 1px solid #ebeef5;
+  background: #fff;
+}
+.basic-table-virtual :deep(.el-table-v2) {
+  --el-table-header-bg-color: #f8f8f9;
+  --el-table-header-text-color: #515a6e;
+  --el-table-border-color: #ebeef5;
+  --el-table-row-hover-bg-color: #f5f7fa;
+  --el-table-text-color: #606266;
+  font-size: 13px;
+  color: #606266;
+}
+.basic-table-virtual :deep(.el-table-v2__header-row) {
+  background: #f8f8f9;
+  border-bottom: 1px solid #ebeef5;
+}
+.basic-table-virtual :deep(.el-table-v2__header-cell) {
+  background: #f8f8f9;
+  color: #515a6e;
+  font-size: 13px;
+  font-weight: 600;
+  border-right: 1px solid #ebeef5;
+  overflow: hidden;
+  white-space: nowrap;
+  justify-content: flex-start !important;
+  text-align: left;
+}
+.basic-table-virtual :deep(.el-table-v2__header-cell-text) {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  text-align: left;
+}
+.basic-table-virtual :deep(.el-table-v2__header-cell:last-child),
+.basic-table-virtual :deep(.el-table-v2__row-cell:last-child) {
+  border-right: none;
+}
+.basic-table-virtual :deep(.el-table-v2__row) {
+  border-bottom: 1px solid #ebeef5;
+}
+.basic-table-virtual :deep(.el-table-v2__row:hover) {
+  background: #f5f7fa;
+}
+.basic-table-virtual :deep(.el-table-v2__row-cell) {
+  color: #606266;
+  font-size: 13px;
+  border-right: 1px solid #ebeef5;
+  padding: 0 8px;
+  overflow: hidden;
+  white-space: nowrap;
+  justify-content: flex-start;
+  text-align: left;
+  min-width: 0;
+}
+.basic-table-virtual :deep(.el-table-v2__row-cell .el-tooltip__trigger) {
+  display: block;
+  max-width: 100%;
+  min-width: 0;
+  overflow: hidden;
+}
+.basic-table-vcell {
+  display: block;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 100%;
+  min-width: 0;
+  line-height: 20px;
+}
 </style>

bms-front/src/views/monitor/orderSource/index.vue

@@ -26,6 +26,7 @@
       :search-per-row="4"
       :page-sizes="[100, 200, 300, 400]"
       :page-size="100"
+      virtual
     >
       <template #toolbar="{ selection }">
         <el-col :span="1.5">

bms-front/src/views/price/billing/bill.vue

@@ -5,21 +5,21 @@
       :columns="columns"
       :search-columns="searchColumns"
       :query="queryList"
-      search-action-align="center"
       :search-per-row="4"
       row-key="billId"
       selection
       :page-sizes="[100, 200, 300, 400]"
       :page-size="100"
+      :height="tableHeight"
+      virtual
     >
-      <template #search-orderNos="{ model }">
-        <multi-value-input v-model="model.orderNos" placeholder="订单号" width="100%" :search-method="searchOrderNoOptions" />
-      </template>
-      <template #search-trackingNos="{ model }">
-        <multi-value-input v-model="model.trackingNos" placeholder="运单号" width="100%" :search-method="searchTrackingNoOptions" />
-      </template>
-      <template #search-transferNos="{ model }">
-        <multi-value-input v-model="model.transferNos" placeholder="转单号" width="100%" :search-method="searchTransferNoOptions" />
+      <template #search-orderIdentifiers="{ model }">
+        <multi-value-input
+          v-model="model.orderIdentifiers"
+          placeholder="订单号/运单号/转单号"
+          width="100%"
+          :search-method="searchOrderIdentifiers"
+        />
       </template>
       <template #search-customerCodes="{ model }">
         <customer-select
@@ -28,8 +28,9 @@
           value-key="customerCode"
           label-key="customerName"
           code-key="customerCode"
-          placeholder="请输入"
+          placeholder="客户名称/客户代码/对外代码"
           multiple
+          remote-search
         />
       </template>
       <template #search-productCodes="{ model }">
@@ -232,19 +233,13 @@ import EditChargeWeightDialog from './components/EditChargeWeightDialog.vue'
 import ExcelImportDialog from '@/components/ExcelImportDialog'
 import ChargeWeightImportAttachDrawer from './components/ChargeWeightImportAttachDrawer.vue'
 
-// 订单号下拉远程搜索：返回匹配的订单号列表（最多 20 条）
-function searchOrderNoOptions(keyword) {
-  return listOrderNoOptions(keyword).then(res => res.data || [])
-}
-
-// 运单号下拉远程搜索
-function searchTrackingNoOptions(keyword) {
-  return listTrackingNoOptions(keyword).then(res => res.data || [])
-}
-
-// 转单号下拉远程搜索
-function searchTransferNoOptions(keyword) {
-  return listTransferNoOptions(keyword).then(res => res.data || [])
+// 单号下拉：订单号、运单号、转单号合并候选
+function searchOrderIdentifiers(keyword) {
+  return Promise.all([
+    listOrderNoOptions(keyword).then(res => res.data || []),
+    listTrackingNoOptions(keyword).then(res => res.data || []),
+    listTransferNoOptions(keyword).then(res => res.data || [])
+  ]).then(groups => [...new Set(groups.flat().map(v => String(v)))])
 }
 
 // 产品下拉选项：复用 ProductSelect 的模块级产品缓存（全应用只拉一次）
@@ -257,6 +252,37 @@ const productOptions = computed(() =>
 )
 
 const tableRef = ref()
+const tableHeight = ref(480)
+let tableResizeObserver = null
+
+function updateTableHeight() {
+  const tableEl = document.querySelector('.billing-bill > .basic-table .el-table, .billing-bill > .basic-table .basic-table-virtual')
+  if (!tableEl) return
+  const top = tableEl.getBoundingClientRect().top
+  const paginationReserve = 58
+  const bottomGap = 12
+  tableHeight.value = Math.max(240, Math.floor(window.innerHeight - top - paginationReserve - bottomGap))
+}
+
+onMounted(() => {
+  nextTick(() => {
+    updateTableHeight()
+    const form = document.querySelector('.billing-bill > .basic-table .basic-form')
+    if (form && typeof ResizeObserver !== 'undefined') {
+      tableResizeObserver = new ResizeObserver(() => updateTableHeight())
+      tableResizeObserver.observe(form)
+    }
+  })
+  window.addEventListener('resize', updateTableHeight)
+})
+
+onBeforeUnmount(() => {
+  window.removeEventListener('resize', updateTableHeight)
+  if (tableResizeObserver) {
+    tableResizeObserver.disconnect()
+    tableResizeObserver = null
+  }
+})
 const open = ref(false)
 const title = ref('计费详情')
 const loading = ref(false)
@@ -286,7 +312,7 @@ const recalcDialogOpen = ref(false)
 const recalcMode = ref('PRODUCT')
 
 const columns = [
-  { label: '订单号', prop: 'orderNo', minWidth: 140, showOverflowTooltip: true },
+  { label: '订单号', prop: 'orderNo', width: 160, fixed: 'left', showOverflowTooltip: true },
   { label: '运单号', prop: 'trackingNo', minWidth: 140, showOverflowTooltip: true },
   { label: '转单号', prop: 'transferNo', minWidth: 140, showOverflowTooltip: true },
   { label: '客户', prop: 'customerName', minWidth: 140, showOverflowTooltip: true },
@@ -320,19 +346,16 @@ const refundStatusOptions = [
   { label: '未退费', value: 'NONE' },
   { label: '已退费', value: 'REFUNDED' }
 ]
-/** billing_fail_status: 0 success / 1 product / 2 country / 3 weight */
 const billingFailStatusOptions = [
-  { label: '\u8ba1\u8d39\u6210\u529f', value: 0 },
-  { label: '\u672a\u5339\u914d\u4ea7\u54c1', value: 1 },
-  { label: '\u672a\u5339\u914d\u56fd\u5bb6', value: 2 },
-  { label: '\u672a\u5339\u914d\u91cd\u91cf\u6bb5', value: 3 }
+  { label: '计费成功', value: 0 },
+  { label: '未匹配产品', value: 1 },
+  { label: '未匹配国家', value: 2 },
+  { label: '未匹配重量段', value: 3 },
 ]
 
 const searchColumns = [
-  { label: '订单号', prop: 'orderNos', placeholder: '订单号' },
-  { label: '运单号', prop: 'trackingNos', placeholder: '运单号' },
-  { label: '转单号', prop: 'transferNos', placeholder: '转单号' },
-  { label: '客户', prop: 'customerCodes', placeholder: '客户代码' },
+  { label: '单号', prop: 'orderIdentifiers', placeholder: '订单号/运单号/转单号' },
+  { label: '客户', prop: 'customerCodes', placeholder: '客户名称/客户代码/对外代码' },
   { label: '产品代码', prop: 'productCodes', placeholder: '产品代码' },
   {
     label: '额度欠费',
@@ -443,7 +466,8 @@ function onDetailUpdated(data) {
 
 function hasBatchFeeQuery(q) {
   const hasArr = (arr) => Array.isArray(arr) && arr.some(v => v != null && String(v).trim() !== '')
-  return hasArr(q.orderNos)
+  return hasArr(q.orderIdentifiers)
+    || hasArr(q.orderNos)
     || hasArr(q.trackingNos)
     || hasArr(q.transferNos)
     || hasArr(q.customerCodes)
@@ -488,6 +512,7 @@ function buildRecalcPayload() {
     orderNos: rest.orderNos || [],
     trackingNos: rest.trackingNos || [],
     transferNos: rest.transferNos || [],
+    orderIdentifiers: rest.orderIdentifiers || [],
     customerCodes: rest.customerCodes || [],
     productCodes: rest.productCodes || [],
     creditArrearsStatus: rest.creditArrearsStatus || undefined
@@ -578,6 +603,7 @@ function buildChargeWeightTemplateQuery() {
     orderNos: rest.orderNos || [],
     trackingNos: rest.trackingNos || [],
     transferNos: rest.transferNos || [],
+    orderIdentifiers: rest.orderIdentifiers || [],
     customerCodes: rest.customerCodes || [],
     productCodes: rest.productCodes || [],
     creditArrearsStatus: rest.creditArrearsStatus || undefined
@@ -691,15 +717,13 @@ function formatWeight(val) {
 
 function billingFailLabel(status) {
   const code = status == null ? 0 : Number(status)
-  if (code === 1) return '未匹配产品'
-  if (code === 2) return '未匹配国家'
-  if (code === 3) return '未匹配重量段'
-  return '计费成功'
+  const hit = billingFailStatusOptions.find(item => item.value === code)
+  return hit ? hit.label : '未知失败'
 }
 
 function billingFailTagType(status) {
   const code = status == null ? 0 : Number(status)
-  if (code === 1 || code === 2 || code === 3) return 'danger'
+  if (code > 0) return 'danger'
   return 'success'
 }
 

bms-front/src/views/price/billing/components/BatchAddIncomeFeeDialog.vue

@@ -193,6 +193,8 @@ function fmtList(arr, max = 5) {
 
 function buildQueryTags(q) {
   const tags = []
+  const identifiers = fmtList(q.orderIdentifiers)
+  if (identifiers) tags.push("单号" + '：' + identifiers)
   const order = fmtList(q.orderNos)
   if (order) tags.push("订单号" + '：' + order)
   const tracking = fmtList(q.trackingNos)
@@ -256,6 +258,7 @@ function buildPayload() {
     orderNos: q.orderNos || [],
     trackingNos: q.trackingNos || [],
     transferNos: q.transferNos || [],
+    orderIdentifiers: q.orderIdentifiers || [],
     customerCodes: q.customerCodes || [],
     productCodes: q.productCodes || [],
     creditArrearsStatus: q.creditArrearsStatus || undefined,

bms-front/src/views/price/billing/components/BillDetail.vue

@@ -96,7 +96,7 @@
           <div class="sec-title">费用明细</div>
           <el-tabs v-model="feeTab" class="fee-tabs">
             <el-tab-pane label="应收" name="income">
-              <div class="fee-toolbar">
+              <div v-if="!readonly" class="fee-toolbar">
                 <el-button type="primary" plain size="small" icon="Plus" v-hasPermi="['price:billing:feeAdd']" @click="openAddFee">增加费用</el-button>
                 <el-button type="primary" plain size="small" icon="Edit" v-hasPermi="['price:billing:chargeWeightEdit']" :disabled="detail.refundStatus === 'REFUNDED'" @click="openEditCw">修改计费重</el-button>
               </div>
@@ -124,7 +124,7 @@
                 <el-table-column label="说明" min-width="160" show-overflow-tooltip>
                   <template #default="{ row }">{{ row.remark || '-' }}</template>
                 </el-table-column>
-                <el-table-column label="操作" width="120" align="center" fixed="right">
+                <el-table-column v-if="!readonly" label="操作" width="120" align="center" fixed="right">
                   <template #default="{ row }">
                     <template v-if="canEditManualFee(row)">
                       <el-button link type="primary" v-hasPermi="['price:billing:feeEdit']" @click="openEditFee(row)">编辑</el-button>
@@ -198,7 +198,8 @@ const props = defineProps({
   modelValue: { type: Boolean, default: false },
   title: { type: String, default: '计费详情' },
   loading: { type: Boolean, default: false },
-  detail: { type: Object, default: null }
+  detail: { type: Object, default: null },
+  readonly: { type: Boolean, default: false }
 })
 
 const emit = defineEmits(['update:modelValue', 'updated'])
@@ -335,17 +336,41 @@ function formatDateTime(val) {
   return d.getFullYear() + '-' + pad(d.getMonth() + 1) + '-' + pad(d.getDate()) + ' ' + pad(d.getHours()) + ':' + pad(d.getMinutes()) + ':' + pad(d.getSeconds())
 }
 
+const billingFailStatusOptions = [
+  { label: '计费成功', value: 0 },
+  { label: '未匹配产品', value: 1 },
+  { label: '未匹配国家', value: 2 },
+  { label: '未匹配重量段', value: 3 },
+  { label: '未绑定套餐', value: 4 },
+  { label: '无生效套餐版本', value: 5 },
+  { label: '已生成应收账单', value: 6 },
+  { label: '产品档案缺失', value: 7 },
+  { label: '未命中价格', value: 8 },
+  { label: '分区无价格', value: 9 },
+  { label: '邮编必填', value: 10 },
+  { label: '邮编未匹配分区', value: 11 },
+  { label: '上游订单不存在', value: 12 },
+  { label: '上游订单号为空', value: 13 },
+  { label: '上游客户为空', value: 14 },
+  { label: '上游产品为空', value: 15 },
+  { label: '上游重量无效', value: 16 },
+  { label: '计费时间为空', value: 17 },
+  { label: '退费订单无法解析', value: 18 },
+  { label: '客户代码为空', value: 19 },
+  { label: '客户已停用', value: 20 },
+  { label: '运费为空', value: 21 },
+  { label: '未知失败', value: 22 }
+]
+
 function billingFailLabel(status) {
   const code = status == null ? 0 : Number(status)
-  if (code === 1) return '未匹配产品'
-  if (code === 2) return '未匹配国家'
-  if (code === 3) return '未匹配重量段'
-  return '计费成功'
+  const hit = billingFailStatusOptions.find(item => item.value === code)
+  return hit ? hit.label : '未知失败'
 }
 
 function billingFailTagType(status) {
   const code = status == null ? 0 : Number(status)
-  if (code === 1 || code === 2 || code === 3) return 'danger'
+  if (code > 0) return 'danger'
   return 'success'
 }
 

bms-front/src/views/price/orderBill/index.vue

@@ -0,0 +1,376 @@
+<template>
+  <div class="app-container order-bill-query">
+    <basic-table
+      ref="tableRef"
+      :columns="columns"
+      :search-columns="searchColumns"
+      :query="queryList"
+      :search-per-row="4"
+      row-key="billId"
+      :page-sizes="[100, 200, 300, 400]"
+      :page-size="100"
+      selection
+      :height="tableHeight"
+      virtual
+    >
+      <template #toolbar="{ selection }">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="Refresh"
+            v-hasPermi="['price:orderBill:rebill']"
+            @click="openFilterRebill()"
+          >重新计费</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button type="info" plain icon="Document" @click="logDrawerRef.open()">操作记录</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="Refresh"
+            :disabled="!selection.length"
+            :loading="batchLoading"
+            v-hasPermi="['price:orderBill:rebill']"
+            @click="handleBatchRebill(selection)"
+          >重新计费选中</el-button>
+        </el-col>
+      </template>
+      <template #search-orderIdentifiers="{ model }">
+        <multi-value-input
+          v-model="model.orderIdentifiers"
+          placeholder="订单号/运单号/转单号"
+          width="100%"
+          :search-method="searchOrderIdentifiers"
+        />
+      </template>
+      <template #search-customerCodes="{ model }">
+        <customer-select
+          v-model="model.customerCodes"
+          type="customer"
+          value-key="customerCode"
+          label-key="customerName"
+          code-key="customerCode"
+          placeholder="客户名称/客户代码/对外代码"
+          multiple
+          remote-search
+        />
+      </template>
+      <template #col-product="{ row }">
+        {{ row.productName || '-' }} ({{ row.productCode || '-' }})
+      </template>
+      <template #col-country="{ row }">
+        {{ row.countryName || '-' }} ({{ row.countryCode || '-' }})
+      </template>
+      <template #col-weight="{ row }">
+        {{ formatWeight(row.weight) }}
+      </template>
+      <template #col-volumeWeight="{ row }">
+        {{ formatWeight(row.volumeWeight) }}
+      </template>
+      <template #col-receiveWeight="{ row }">
+        {{ formatWeight(row.receiveWeight) }}
+      </template>
+      <template #col-orderStatus="{ row }">
+        {{ orderStatusLabel(row.orderStatus) }}
+      </template>
+      <template #col-billingFailStatus="{ row }">
+        <el-tag size="small" :type="billingFailTagType(row.billingFailStatus)">{{ billingFailLabel(row.billingFailStatus) }}</el-tag>
+      </template>
+      <template #col-action="{ row }">
+        <el-button
+          link
+          type="warning"
+          icon="Refresh"
+          :loading="rebillingKey === row.billId"
+          v-hasPermi="['price:orderBill:rebill']"
+          @click="handleRebillOne(row)"
+        >重新计费</el-button>
+      </template>
+    </basic-table>
+    <order-source-sync-dialog ref="syncDialogRef" @success="onRebillSuccess" />
+    <order-source-sync-log-drawer ref="logDrawerRef" />
+  </div>
+</template>
+
+<script setup name="OrderBillQuery">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { listOrderBill, listOrderNoOptions, listTrackingNoOptions, listTransferNoOptions } from '@/api/price/billing'
+import { syncOrderSourceSelected } from '@/api/monitor/orderSource'
+import OrderSourceSyncDialog from '../../monitor/orderSource/components/OrderSourceSyncDialog.vue'
+import OrderSourceSyncLogDrawer from '../../monitor/orderSource/components/OrderSourceSyncLogDrawer.vue'
+
+const tableRef = ref()
+const syncDialogRef = ref()
+const logDrawerRef = ref()
+const batchLoading = ref(false)
+const rebillingKey = ref(null)
+const tableHeight = ref(480)
+let tableResizeObserver = null
+
+const columns = [
+  { label: '订单号', prop: 'orderNo', width: 160, fixed: 'left', showOverflowTooltip: true },
+  { label: '运单号', prop: 'trackingNo', minWidth: 140, showOverflowTooltip: true },
+  { label: '转单号', prop: 'transferNo', minWidth: 140, showOverflowTooltip: true },
+  { label: '客户', prop: 'customerName', minWidth: 140, showOverflowTooltip: true },
+  { label: '客户代码', prop: 'customerCode', width: 120 },
+  { label: '产品', prop: 'product', minWidth: 160, slot: 'product' },
+  { label: '国家', prop: 'country', minWidth: 130, slot: 'country' },
+  { label: '件数', prop: 'pieces', align: 'center', width: 70 },
+  { label: '计费重', prop: 'weight', align: 'center', width: 90, slot: 'weight' },
+  { label: '体积重', prop: 'volumeWeight', align: 'center', width: 90, slot: 'volumeWeight' },
+  { label: '实重', prop: 'receiveWeight', align: 'center', width: 90, slot: 'receiveWeight' },
+  { label: '收件人邮编', prop: 'destPostcode', minWidth: 120, showOverflowTooltip: true },
+  { label: '订单状态', prop: 'orderStatus', align: 'center', width: 110, slot: 'orderStatus' },
+  { label: '计费状态', prop: 'billingFailStatus', align: 'center', width: 140, slot: 'billingFailStatus' },
+  { 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: 'action', align: 'center', width: 120, fixed: 'right', slot: 'action', showInToolbar: false }
+]
+
+const orderStatusMap = {
+  0: '预报订单',
+  1: '确认订单',
+  2: '已中转',
+  3: '已收货',
+  4: '已装箱',
+  5: '已出库',
+  6: '转运中',
+  7: '已上网',
+  8: '已签收',
+  9: '已退件',
+  10: '已删除'
+}
+
+const billingFailStatusOptions = [
+  { label: '计费成功', value: 0 },
+  { label: '未匹配产品', value: 1 },
+  { label: '未匹配国家', value: 2 },
+  { label: '未匹配重量段', value: 3 },
+  { label: '未绑定套餐', value: 4 },
+  { label: '无生效套餐版本', value: 5 },
+  { label: '已生成应收账单', value: 6 },
+  { label: '产品档案缺失', value: 7 },
+  { label: '未命中价格', value: 8 },
+  { label: '分区无价格', value: 9 },
+  { label: '邮编必填', value: 10 },
+  { label: '邮编未匹配分区', value: 11 },
+  { label: '上游订单不存在', value: 12 },
+  { label: '上游订单号为空', value: 13 },
+  { label: '上游客户为空', value: 14 },
+  { label: '上游产品为空', value: 15 },
+  { label: '上游重量无效', value: 16 },
+  { label: '计费时间为空', value: 17 },
+  { label: '退费订单无法解析', value: 18 },
+  { label: '客户代码为空', value: 19 },
+  { label: '客户已停用', value: 20 },
+  { label: '运费为空', value: 21 },
+  { label: '未知失败', value: 22 }
+]
+
+const searchColumns = [
+  { label: '单号', prop: 'orderIdentifiers', placeholder: '订单号/运单号/转单号' },
+  { label: '客户', prop: 'customerCodes', placeholder: '客户名称/客户代码/对外代码' },
+  {
+    label: '计费时间',
+    prop: 'bizDateRange',
+    component: 'datetimerange',
+    colSpan: 2,
+    props: {
+      clearable: true,
+      defaultTime: [new Date(2000, 0, 1, 0, 0, 0), new Date(2000, 0, 1, 23, 59, 59)]
+    }
+  },
+  {
+    label: '计费状态',
+    prop: 'billingFailStatuses',
+    component: 'select',
+    options: billingFailStatusOptions,
+    placeholder: '请选择'
+  }
+]
+
+function queryList(params) {
+  const { bizDateRange, ...rest } = params
+  const query = { ...rest }
+  if (Array.isArray(bizDateRange) && (bizDateRange[0] || bizDateRange[1])) {
+    query.params = {
+      ...(query.params || {}),
+      beginBizDate: bizDateRange[0] || null,
+      endBizDate: bizDateRange[1] || null
+    }
+  }
+  return listOrderBill(query)
+}
+
+
+const MAX_REBILL = 10000
+
+function currentIdentifiers() {
+  const q = tableRef.value?.getQueryParams?.() || {}
+  return (Array.isArray(q.orderIdentifiers) ? q.orderIdentifiers : [])
+    .map(v => String(v || '').trim())
+    .filter(Boolean)
+}
+
+function buildRebillFilter() {
+  const q = tableRef.value?.getQueryParams?.() || {}
+  const filter = { orderIdentifiers: currentIdentifiers() }
+  if (Array.isArray(q.customerCodes) && q.customerCodes.length) {
+    filter.customerCodes = q.customerCodes
+  }
+  return filter
+}
+
+function openFilterRebill() {
+  const identifiers = currentIdentifiers()
+  if (!identifiers.length) {
+    ElMessage.warning('请输入单号后再重新计费，或勾选订单后点重新计费选中')
+    return
+  }
+  if (identifiers.length > MAX_REBILL) {
+    ElMessage.warning('单次最多重新计费 ' + MAX_REBILL + ' 个单号')
+    return
+  }
+  ElMessageBox.confirm(
+    '将按 ' + identifiers.length + ' 个单号查上游订单并重新计费，确认继续？',
+    '二次确认',
+    { type: 'warning' }
+  ).then(() => {
+    syncDialogRef.value?.open(buildRebillFilter(), true)
+  }).catch(() => {})
+}
+
+function toSyncRow(row) {
+  return {
+    orderId: row.orderNo,
+    orgOrderId: row.trackingNo,
+    transferOrderId: row.transferNo,
+    customerCode: row.customerCode,
+    pickupDate: row.bizDate || row.pickupDate || row.orderTime || null
+  }
+}
+
+function handleRebillOne(row) {
+  if (!toSyncRow(row).pickupDate) {
+    ElMessage.warning('该订单没有计费时间，无法重新计费')
+    return
+  }
+  ElMessageBox.confirm('确认重新计费该订单？', '二次确认', { type: 'warning' }).then(() => {
+    rebillingKey.value = row.billId
+    return syncOrderSourceSelected([toSyncRow(row)])
+  }).then(res => {
+    const data = (res && res.data) || {}
+    if ((data.ok || 0) > 0 && !(data.fail || 0)) {
+      ElMessage.success('重新计费成功')
+    } else {
+      const detail = data.details && data.details[0]
+      ElMessage.error((detail && detail.errorMessage) || '重新计费失败')
+    }
+    tableRef.value?.refresh?.()
+  }).catch(() => {}).finally(() => {
+    rebillingKey.value = null
+  })
+}
+
+function handleBatchRebill(selection) {
+  const rows = selection || []
+  if (!rows.length) return
+  const missingTime = rows.filter(row => !toSyncRow(row).pickupDate).length
+  if (missingTime) {
+    ElMessage.warning(missingTime + ' 条没有计费时间，无法重新计费')
+    return
+  }
+  if (rows.length > 200) {
+    ElMessage.warning('选中重新计费最多 200 条')
+    return
+  }
+  ElMessageBox.confirm('确认重新计费选中的 ' + rows.length + ' 条订单？', '二次确认', { type: 'warning' }).then(() => {
+    batchLoading.value = true
+    return syncOrderSourceSelected(rows.map(toSyncRow))
+  }).then(res => {
+    const data = (res && res.data) || {}
+    ElMessage.success('完成：成功 ' + (data.ok || 0) + ' / 失败 ' + (data.fail || 0))
+    tableRef.value?.refresh?.()
+  }).catch(() => {}).finally(() => {
+    batchLoading.value = false
+  })
+}
+
+function onRebillSuccess() {
+  tableRef.value?.refresh?.()
+}
+
+function searchOrderIdentifiers(keyword) {
+  return Promise.all([
+    listOrderNoOptions(keyword).then(res => res.data || []),
+    listTrackingNoOptions(keyword).then(res => res.data || []),
+    listTransferNoOptions(keyword).then(res => res.data || [])
+  ]).then(groups => [...new Set(groups.flat().map(v => String(v)))])
+}
+
+function formatWeight(val) {
+  if (val == null || val === '') return '-'
+  const num = Number(val)
+  if (Number.isNaN(num)) return val
+  return num.toFixed(3)
+}
+
+function orderStatusLabel(status) {
+  if (status === null || status === undefined || status === '') return '-'
+  const key = Number(status)
+  if (Object.prototype.hasOwnProperty.call(orderStatusMap, key)) return orderStatusMap[key]
+  return String(status)
+}
+
+function billingFailLabel(status) {
+  const code = status == null ? 0 : Number(status)
+  const hit = billingFailStatusOptions.find(item => item.value === code)
+  return hit ? hit.label : '未知失败'
+}
+
+function billingFailTagType(status) {
+  const code = status == null ? 0 : Number(status)
+  return code > 0 ? 'danger' : 'success'
+}
+
+function updateTableHeight() {
+  const tableEl = document.querySelector('.order-bill-query > .basic-table .el-table, .order-bill-query > .basic-table .basic-table-virtual')
+  if (!tableEl) return
+  const top = tableEl.getBoundingClientRect().top
+  tableHeight.value = Math.max(240, Math.floor(window.innerHeight - top - 58 - 12))
+}
+
+onMounted(() => {
+  nextTick(() => {
+    updateTableHeight()
+    const form = document.querySelector('.order-bill-query > .basic-table .basic-form')
+    if (form && typeof ResizeObserver !== 'undefined') {
+      tableResizeObserver = new ResizeObserver(() => updateTableHeight())
+      tableResizeObserver.observe(form)
+    }
+  })
+  window.addEventListener('resize', updateTableHeight)
+})
+
+onBeforeUnmount(() => {
+  window.removeEventListener('resize', updateTableHeight)
+  if (tableResizeObserver) {
+    tableResizeObserver.disconnect()
+    tableResizeObserver = null
+  }
+})
+</script>
+
+<style scoped>
+.order-bill-query :deep(.basic-form .el-form-item .el-select),
+.order-bill-query :deep(.basic-form .el-form-item .el-input),
+.order-bill-query :deep(.basic-form .el-form-item .el-date-editor) {
+  width: 100%;
+}
+</style>