Commit Graph

439 Commits

Author SHA1 Message Date
GaoHao
dbf8f8f05d feat: 供应商账单默认值显示处理 2025-04-10 14:42:18 +08:00
GaoHao
dedaaac375 feat: 销售统计分类获取优化 2025-04-10 11:00:58 +08:00
GaoHao
eb6dffb3d2 feat:数据统计自定义增加默认时间 2025-04-10 10:38:39 +08:00
GaoHao
7df5163ee0 Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store 2025-04-10 09:16:12 +08:00
GaoHao
dce9fa7cdb feat: 筛选时间条件增加时分秒 2025-04-09 18:27:35 +08:00
787f6606e4 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test 2025-04-09 18:21:30 +08:00
26b569a6a1 fix: 修复代客下单在已有历史订单且不在展示订单信息时,更多支付点击提示购物车为空问题 2025-04-09 18:21:03 +08:00
49d43dc22c Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test 2025-04-09 18:12:24 +08:00
29ab771472 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test 2025-04-09 18:12:13 +08:00
9a7384937f fix: 优化修复代客下单先付模式下点击微信/支付宝按钮弹窗一次后再点击无效 2025-04-09 18:11:47 +08:00
GaoHao
d4c4989b26 feat: 筛选时间条件增加时分秒 2025-04-09 18:02:02 +08:00
GaoHao
d3e18f3a8c Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store 2025-04-09 17:33:05 +08:00
GaoHao
f1e85eeb27 feat:分店筛选显示条件增加 2025-04-09 17:32:50 +08:00
fd3167d325 fix: 更新readme文档测试服务器相关文档 2025-04-09 17:17:21 +08:00
5bd2172ba2 fix: 更新readme文档,删除不用的测试服务器,测试服务器改为本地linux服务器 2025-04-09 17:14:46 +08:00
78806f627e Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test 2025-04-09 17:08:32 +08:00
cb6fa28e2a fix: 修复临时菜添加成功未加入购物车 2025-04-09 17:08:05 +08:00
GaoHao
448261e7b2 feat:桌台统计增加分店条件 2025-04-09 16:53:51 +08:00
GaoHao
2b09e4df2c Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store 2025-04-09 16:43:57 +08:00
GaoHao
3dc62a6802 fix:分店筛选增加 2025-04-09 16:43:18 +08:00
wwz
c5f75a20af Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into wwz 2025-04-09 16:26:21 +08:00
wwz
0b81b8355e feat: 数据更改 2025-04-09 16:26:02 +08:00
GaoHao
cb1f4b3a8c fix:店铺列表添加修改 2025-04-09 16:13:26 +08:00
GaoHao
2546bdbd2d fix:添加店铺主店列表修改 2025-04-09 15:15:41 +08:00
GaoHao
f8c3c41247 fix:添加店铺主店列表修改 2025-04-09 15:08:43 +08:00
GaoHao
373fd88226 fix: 多门店切换修改 2025-04-09 10:46:56 +08:00
GaoHao
1cc9949cd8 Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store 2025-04-08 17:49:23 +08:00
GaoHao
7ccd96a775 多门店切换修改 2025-04-08 17:49:08 +08:00
wwz
d6a576f729 Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into wwz 2025-04-08 17:41:44 +08:00
wwz
86f68a5cdf feat: 进销存更新 2025-04-08 17:41:30 +08:00
GaoHao
250f42ec01 fix: 分店同步更新 2025-04-08 16:15:46 +08:00
GaoHao
684a83b0db fix: 分店同步更新 2025-04-08 16:13:33 +08:00
GaoHao
6b5290d355 Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into gaohao 2025-04-08 16:06:08 +08:00
GaoHao
acc76c2faf fix: 分店显示修改 2025-04-08 16:05:00 +08:00
GaoHao
920f686897 Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store 2025-04-08 14:50:16 +08:00
GaoHao
2de1576f76 fix:店铺列表分店相关修改 2025-04-08 14:49:59 +08:00
wwz
6fb991ff32 Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into wwz 2025-04-08 11:26:41 +08:00
367efae393 Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test 2025-04-08 11:20:22 +08:00
wwz
5809e0ec0b feat: 解决冲突 2025-04-08 11:19:36 +08:00
GaoHao
143de9fa21 Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store 2025-04-08 11:19:31 +08:00
GaoHao
a2361b39c4 fix:供应商账单测试 2025-04-08 11:18:37 +08:00
wwz
d34a8c71e9 feat: 通知管理 2025-04-08 11:18:36 +08:00
8b84eee933 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test 2025-04-08 09:40:57 +08:00
c9c584fd7c feat: 订单详情增加退款方式展示 2025-04-08 09:40:24 +08:00
62076b4472 feat: 代码合并 2025-04-07 18:27:14 +08:00
wwz
7b46671373 Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store 2025-04-07 18:25:18 +08:00
035aa6bc21 Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test 2025-04-07 18:24:03 +08:00
2484937255 fix: 修复商品列表表单展开行符号未居中对齐问题 2025-04-07 18:23:26 +08:00
wwz
95f22ede1d feat: 耗材补充修改 2025-04-07 18:13:52 +08:00
4be210727c Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test 2025-04-07 17:21:08 +08:00