diff --git a/bms-back/bms-system/src/main/java/com/bms/price/label/LblSurchargeRules.java b/bms-back/bms-system/src/main/java/com/bms/price/label/LblSurchargeRules.java index 9f64b3b5..8b7fb7fc 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/label/LblSurchargeRules.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/label/LblSurchargeRules.java @@ -78,7 +78,7 @@ public final class LblSurchargeRules } if (name.contains("签名") || name.contains("重复") || name.contains("未预报") || name.contains("重新贴")) { - fee.setCalcRule("ITEM"); + fee.setCalcRule(MANUAL); return; } String postcodes = postcodeParam(desc); @@ -104,10 +104,10 @@ public final class LblSurchargeRules } if (blob.contains("固定收取") || "固定收取".equals(fee.getChargeTiming())) { - fee.setCalcRule("ITEM"); + fee.setCalcRule(ALWAYS); return; } - fee.setCalcRule("ITEM"); + fee.setCalcRule(MANUAL); } public static boolean matchesPostcode(String param, String postcode) diff --git a/bms-back/bms-system/src/main/java/com/bms/price/label/LblWorkbookParser.java b/bms-back/bms-system/src/main/java/com/bms/price/label/LblWorkbookParser.java index 92567cf1..a049fbc1 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/label/LblWorkbookParser.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/label/LblWorkbookParser.java @@ -99,6 +99,7 @@ public class LblWorkbookParser } attachImilePostcodes(workbook, preview.getProducts()); attachCatalogRates(workbook, preview.getProducts()); + clearImportedSurcharges(preview.getProducts()); LblZonePostcodeAttach.attach(workbook, preview.getProducts()); LblBandNormalizer.normalize(preview); return preview; @@ -202,8 +203,9 @@ public class LblWorkbookParser ? "没有工作表能对上产品字典" : "文件里没有「" + selected.trim() + "」这张工作表"); } - report(listener, 92, "正在整理附加费"); - attachWorkbookRates(workbook, preview.getProducts()); + // 打单导入暂不自动识别产品表附加费用表,由操作人手动添加 + report(listener, 92, "跳过附加费自动识别"); + clearImportedSurcharges(preview.getProducts()); LblZonePostcodeAttach.attach(workbook, preview.getProducts()); preview.setSkippedSheets(skipped); report(listener, 96, "工作表解析完成"); @@ -795,6 +797,27 @@ public class LblWorkbookParser } } + /** 清空导入过程中自动识别出的附加费,改由操作人手动添加。 */ + private static void clearImportedSurcharges(List products) + { + if (products == null || products.isEmpty()) + { + return; + } + for (LblProduct product : products) + { + if (product == null) + { + continue; + } + if (product.getSurcharges() != null) + { + product.getSurcharges().clear(); + } + product.setSurchargeCount(0); + } + } + /** * 只导入其中一张产品表时,同一本里的高风险国家表仍挂回提到它的产品。 * 整本目录解析走关联字段,不从这里再挂一次。 @@ -1208,6 +1231,11 @@ public class LblWorkbookParser row++; } readFuelMark(grid, product); + // 打单价卡导入:不落库产品表「附加费用/收费标准」等自动识别结果 + if (product.getSurcharges() != null) + { + product.getSurcharges().clear(); + } if (product.getWeightBands().isEmpty() && product.getSurcharges().isEmpty() && product.getExtraLines().isEmpty() && postcodeHits(grid) >= 5) { @@ -3474,10 +3502,14 @@ public class LblWorkbookParser return; } String rule = fee.getCalcRule() == null ? "" : fee.getCalcRule().trim(); - if (rule.isEmpty() || LblSurchargeRules.MANUAL.equalsIgnoreCase(rule) - || LblSurchargeRules.ALWAYS.equalsIgnoreCase(rule)) + // 计费条件默认每票都收;旧 ITEM/等同义也归为 ALWAYS + if (rule.isEmpty()) { - fee.setCalcRule("ITEM"); + fee.setCalcRule(LblSurchargeRules.ALWAYS); + } + else if ("ITEM".equalsIgnoreCase(rule) || "FLAT".equalsIgnoreCase(rule) || "FIXED".equalsIgnoreCase(rule)) + { + fee.setCalcRule(LblSurchargeRules.ALWAYS); } } diff --git a/bms-front/src/views/price/basic/surcharge/components/SurchargeFormDialog.vue b/bms-front/src/views/price/basic/surcharge/components/SurchargeFormDialog.vue index d3fa3ab3..fbc670a3 100644 --- a/bms-front/src/views/price/basic/surcharge/components/SurchargeFormDialog.vue +++ b/bms-front/src/views/price/basic/surcharge/components/SurchargeFormDialog.vue @@ -69,7 +69,6 @@ const schemas = computed(() => [ dict: 'bms_fee_type', span: 12, width: '100%', - disabled: true, rules: [{ required: true, message: '请选择费用类型', trigger: 'change' }] }, { diff --git a/bms-front/src/views/price/billing/bill.vue b/bms-front/src/views/price/billing/bill.vue index 447554da..d6df443f 100644 --- a/bms-front/src/views/price/billing/bill.vue +++ b/bms-front/src/views/price/billing/bill.vue @@ -21,6 +21,7 @@ :search-columns="searchColumns" :default-params="defaultParams" :query="queryList" + :auto-load="false" :search-per-row="4" row-key="billId" selection @@ -97,6 +98,45 @@ /> + + + @@ -442,29 +482,9 @@ const exportFieldRef = ref() const tableHeight = ref(480) let tableResizeObserver = null -function pad2(n) { - return String(n).padStart(2, '0') -} - -function formatDateTime(d, endOfDay) { - const y = d.getFullYear() - const m = pad2(d.getMonth() + 1) - const day = pad2(d.getDate()) - return endOfDay ? `${y}-${m}-${day} 23:59:59` : `${y}-${m}-${day} 00:00:00` -} - -/** 默认收货时间:最近两个星期(含今天共 14 天) */ -function defaultPickupDateRange() { - const end = new Date() - const start = new Date() - start.setDate(start.getDate() - 13) - return [formatDateTime(start, false), formatDateTime(end, true)] -} - const defaultParams = { orderStatuses: [3, 4, 5, 6, 7, 8, 11], - billingFailStatuses: [], - pickupDateRange: defaultPickupDateRange() + billingFailStatuses: [] } const orderStatusMap = { @@ -574,10 +594,34 @@ const cwImportProgressTitle = ref('正在导入修改计费重') const recalcDialogOpen = ref(false) const recalcMode = ref('PRODUCT') +function copyCellText(text) { + const value = String(text || '').trim() + if (!value) return + const done = () => ElMessage.success('已复制') + const fail = () => ElMessage.error('复制失败') + if (navigator.clipboard && navigator.clipboard.writeText) { + navigator.clipboard.writeText(value).then(done).catch(fail) + return + } + const input = document.createElement('textarea') + input.value = value + input.setAttribute('readonly', 'readonly') + input.style.position = 'fixed' + input.style.left = '-9999px' + document.body.appendChild(input) + input.select() + try { + document.execCommand('copy') ? done() : fail() + } catch (e) { + fail() + } + document.body.removeChild(input) +} + 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: 'orderNo', width: 190, fixed: 'left', slot: 'orderNo', showOverflowTooltip: true }, + { label: '运单号', prop: 'trackingNo', minWidth: 160, slot: 'trackingNo', showOverflowTooltip: true }, + { label: '转单号', prop: 'transferNo', minWidth: 160, slot: 'transferNo', showOverflowTooltip: true }, { label: '客户', prop: 'customerName', minWidth: 140, showOverflowTooltip: true }, { label: '客户代码', prop: 'customerCode', width: 120 }, { label: '产品', prop: 'product', minWidth: 160, slot: 'product' }, @@ -1167,6 +1211,24 @@ function refundTagType(status) {