imeik-bizui 2.5.4 → 2.5.5

package/dist/bizui/src/FieldFloorPriceBoard/core/mock.js

@@ -1,7 +1,6 @@
 /**
  * 底价看板演示数据（模拟接口返回形态，经 normalize 映射）
  */
-import { DEFAULT_DETAIL_FORMULAS, DEFAULT_FOOTER_TEXT } from './utils'
 
 const DEMO_CUSTOMER = '大连公共交通建设投资集团有限公司'
 
@@ -11,7 +10,6 @@ export function createDemoOverview() {
     controlMethod: '申请后触底',
     applyTotalFee: 10000,
     year: '2026',
-    footerText: DEFAULT_FOOTER_TEXT,
     customerName: DEMO_CUSTOMER,
     productBasePriceList: [
       {
@@ -68,15 +66,16 @@ export function createDemoOverview() {
 
 function buildSalesOrderRows() {
   const products = ['灵塑100', '塑菲200', '嗨体2.5ml']
-  const types = ['药品', '耗材', '器械']
+  const types = ['GENUINE', 'FREE']
   const rows = []
   for (let i = 1; i <= 12; i++) {
     const productName = products[i % products.length]
     const qty = 20 + (i % 5) * 10
     rows.push({
-      orderNo: `SO2026${String(300 + i).padStart(4, '0')}`,
+      orderNum: `XSCKD${String(136300 + i)}`,
       productName,
-      productTypeName: types[i % types.length],
+      saleType: types[i % types.length],
+      qty,
       amount: qty * (productName === '塑菲200' ? 1040 : productName === '嗨体2.5ml' ? 680 : 820)
     })
   }
@@ -89,10 +88,10 @@ function buildNonSalesRows() {
   for (let i = 1; i <= 8; i++) {
     const qty = 2 + (i % 5)
     rows.push({
-      outboundNo: `CK2026${String(100 + i).padStart(4, '0')}`,
+      orderNum: `QTCKD${String(136300 + i)}`,
       productName: products[i % products.length],
       qty,
-      convertedFee: qty * 300
+      amount: qty * 300
     })
   }
   return rows
@@ -103,127 +102,26 @@ function buildExpenseRows() {
   const rows = []
   for (let i = 1; i <= 9; i++) {
     rows.push({
-      orderNo: `FY2026${String(200 + i).padStart(4, '0')}`,
-      typeName: types[(i - 1) % types.length],
-      amount: 800 + i * 350
+      bizOrderCode: `FY2026${String(200 + i).padStart(4, '0')}`,
+      costTypeName: types[(i - 1) % types.length],
+      costAmount: 800 + i * 350
     })
   }
   rows.push({
-    orderNo: '本次申请',
-    typeName: '会议费用',
-    amount: 10000,
+    bizOrderCode: '本次申请',
+    costTypeName: '会议费用',
+    costAmount: 10000,
     current: true
   })
   return rows
 }
 
-/** 模拟明细弹窗已规范化数据（useDemo 直接喂 DetailDialog） */
+/** 模拟 getProductPriceDetail data */
 export function createDemoDetail(overview = {}) {
-  const customerName = overview.customerName || DEMO_CUSTOMER
   return {
-    title: `底价明细 · ${customerName}`,
-    summaryColumns: [
-      { prop: 'name', label: '产品', minWidth: 110, fixed: 'left' },
-      { prop: 'currentPrice', label: '目前底价', type: 'number', digits: 0, minWidth: 88, align: 'right' },
-      { prop: 'afterPrice', label: '申请后底价', type: 'number', digits: 0, minWidth: 96, align: 'right', bold: true },
-      { prop: 'standard', label: '标准', type: 'number', digits: 0, minWidth: 80, align: 'right' },
-      { prop: 'gap', label: '差距', type: 'gap', digits: 1, minWidth: 80, align: 'right' },
-      { prop: 'orderAmount', label: '订单金额', type: 'number', digits: 0, minWidth: 96, align: 'right' },
-      { prop: 'nonSalesFee', label: '非销促进费', type: 'number', digits: 0, minWidth: 96, align: 'right' },
-      { prop: 'spentFee', label: '已花费用', type: 'number', digits: 0, minWidth: 88, align: 'right' },
-      {
-        prop: 'currentAllocation',
-        label: '本次分摊',
-        type: 'highlight',
-        digits: 0,
-        minWidth: 88,
-        align: 'right',
-        highlightTone: 'current'
-      },
-      { prop: 'qtyText', label: '数量 (正品+赠品)', minWidth: 120, align: 'center' },
-      { prop: 'statusLabel', label: '状态', type: 'status', minWidth: 72, align: 'center' }
-    ],
-    summaryRows: [
-      {
-        name: '臻爱 灵塑100',
-        currentPrice: 738,
-        afterPrice: 706,
-        standard: 730,
-        orderAmount: 148000,
-        nonSalesFee: 2400,
-        spentFee: 3600,
-        currentAllocation: 5208,
-        applyAfterGenuineNum: 180,
-        applyAfterFreeNum: 12
-      },
-      {
-        name: '臻爱 塑菲200',
-        currentPrice: 1014,
-        afterPrice: 983,
-        standard: 980,
-        orderAmount: 96800,
-        nonSalesFee: 1200,
-        spentFee: 2100,
-        currentAllocation: 4792,
-        applyAfterGenuineNum: 90,
-        applyAfterFreeNum: 6
-      },
-      {
-        name: '嗨体 2.5ml',
-        currentPrice: 612,
-        afterPrice: 598,
-        standard: 605,
-        orderAmount: 45600,
-        nonSalesFee: 900,
-        spentFee: 1500,
-        currentAllocation: 2100,
-        applyAfterGenuineNum: 66,
-        applyAfterFreeNum: 6
-      }
-    ],
-    sections: [
-      {
-        key: 'salesOrders',
-        title: '销售订单',
-        subtitle: '(订单价 × 数量)',
-        theme: 'purple',
-        columns: [
-          { prop: 'orderNo', label: '订单号', minWidth: 120 },
-          { prop: 'productName', label: '产品', minWidth: 80 },
-          { prop: 'productTypeName', label: '类型', width: 64 },
-          { prop: 'amount', label: '金额', type: 'number', digits: 0, align: 'right', width: 88 }
-        ],
-        rows: buildSalesOrderRows(),
-        footer: { label: '合计', theme: 'purple', values: ['金额 252,000'] }
-      },
-      {
-        key: 'nonSales',
-        title: '非销售出库',
-        subtitle: '(折算非销促进费)',
-        theme: 'danger',
-        columns: [
-          { prop: 'outboundNo', label: '出库单号', minWidth: 120 },
-          { prop: 'productName', label: '产品', minWidth: 80 },
-          { prop: 'qty', label: '数量', align: 'right', width: 56 },
-          { prop: 'convertedFee', label: '折算费用', type: 'number', digits: 0, align: 'right', width: 88 }
-        ],
-        rows: buildNonSalesRows(),
-        footer: { label: '合计', theme: 'danger', values: ['数量 32', '折算费用 9,600'] }
-      },
-      {
-        key: 'salesExpenses',
-        title: '销售费用',
-        subtitle: '(费用申请单口径)',
-        theme: 'danger',
-        columns: [
-          { prop: 'orderNo', label: '单号', minWidth: 100 },
-          { prop: 'typeName', label: '类型', minWidth: 80 },
-          { prop: 'amount', label: '金额', type: 'number', digits: 0, align: 'right', width: 88 }
-        ],
-        rows: buildExpenseRows(),
-        footer: { label: '合计（含本次）', theme: 'danger', values: ['28,650'] }
-      }
-    ],
-    formulas: DEFAULT_DETAIL_FORMULAS
+    customerName: overview.customerName || DEMO_CUSTOMER,
+    saleOrderList: buildSalesOrderRows(),
+    noSaleOrderList: buildNonSalesRows(),
+    costList: buildExpenseRows()
   }
 }

package/dist/bizui/src/FieldFloorPriceBoard/core/normalize.js

@@ -10,8 +10,28 @@ import {
   formatNumber
 } from './utils'
 
-/** getProductPrice.productBasePriceList → 卡片行 */
-export function mapOverviewProduct(row = {}) {
+const SALE_TYPE_LABEL = {
+  GENUINE: '正品',
+  FREE: '赠品',
+  GIFT: '赠品'
+}
+
+function saleTypeLabel(value) {
+  if (value == null || value === '') return ''
+  const key = String(value).toUpperCase()
+  return SALE_TYPE_LABEL[key] || String(value)
+}
+
+/** 数量：applyAfterGenuineNum（正品）+ applyAfterFreeNum（赠品） */
+function buildQtyText(genuine, free) {
+  if (genuine == null && free == null) return '-'
+  const g = Number(genuine) || 0
+  const f = Number(free) || 0
+  return `${g + f} (${g}+${f})`
+}
+
+/** getProductPrice.productBasePriceList → 卡片 / 明细汇总行 */
+function mapOverviewProduct(row = {}) {
   const beforePrice = row.applyBeforePrice
   const afterPrice = row.applyAfterPrice
   const standard = row.productBasePrice
@@ -19,33 +39,26 @@ export function mapOverviewProduct(row = {}) {
 
   return {
     key: row.productCode || row.erpCode,
-    erpCode: row.erpCode,
-    productCode: row.productCode,
-    name: row.productName,
-    shortName: row.productShortName || row.productName,
+    name: row.productShortName || row.productName,
     beforePrice,
     afterPrice,
     standard,
-    applyCount: row.applyCount,
-    applyAfterFeeAmount: row.applyAfterFeeAmount,
-    applyAfterFreeNum: row.applyAfterFreeNum,
-    applyAfterGenuineNum: row.applyAfterGenuineNum,
-    applyAfterNoSaleOrderAmount: row.applyAfterNoSaleOrderAmount,
-    applyAfterSaleOrderAmount: row.applyAfterSaleOrderAmount,
-    applyThisFeeAmount: row.applyThisFeeAmount,
     gap,
     gapLabel,
-    hit
+    hit,
+    statusLabel: hit ? '触底' : '正常',
+    orderAmount: row.applyAfterSaleOrderAmount,
+    nonSalesFee: row.applyAfterNoSaleOrderAmount,
+    spentFee: row.applyAfterFeeAmount,
+    currentAllocation: row.applyThisFeeAmount,
+    qtyText: buildQtyText(row.applyAfterGenuineNum, row.applyAfterFreeNum)
   }
 }
 
 function buildMetaText(data = {}) {
-  if (data.metaText) return data.metaText
   const parts = []
   if (data.applyTotalFee != null && data.applyTotalFee !== '') {
     parts.push(`本次申请费用 ${formatNumber(data.applyTotalFee)} 元`)
-  } else if (data.meetingFee != null && data.meetingFee !== '') {
-    parts.push(`本次申请费用 ${formatNumber(data.meetingFee)} 元`)
   }
   if (data.year != null && data.year !== '') {
     parts.push(`统计周期 ${data.year} 年`)
@@ -57,8 +70,7 @@ function buildMetaText(data = {}) {
  * getProductPrice data → FloorPriceBoard
  */
 export function normalizeOverview(data = {}, options = {}) {
-  const list = data.productBasePriceList || []
-  const products = list.map(mapOverviewProduct)
+  const products = (data.productBasePriceList || []).map(mapOverviewProduct)
   const controlMethod = String(data.controlMethod || '').trim()
   const anyHit = products.some((p) => p.hit)
   const status = controlMethod
@@ -74,17 +86,16 @@ export function normalizeOverview(data = {}, options = {}) {
     statusLabel: controlMethod || DEFAULT_STATUS_LABEL[status] || '',
     products,
     metaText: buildMetaText(data),
-    footerText: data.footerText || options.footerText || DEFAULT_FOOTER_TEXT,
-    customerName: data.customerName || options.customerName || '',
-    controlMethod: data.controlMethod,
-    rawProductList: products
+    footerText: DEFAULT_FOOTER_TEXT,
+    customerName: options.customerName || data.customerName || '',
+    controlMethod: data.controlMethod
   }
 }
 
-function defaultSummaryColumns() {
+function summaryColumns() {
   return [
     { prop: 'name', label: '产品', minWidth: 110, fixed: 'left' },
-    { prop: 'currentPrice', label: '目前底价', type: 'number', digits: 0, minWidth: 88, align: 'right' },
+    { prop: 'beforePrice', label: '目前底价', type: 'number', digits: 0, minWidth: 88, align: 'right' },
     { prop: 'afterPrice', label: '申请后底价', type: 'number', digits: 0, minWidth: 96, align: 'right', bold: true },
     { prop: 'standard', label: '标准', type: 'number', digits: 0, minWidth: 80, align: 'right' },
     { prop: 'gap', label: '差距', type: 'gap', digits: 1, minWidth: 80, align: 'right' },
@@ -105,85 +116,20 @@ function defaultSummaryColumns() {
   ]
 }
 
-/**
- * 数量展示对齐原型：合计 (正品+赠品)
- * 来源：applyAfterGenuineNum（正品）+ applyAfterFreeNum（赠品）
- */
-function buildQtyText(row = {}) {
-  const genuine = row.applyAfterGenuineNum
-  const free = row.applyAfterFreeNum
-  if (genuine != null || free != null) {
-    const g = Number(genuine) || 0
-    const f = Number(free) || 0
-    return `${g + f} (${g}+${f})`
-  }
-  if (row.qtyText != null && row.qtyText !== '') return row.qtyText
-  if (row.applyCount != null && row.applyCount !== '') {
-    return String(row.applyCount)
-  }
-  return '-'
-}
-
-/** 明细汇总行：优先用概览产品；差距 / 触底由前端重算 */
-function mapSummaryRow(row = {}) {
-  const afterPrice = row.afterPrice != null ? row.afterPrice : row.applyAfterPrice
-  const standard = row.standard != null ? row.standard : row.productBasePrice
-  const { gap, gapLabel, hit } = computePriceGap(afterPrice, standard, { digits: 1 })
-
-  return {
-    name: row.name || row.productName || row.shortName,
-    currentPrice:
-      row.currentPrice != null
-        ? row.currentPrice
-        : row.beforePrice != null
-          ? row.beforePrice
-          : row.applyBeforePrice,
-    afterPrice,
-    standard,
-    gap,
-    gapLabel,
-    orderAmount: row.orderAmount != null ? row.orderAmount : row.applyAfterSaleOrderAmount,
-    nonSalesFee: row.nonSalesFee != null ? row.nonSalesFee : row.applyAfterNoSaleOrderAmount,
-    spentFee: row.spentFee != null ? row.spentFee : row.applyAfterFeeAmount,
-    currentAllocation:
-      row.currentAllocation != null ? row.currentAllocation : row.applyThisFeeAmount,
-    qtyText: buildQtyText(row),
-    hit,
-    statusLabel: hit ? '触底' : '正常'
-  }
-}
-
 function sumBy(rows, prop) {
   return (rows || []).reduce((sum, row) => sum + (Number(row[prop]) || 0), 0)
 }
 
 /** getProductPriceDetail：saleOrderList / noSaleOrderList / costList */
-function buildSectionsFromApi(data = {}) {
-  if (data.sections) return data.sections
-
+function buildSections(data = {}) {
   const saleRows = (data.saleOrderList || []).map((r) => ({
-    orderNo: r.bizOrderCode,
-    productName: r.productName,
-    productTypeName: r.productTypeName || '',
-    amount: r.amount,
-    productOrderPrice: r.productOrderPrice
-  }))
-
-  const nonSaleRows = (data.noSaleOrderList || []).map((r) => ({
-    outboundNo: r.bizOrderCode,
-    productName: r.productName,
-    qty: r.num,
-    convertedFee: r.amount
+    ...r,
+    saleTypeLabel: saleTypeLabel(r.saleType)
   }))
-
-  const expenseRows = (data.costList || []).map((r) => ({
-    orderNo: r.bizOrderCode || '',
-    typeName: r.costTypeName,
-    amount: r.costAmount,
-    current: !!r.current
-  }))
-
+  const nonSaleRows = data.noSaleOrderList || []
+  const expenseRows = data.costList || []
   const sections = []
+
   if (saleRows.length) {
     sections.push({
       key: 'salesOrders',
@@ -191,13 +137,14 @@ function buildSectionsFromApi(data = {}) {
       subtitle: '(订单价 × 数量)',
       theme: 'purple',
       columns: [
-        { prop: 'orderNo', label: '订单号', minWidth: 120 },
+        { prop: 'orderNum', label: '订单号', minWidth: 120 },
         { prop: 'productName', label: '产品', minWidth: 80 },
-        { prop: 'productTypeName', label: '类型', width: 64 },
+        { prop: 'saleTypeLabel', label: '类型', width: 64 },
+        { prop: 'qty', label: '数量', align: 'right', width: 56 },
         { prop: 'amount', label: '金额', type: 'number', digits: 0, align: 'right', width: 88 }
       ],
       rows: saleRows,
-      footer: data.saleOrderFooter || {
+      footer: {
         label: '合计',
         theme: 'purple',
         values: [`金额 ${formatNumber(sumBy(saleRows, 'amount'))}`]
@@ -211,18 +158,18 @@ function buildSectionsFromApi(data = {}) {
       subtitle: '(折算非销促进费)',
       theme: 'danger',
       columns: [
-        { prop: 'outboundNo', label: '出库单号', minWidth: 120 },
+        { prop: 'orderNum', label: '出库单号', minWidth: 120 },
         { prop: 'productName', label: '产品', minWidth: 80 },
         { prop: 'qty', label: '数量', align: 'right', width: 56 },
-        { prop: 'convertedFee', label: '折算费用', type: 'number', digits: 0, align: 'right', width: 88 }
+        { prop: 'amount', label: '折算费用', type: 'number', digits: 0, align: 'right', width: 88 }
       ],
       rows: nonSaleRows,
-      footer: data.noSaleOrderFooter || {
+      footer: {
         label: '合计',
         theme: 'danger',
         values: [
           `数量 ${formatNumber(sumBy(nonSaleRows, 'qty'))}`,
-          `折算费用 ${formatNumber(sumBy(nonSaleRows, 'convertedFee'))}`
+          `折算费用 ${formatNumber(sumBy(nonSaleRows, 'amount'))}`
         ]
       }
     })
@@ -234,15 +181,15 @@ function buildSectionsFromApi(data = {}) {
       subtitle: '(费用申请单口径)',
       theme: 'danger',
       columns: [
-        { prop: 'orderNo', label: '单号', minWidth: 100 },
-        { prop: 'typeName', label: '类型', minWidth: 80 },
-        { prop: 'amount', label: '金额', type: 'number', digits: 0, align: 'right', width: 88 }
+        { prop: 'bizOrderCode', label: '单号', minWidth: 100 },
+        { prop: 'costTypeName', label: '类型', minWidth: 80 },
+        { prop: 'costAmount', label: '金额', type: 'number', digits: 0, align: 'right', width: 88 }
       ],
       rows: expenseRows,
-      footer: data.costFooter || {
+      footer: {
         label: '合计（含本次）',
         theme: 'danger',
-        values: [formatNumber(sumBy(expenseRows, 'amount'))]
+        values: [formatNumber(sumBy(expenseRows, 'costAmount'))]
       }
     })
   }
@@ -252,28 +199,22 @@ function buildSectionsFromApi(data = {}) {
 /**
  * getProductPriceDetail data → DetailDialog
  *
- * 顶部汇总表：优先用概览 productBasePriceList / options.overviewProducts（与看板同源）
+ * 顶部汇总：概览 productBasePriceList（与看板同源）
  * 明细三区：saleOrderList / noSaleOrderList / costList
  */
 export function normalizeDetail(data = {}, options = {}) {
-  const customerName = data.customerName || options.customerName || ''
-  const title = data.title || (customerName ? `底价明细 · ${customerName}` : '底价明细')
-
-  let summaryRows = []
+  const customerName = options.customerName || data.customerName || ''
   const overviewProducts = options.overviewProducts
-  if (Array.isArray(overviewProducts) && overviewProducts.length) {
-    summaryRows = overviewProducts.map(mapSummaryRow)
-  } else if (Array.isArray(data.productBasePriceList) && data.productBasePriceList.length) {
-    summaryRows = data.productBasePriceList.map((r) => mapSummaryRow(mapOverviewProduct(r)))
-  } else if (Array.isArray(data.summaryList) && data.summaryList.length) {
-    summaryRows = data.summaryList.map(mapSummaryRow)
-  }
+  const summaryRows =
+    Array.isArray(overviewProducts) && overviewProducts.length
+      ? overviewProducts
+      : (data.productBasePriceList || []).map(mapOverviewProduct)
 
   return {
-    title,
-    summaryColumns: data.summaryColumns || defaultSummaryColumns(),
+    title: customerName ? `底价明细 · ${customerName}` : '底价明细',
+    summaryColumns: summaryColumns(),
     summaryRows,
-    sections: buildSectionsFromApi(data),
-    formulas: data.formulas || data.formulaList || DEFAULT_DETAIL_FORMULAS
+    sections: buildSections(data),
+    formulas: DEFAULT_DETAIL_FORMULAS
   }
 }