 YeMingfei666
|
90d90c55b8
|
feat: 代客下单商品列表增加库存不足图标，重新排序商品不同状态展示
|
2025-04-16 17:26:31 +08:00 |
|
YeMingfei666
|
beade81a68
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test
|
2025-04-16 09:45:29 +08:00 |
|
YeMingfei666
|
b9e5713fc1
|
fix: 商品售罄，不可售，下架图标更新
|
2025-04-16 09:44:25 +08:00 |
|
YeMingfei666
|
f4b939433d
|
fix: 代码合并冲突解决
|
2025-04-16 09:28:58 +08:00 |
|
YeMingfei666
|
0563e07cdb
|
fix: 修改商品售罄判断增加判断条件（商品开启库存切且库存<=0）
|
2025-04-15 18:56:17 +08:00 |
duan
|
0a73635b78
|
fix: 合并冲突
|
2025-04-15 16:29:40 +08:00 |
|
duan
|
2b8746abe4
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-04-15 14:26:45 +08:00 |
|
duan
|
d675341444
|
fix: 修改商品分组编辑时间的问题
|
2025-04-15 14:26:35 +08:00 |
|
YeMingfei666
|
4f987ae3d2
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test
|
2025-04-15 11:13:33 +08:00 |
|
YeMingfei666
|
b477422142
|
fix: 删除历史订单时提示不可取消也获取一下历史订单数据
|
2025-04-15 11:10:02 +08:00 |
wwz
|
0d495c20ef
|
feat: 耗材报损
|
2025-04-15 10:41:12 +08:00 |
|
wwz
|
c093c618b2
|
Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into wwz
|
2025-04-12 13:45:46 +08:00 |
|
wwz
|
7fb9f30c45
|
feat: 更新通知中心1
|
2025-04-12 13:45:35 +08:00 |
GaoHao
|
901d56b648
|
Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store
|
2025-04-12 11:02:06 +08:00 |
|
GaoHao
|
05aaa2fd64
|
feat: 登录类型增加
|
2025-04-12 11:01:38 +08:00 |
|
wwz
|
2fe5e38e85
|
Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store
|
2025-04-12 11:01:21 +08:00 |
|
wwz
|
1d848b7227
|
feat: 更新通知中心
|
2025-04-12 11:01:17 +08:00 |
|
duan
|
784941f558
|
feat: 商品管理，商品规格，添加规格时，不能删除规格值
|
2025-04-12 09:55:17 +08:00 |
|
GaoHao
|
ce3b817e42
|
feat: 商品报损更新列表
|
2025-04-12 09:42:12 +08:00 |
|
GaoHao
|
b92f39fe89
|
feat: 增加权限校验
|
2025-04-11 18:26:10 +08:00 |
|
GaoHao
|
cc13161f16
|
feat: 商品同步规则优化
|
2025-04-11 17:57:35 +08:00 |
|
GaoHao
|
688f30635b
|
feat: 同步规则优化
|
2025-04-11 17:25:02 +08:00 |
|
GaoHao
|
85eba13919
|
Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store
|
2025-04-11 16:53:19 +08:00 |
|
GaoHao
|
c956972cb3
|
feat: 同步规格优化
|
2025-04-11 16:53:14 +08:00 |
|
YeMingfei666
|
583b79bc8f
|
fix: 代码合并
|
2025-04-11 16:51:59 +08:00 |
|
YeMingfei666
|
53fdd79a2e
|
fix: crud组件列表操作栏和列表顶部操作栏增加hidden隐藏字段
|
2025-04-11 16:48:06 +08:00 |
|
GaoHao
|
6df2050d2b
|
Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store
|
2025-04-11 15:50:32 +08:00 |
|
GaoHao
|
331f438f99
|
feat: 同步规格优化
|
2025-04-11 15:50:15 +08:00 |
|
wwz
|
ef600c9e3c
|
Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into wwz
|
2025-04-11 15:47:01 +08:00 |
|
wwz
|
9a0170471a
|
feat: 角色级别
|
2025-04-11 15:46:48 +08:00 |
|
GaoHao
|
8fd3565bac
|
feat: 增加同步规则
|
2025-04-11 14:57:26 +08:00 |
|
GaoHao
|
04ae1c342b
|
feat: 销售统计分类筛选隐藏，商品同步优化
|
2025-04-11 11:34:10 +08:00 |
|
YeMingfei666
|
273684678b
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test
|
2025-04-11 09:57:32 +08:00 |
|
YeMingfei666
|
fdc1933bbe
|
fix: 修复时间crud搜索时间筛选类型，未配置showFastEdit为true时不显示问题
|
2025-04-11 09:56:42 +08:00 |
|
GaoHao
|
299c6327b7
|
Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store
|
2025-04-11 09:47:22 +08:00 |
|
GaoHao
|
cf626cb862
|
feat: 分店列表筛选name名称字段修改
|
2025-04-11 09:47:00 +08:00 |
|
wwz
|
bfca8f4013
|
Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store
|
2025-04-11 09:37:31 +08:00 |
|
wwz
|
682fe03165
|
feat: 更改跳转
|
2025-04-11 09:37:28 +08:00 |
|
GaoHao
|
8290462eda
|
Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store
|
2025-04-10 18:27:26 +08:00 |
|
GaoHao
|
6c72027a86
|
feat: 商品同步增加
|
2025-04-10 18:27:09 +08:00 |
|
wwz
|
462f75ce3e
|
Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into wwz
|
2025-04-10 17:51:47 +08:00 |
|
wwz
|
6cb1968b80
|
feat: 进销存更改
|
2025-04-10 17:51:14 +08:00 |
|
GaoHao
|
c3c9437939
|
Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store
|
2025-04-10 17:39:48 +08:00 |
|
GaoHao
|
61bd37de32
|
feat: 供应商账单付款回显修改
|
2025-04-10 17:39:34 +08:00 |
|
YeMingfei666
|
8126907093
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test
|
2025-04-10 16:42:58 +08:00 |
|
YeMingfei666
|
63aec07617
|
feat: 增加decimal数字计算库，修复出入库单位切换价格展示问题
|
2025-04-10 16:42:18 +08:00 |
|
YeMingfei666
|
34ab5a9643
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web into multi-store
|
2025-04-10 16:02:25 +08:00 |
|
YeMingfei666
|
8746ebd8c3
|
fix: 修复耗材添加关闭后部分数据未重置引起的再次添加提示报错问题
|
2025-04-10 16:01:32 +08:00 |
|
GaoHao
|
dbf8f8f05d
|
feat: 供应商账单默认值显示处理
|
2025-04-10 14:42:18 +08:00 |
|
wwz
|
2922de551a
|
Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into wwz
|
2025-04-10 14:29:22 +08:00 |
|
wwz
|
5b30b23ad3
|
feat: 通知中心
|
2025-04-10 14:29:10 +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 |
|
YeMingfei666
|
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 |
|
YeMingfei666
|
26b569a6a1
|
fix: 修复代客下单在已有历史订单且不在展示订单信息时，更多支付点击提示购物车为空问题
|
2025-04-09 18:21:03 +08:00 |
|
YeMingfei666
|
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 |
|
YeMingfei666
|
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 |
|
YeMingfei666
|
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 |
|
YeMingfei666
|
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 |
|
YeMingfei666
|
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 |
|
YeMingfei666
|
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 |
|
YeMingfei666
|
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 |
|
YeMingfei666
|
c9c584fd7c
|
feat: 订单详情增加退款方式展示
|
2025-04-08 09:40:24 +08:00 |
|
YeMingfei666
|
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 |
|
YeMingfei666
|
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 |
|
YeMingfei666
|
2484937255
|
fix: 修复商品列表表单展开行符号未居中对齐问题
|
2025-04-07 18:23:26 +08:00 |
|
wwz
|
95f22ede1d
|
feat: 耗材补充修改
|
2025-04-07 18:13:52 +08:00 |
|
YeMingfei666
|
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 |
|
YeMingfei666
|
ac3d61c7c6
|
feat: crud组件优化：pageContent组件内的table表格thead改为滚到页面顶自动吸附
|
2025-04-07 17:17:47 +08:00 |
|
YeMingfei666
|
3ff642b98a
|
fix: 修复布局组件返回顶部图标未居中问题
|
2025-04-07 16:57:29 +08:00 |