Commit Graph

373 Commits

Author SHA1 Message Date
liuminghui ace1eb06c0 去除计费列表的多余按钮 2026-11-09 16:15:55 +08:00
liuminghui f31bb4c54d Merge remote-tracking branch 'origin/test' into test 2026-11-09 16:00:23 +08:00
liuminghui b8b943ef51 偏远地区邮编判断调整 2026-11-09 15:58:27 +08:00
caojia f2d27f3502 🔥 移除应收毛利分析冗余展示和筛选 2026-11-09 15:58:14 +08:00
liuminghui 9220696519 Merge branch 'test' into feauture-20261104
# Conflicts:
#	bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcOrderBillMapper.java
2026-11-09 15:37:55 +08:00
wuweihua 4148c447fc 修改删除逻辑 2026-11-09 13:39:14 +08:00
caojia 7abb7fdb06 🐛 修正账单预览重量精度显示 2026-11-09 11:24:26 +08:00
caojia cd25055159 ✨ 新增应收账单毛利分析与提成管理 2026-11-09 11:24:26 +08:00
wuweihua 489f99dc7b 合并套餐 2026-11-09 11:09:51 +08:00
wuweihua af3fb0aa2f 修改去空格 2026-11-06 19:27:31 +08:00
liuminghui e4c16263ab Merge branch 'test' into feauture-20261104
# Conflicts:
#	bms-front/src/views/price/billing/components/BillDetail.vue
2026-11-06 17:30:48 +08:00
liuminghui 020aace3f9 新增提单费用和费用日志 2026-11-06 17:28:55 +08:00
wuweihua 709c315971 增加计费列表收货时间查询 2026-11-06 16:13:03 +08:00
liuminghui 6f342d424f 新增路线产品 2026-11-06 13:39:26 +08:00
wuweihua a2e986fa6a 回退代码去掉收货查询 2026-11-06 10:46:58 +08:00
wuweihua 7807534e5d 去掉监控的价格日志 2026-11-06 10:28:55 +08:00
wuweihua e415843b14 增加价格变更日志 2026-11-06 10:11:15 +08:00
wuweihua 1090d838a6 增加版本号显示 2026-11-05 18:42:27 +08:00
wuweihua 6ced4f237f 增加查看计费历史记录 2026-11-05 18:33:14 +08:00
wuweihua 87c75922aa 增加查看价格套餐历史版本的变更 2026-11-05 18:28:57 +08:00
liuminghui 270b762443 Merge branch 'test' into feauture-20261104
# Conflicts:
#	bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java
2026-11-05 16:38:53 +08:00
liuminghui 36433863af 调整订单同步查询条件 2026-11-05 16:34:33 +08:00
liuminghui fde53681d1 新建应付配置的附加费开关配置 2026-11-05 16:05:01 +08:00
wuweihua 93c081775d 优化订单数源的进度条 2026-11-05 15:58:20 +08:00
caojia 25801fe42f ✨ 按客户区域计算毛利并完善汇总展示 2026-11-05 15:43:06 +08:00
wuweihua 891fdea7d3 增加失败原因和优化进度条 2026-11-05 15:38:45 +08:00
caojia 1727386811 毛利分析的客户区域筛选。 2026-11-05 14:27:01 +08:00
wuweihua 218001e6ae 修改编辑bug 2026-11-05 13:15:51 +08:00
wuweihua 308526ecee 增加专属报价功能 2026-11-05 12:57:13 +08:00
liuminghui 116b3b74e4 应付配置文件导入保存该文件 2026-11-05 10:31:02 +08:00
wuweihua 557d43a0b8 增加进度条 2026-11-04 19:38:13 +08:00
caojia 942d5932ae ✨ 同步客户区域字段并统一字典标识 2026-11-04 18:29:47 +08:00
caojia 51a89b18e1 应付账单初始化 2026-11-04 18:01:02 +08:00
caojia 328702a618 🔥 移除毛利分析价格缺失统计 2026-11-04 15:56:11 +08:00
caojia 910a73ed28 💄 调整毛利分析筛选项位置 2026-11-04 15:47:22 +08:00
caojia 5cccbf510f ✨ 新增管理员代登录功能 2026-11-04 15:20:05 +08:00
wuweihua 1ebc86ddcf 隐藏修改计费重
(cherry picked from commit cdfc90556d)
2026-11-04 13:43:40 +08:00
caojia 8d4e3363ae ✨ 新增应收账单日期类型筛选
(cherry picked from commit 762cad2c0d)
2026-11-04 13:43:30 +08:00
caojia 7399174bd6 ✨ 支持客户账单状态多选并修正有效金额汇总 2026-11-04 11:57:09 +08:00
caojia 8208a7393f ✨ 应收账单状态筛选支持多选并默认排除作废 2026-11-04 11:19:23 +08:00
caojia 826d95d3c1 ✨ 新增应收账单生成预览结果导出 2026-11-04 10:23:33 +08:00
wuweihua 071a1d7f55 优化列表查询 2026-11-04 10:16:26 +08:00
caojia c6509fca51 ✨ 合并毛利分析客户筛选并调整订单号输入高度 2026-11-04 10:09:10 +08:00
wuweihua c87f49a14b 增加提单功能 2026-11-03 17:30:12 +08:00
caojia 86255c45f6 🔧 将前端默认请求超时调整为20秒 2026-11-03 16:46:43 +08:00
caojia 844b501686 💄 调整侧栏 Logo 显示宽度 2026-11-03 15:58:00 +08:00
caojia 229f1f9bad 💄 调整毛利分析筛选项顺序 2026-11-03 14:31:06 +08:00
caojia 3481cfd634 更换logo 2026-11-02 16:45:42 +08:00
wuweihua 7d3854bb4f 增加导入模版逻辑判断 2026-11-02 16:41:47 +08:00
wuweihua e93f0c0233 新增套餐基本信息编辑功能,包括更新套餐名称和备注,支持客户筛选和绑定客户显示。 2026-11-02 11:52:08 +08:00