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 |
|
YeMingfei666
|
b1d175b108
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test
|
2025-04-07 16:21:56 +08:00 |
|
YeMingfei666
|
98da99a431
|
feat: 代客下单socket消息发送增加是否发送初始化参数
|
2025-04-07 16:21:24 +08:00 |
duan
|
82319bb3cc
|
feat: proGroupVo Images 修改这两个字段为空数组时改成null
|
2025-04-07 15:33:24 +08:00 |
|
YeMingfei666
|
b74adf2010
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test
|
2025-04-07 15:11:56 +08:00 |
|
duan
|
b782394cc7
|
feat: 修改分组状态接口
|
2025-04-07 14:53:23 +08:00 |
|
YeMingfei666
|
20462cca44
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test
|
2025-04-07 14:09:32 +08:00 |
|
duan
|
49b2de07f7
|
feat: 修改提示文案
|
2025-04-07 11:34:48 +08:00 |
|
duan
|
2c53429fc3
|
feat: 修改价格、销量由低到高，
|
2025-04-07 10:24:40 +08:00 |
|
YeMingfei666
|
98c6f5175f
|
Merge branch 'multi-store' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf_test
|
2025-04-07 10:12:29 +08:00 |
|
YeMingfei666
|
1fa438b0b4
|
fix: 修复员工列表页面切换后请求传参丢失问题
|
2025-04-07 10:09:52 +08:00 |
|
GaoHao
|
164dd52afa
|
fix：增加收银中心，供应商账单，分店管理修改
|
2025-04-03 14:29:25 +08:00 |
|
YeMingfei666
|
542fc9a827
|
fix: 修改员工添加爱时默认勾选收银机权限
|
2025-04-03 09:33:17 +08:00 |
|
YeMingfei666
|
c0b0bf184a
|
fix: 修复运行时crud搜索组件警告问题
|
2025-04-03 09:32:46 +08:00 |
|
YeMingfei666
|
c1eac1a4f2
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-04-02 17:27:48 +08:00 |
|
wwz
|
18eb536ce2
|
fix: 更改订单列表的冲突
|
2025-04-02 17:22:05 +08:00 |
|
wwz
|
bf9028f927
|
feat: 添加用户登录功能
|
2025-04-02 17:19:54 +08:00 |