Commit Graph

520 Commits

Author SHA1 Message Date
caojia a4bda4d636 Merge branch 'test' 2026-11-04 18:32:28 +08:00
caojia 942d5932ae ✨ 同步客户区域字段并统一字典标识 2026-11-04 18:29:47 +08:00
caojia 846a41c6df 🐛 保留毛利报表暂停功能校验 2026-11-04 16:04:38 +08:00
caojia 04be15deab 🐛 修复毛利报表查询参数编译错误 2026-11-04 16:02:56 +08:00
caojia 328702a618 🔥 移除毛利分析价格缺失统计 2026-11-04 15:56:11 +08:00
caojia 910a73ed28 💄 调整毛利分析筛选项位置 2026-11-04 15:47:22 +08:00
caojia 00e36cdf3f Merge branch 'test' 2026-11-04 15:20:56 +08:00
caojia 5cccbf510f ✨ 新增管理员代登录功能 2026-11-04 15:20:05 +08:00
caojia 93da04fe5e ✨ 应收账单导出时间按筛选类型切换 2026-11-04 14:26:01 +08:00
caojia 8eb5dca4f0 Merge branch 'test' 2026-11-04 13:45:59 +08:00
wuweihua 1ebc86ddcf 隐藏修改计费重
(cherry picked from commit cdfc90556d)
2026-11-04 13:43:40 +08:00
caojia 6b111088c8 🐛 按当天截止时间筛选账单订单
(cherry picked from commit 1f0d757e29)
2026-11-04 13:43:31 +08:00
caojia 8d4e3363ae ✨ 新增应收账单日期类型筛选
(cherry picked from commit 762cad2c0d)
2026-11-04 13:43:30 +08:00
caojia b671ebefae Merge branch 'test' 2026-11-04 13:40:30 +08:00
caojia 7399174bd6 ✨ 支持客户账单状态多选并修正有效金额汇总 2026-11-04 11:57:09 +08:00
caojia 8208a7393f ✨ 应收账单状态筛选支持多选并默认排除作废 2026-11-04 11:19:23 +08:00
caojia fb5d6d46a8 Merge branch 'test' 2026-11-04 10:27:30 +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 039c0d4858 Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-11-03 18:16:08 +08:00
wuweihua f0012ac563 计费重覆盖 2026-11-03 18:13:52 +08:00
wuweihua 98ae525403 增加提单功能 2026-11-03 17:50:35 +08:00
caojia 43299e5329 Merge branch 'test' 2026-11-03 17:39:19 +08:00
wuweihua c87f49a14b 增加提单功能 2026-11-03 17:30:12 +08:00
caojia 6b78e13e5c ✨ 限制应收账单仅拉取指定上游订单状态 2026-11-03 16:55:15 +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 42d12a3fa3 🔥 移除毛利分析数据范围过滤 2026-11-03 14:19:20 +08:00
caojia 3fe34c471c Merge branch 'test' 2026-11-02 16:54:26 +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
liuminghui 1b1b934d87 供应商路由调整 2026-11-02 10:41:20 +08:00
caojia 134855fc31 Merge branch 'test' 2026-11-02 10:07:19 +08:00
wuweihua 1ba5822a86 修改报错 2026-11-02 10:05:57 +08:00
caojia 01cee41301 Merge branch 'test' 2026-11-02 09:17:44 +08:00
wuweihua 17e80b3a18 增加最计费重的计费逻辑 2026-11-02 09:13:33 +08:00
wuweihua 9d4dbdcbe6 增加产品价编辑 2026-11-02 09:00:38 +08:00
liuminghui d185995dc7 客户管理新增区域类型属性 2026-10-30 18:00:20 +08:00
wuweihua bc33e11437 增加对外代码搜索 2026-10-30 17:45:37 +08:00
caojia 1f0d757e29 🐛 按当天截止时间筛选账单订单 2026-10-30 15:55:12 +08:00
caojia 762cad2c0d ✨ 新增应收账单日期类型筛选 2026-10-30 15:23:20 +08:00
wuweihua 8ed97fed4a 增加批量绑定 2026-10-30 11:07:51 +08:00
wuweihua 7ef3f40a4f Merge branch 'test' of https://git.lionquexpress.com/wuweihua/BMS
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2026-10-29 18:19:48 +08:00
wuweihua 6b10a41b9d 拉取上游数据记录es里面 2026-10-29 18:17:47 +08:00
caojia 58e41b669d Merge branch 'test' 2026-10-29 16:59:06 +08:00
caojia 02c49e3efe ✨ 新增应收账单按角色和客户归属的行级数据权限 2026-10-29 16:42:28 +08:00
liuminghui b091d47f64 新增渠道管理 2026-10-29 16:30:15 +08:00