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 |
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 |
GaoHao
|
11b297baa5
|
新需求修改:菜单调整,分店下拉增加,分店管理增加,增加店铺修改
|
2025-04-02 17:14:55 +08:00 |
YeMingfei666
|
3a1ffa13b2
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-04-02 17:13:42 +08:00 |
YeMingfei666
|
56dd58f52a
|
fix: 修复叫号基本设置选择图片后再添加卓型图片被置空问题
|
2025-04-02 17:13:31 +08:00 |
GaoHao
|
b109e474d3
|
Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-04-02 16:48:26 +08:00 |
duan
|
f337d7841f
|
feat: 商品规格箭头左对齐
|
2025-04-02 16:35:01 +08:00 |
YeMingfei666
|
7d7d95f0ad
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-04-02 16:18:33 +08:00 |
YeMingfei666
|
2d92fca5a5
|
feat: 员工列表页面添加编辑增加收音机权限设置
|
2025-04-02 16:18:19 +08:00 |
YeMingfei666
|
dab029cd23
|
fix: 修改订单列表页面展示效果,修改skuName字段
|
2025-04-02 16:17:05 +08:00 |
YeMingfei666
|
ba731155ae
|
feat: 增加收银机页面权限设置接口
|
2025-04-02 16:15:32 +08:00 |
YeMingfei666
|
a67ee99ad9
|
fix: 修复添加员工权限列表上传为空数组问题
|
2025-04-02 15:12:02 +08:00 |
GaoHao
|
d0a757957d
|
1
|
2025-04-02 13:40:02 +08:00 |
GaoHao
|
13a39e1b13
|
导航修改
|
2025-04-02 11:49:08 +08:00 |
GaoHao
|
52499c76f0
|
Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-04-02 10:48:24 +08:00 |
GaoHao
|
e4d162194c
|
销售统计悬浮数据显示调整
|
2025-04-02 10:47:54 +08:00 |
YeMingfei666
|
1127d7503a
|
fix: 修改销售统计时间传参格式只传年月日
|
2025-04-02 10:21:02 +08:00 |
YeMingfei666
|
b0dc1238db
|
feat: 修改请求超时为3分钟
|
2025-04-02 10:17:50 +08:00 |
YeMingfei666
|
4ca74c9cbf
|
fix: 修改挂账明细管理跳转方式
|
2025-04-02 09:44:57 +08:00 |
YeMingfei666
|
f233fbb437
|
feat: 修改crud组件默认开启自动触发搜索
|
2025-04-01 17:40:49 +08:00 |
YeMingfei666
|
c779daebbc
|
fix: crud组件代码优化自动触发搜索逻辑,只有非input输入框值变化时触发
|
2025-04-01 17:29:44 +08:00 |
YeMingfei666
|
28fbbdff13
|
feat: 订单列表修改查询条件改变自动查询
|
2025-04-01 16:35:15 +08:00 |
YeMingfei666
|
58f07cbc78
|
fix: crud组件代码增加控件是否监听到查询条件改变时自动触发搜索事件
|
2025-04-01 16:34:38 +08:00 |
YeMingfei666
|
1b2e99522e
|
fix: 修复会员支付是否使用会员价判断问题
|
2025-04-01 16:24:37 +08:00 |
YeMingfei666
|
4764149cbe
|
fix: 修复销售统计时间筛选不能跨年统计问题
|
2025-04-01 16:24:09 +08:00 |
YeMingfei666
|
1a67431e2d
|
fix: 修复销售统计自定义筛选时间点击无反应问题
|
2025-04-01 15:54:20 +08:00 |
YeMingfei666
|
dec6d986e0
|
fix: 修复订单列表重置未重置时间问题
|
2025-04-01 14:45:59 +08:00 |
YeMingfei666
|
52fb5b9fb5
|
feat: 代客下单增加删除历史订单同步
|
2025-04-01 13:25:24 +08:00 |
YeMingfei666
|
8aef2b3bc6
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-03-31 16:29:06 +08:00 |
YeMingfei666
|
ad2ce6cad7
|
fix: 修改绑定桌码根据环境变量配置是否显示
|
2025-03-31 16:28:56 +08:00 |
YeMingfei666
|
db5eee31a1
|
fix: 绑定桌码文字修改
|
2025-03-31 16:12:03 +08:00 |
YeMingfei666
|
15c0a2104e
|
fix: 代客下单优化,历史订单关闭或者取消后置空历史订单数据,关闭结账页面展示点菜页面
|
2025-03-31 16:02:58 +08:00 |
YeMingfei666
|
3af175c506
|
feat: 台桌列表增加绑定桌码功能(暂时隐藏)
|
2025-03-31 15:57:19 +08:00 |
YeMingfei666
|
274833d548
|
feat: 增加历史订单清空、删除功能
|
2025-03-31 15:28:19 +08:00 |
duan
|
2796b553a7
|
feat: 修改图片上传功能
|
2025-03-31 10:57:25 +08:00 |
YeMingfei666
|
fcd8dd90be
|
fix: 数据统计,销售统计搜索框样式调整
|
2025-03-31 10:13:20 +08:00 |
YeMingfei666
|
892434e353
|
feat: 订单管理列表搜索增加时间范围搜索
|
2025-03-31 10:04:00 +08:00 |
duan
|
849f7a6fba
|
feat: 图片上传优化
|
2025-03-29 17:14:55 +08:00 |
duan
|
fb4da34544
|
feat: 打印机为空的时候,修改字符有问题
|
2025-03-29 09:29:59 +08:00 |
YeMingfei666
|
ce91de1ff2
|
fix: 调整代客下单商品分类样式
|
2025-03-27 17:09:02 +08:00 |
YeMingfei666
|
9e78613d0b
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-03-27 15:18:55 +08:00 |
YeMingfei666
|
11d0d90702
|
fix: 霸王餐修改充值设置最少2倍金额
|
2025-03-27 15:18:11 +08:00 |
duan
|
f4562e9df0
|
feat: 修改商品修改新增时间
|
2025-03-27 14:16:14 +08:00 |
YeMingfei666
|
059a40dd67
|
fix: 代客下单商品列表接口修改,增加售罄,下架,不可售状态标识
|
2025-03-27 13:36:07 +08:00 |
YeMingfei666
|
0b5737116e
|
fix: 修改代客下单列表商品列表接口
|
2025-03-27 10:56:36 +08:00 |
YeMingfei666
|
33da9d8af0
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-26 13:46:28 +08:00 |
YeMingfei666
|
26c10de00b
|
fix: 代客下单修改未找到的商品不再删除
|
2025-03-26 13:42:20 +08:00 |
duan
|
fd65354270
|
Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-26 13:32:47 +08:00 |
duan
|
0f9d680833
|
feat: 添加区分本地或网络打印机
|
2025-03-26 13:31:25 +08:00 |
YeMingfei666
|
3b4d140134
|
fix: 跳转订单页面传参优化
|
2025-03-26 10:49:32 +08:00 |
YeMingfei666
|
b7845ea331
|
fix: 订单列表展示修改、优化修复页面进入时请求两次
|
2025-03-26 10:45:55 +08:00 |
YeMingfei666
|
7830983824
|
fix: 代客下单优化购物车套餐商品
|
2025-03-26 10:23:17 +08:00 |
YeMingfei666
|
79fde1c683
|
fix: 修复订单管理平台类型未显示问题
|
2025-03-26 10:11:19 +08:00 |
YeMingfei666
|
0877533632
|
fix: 修复优惠券选择商品分页问题
|
2025-03-26 02:18:25 +08:00 |
YeMingfei666
|
586361cc4f
|
fix: 修改登录成功跳转首页
|
2025-03-26 02:04:48 +08:00 |
YeMingfei666
|
3b7927503d
|
fix: 修改订单列表查询支付方式列表数据
|
2025-03-26 02:00:28 +08:00 |
YeMingfei666
|
4570a543ed
|
fix: 登录失败刷新验证码
|
2025-03-26 01:37:31 +08:00 |
YeMingfei666
|
10a366d3da
|
fix: 修改心跳回执传参位置
|
2025-03-25 22:10:28 +08:00 |
YeMingfei666
|
edfa018921
|
fix: websocket心跳增加平台标识
|
2025-03-25 21:38:19 +08:00 |
YeMingfei666
|
6006278630
|
fix: 代客下单优化
|
2025-03-25 21:21:43 +08:00 |
duan
|
88e26bb9d4
|
feat: 打印机、商品列表的问题修改
|
2025-03-25 15:40:11 +08:00 |
YeMingfei666
|
48a4424d3f
|
fix: element-plus部分代码警告优化
|
2025-03-25 15:06:49 +08:00 |
YeMingfei666
|
6d68c17970
|
fix: 代客下单修复桌台跳转到代客下单页面刷新台桌问题,打包费计算问题
|
2025-03-25 14:47:19 +08:00 |
YeMingfei666
|
ce9ea228f1
|
fix: 代客下单优化称重商品弹窗、商品列表过滤优惠券商品,部分支付按钮禁止状态优化
|
2025-03-25 13:22:16 +08:00 |
YeMingfei666
|
efe1adfb44
|
fix: 修改历史订单售价会员价采用订单里的数据,修改库存数量展示
|
2025-03-25 10:10:15 +08:00 |
YeMingfei666
|
28d0e616a4
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-03-25 00:51:13 +08:00 |
YeMingfei666
|
87f000299c
|
fix: 修复店铺用户列表未展示统计数据和跳转充值记录,增加充值记录页面
|
2025-03-25 00:51:02 +08:00 |
duan
|
ccab0a33ee
|
feat: 分组编辑商品数据去重
|
2025-03-25 00:20:17 +08:00 |
YeMingfei666
|
f085516959
|
fix: 优化代客下单因为图片过大引起的滚动卡顿,解决方案(图片增加尺寸限制)
|
2025-03-24 23:30:09 +08:00 |
duan
|
ec7292cf4c
|
feat: 修改商品套餐高亮、商品几选几效验
|
2025-03-24 21:55:26 +08:00 |
YeMingfei666
|
d4a64f1a0e
|
fix: 修改支付方式配置,取消微信、支付宝,增加扫码支付
|
2025-03-24 21:40:50 +08:00 |
YeMingfei666
|
90e4ffdb9f
|
feat: 支付方式去除自定义
|
2025-03-24 21:22:29 +08:00 |
YeMingfei666
|
d84b600f4e
|
fix: 修复角色菜单父子默认联动默认选中引起的展示问题,修改.gitignore配置文件
|
2025-03-24 21:13:31 +08:00 |
YeMingfei666
|
b45ec5e042
|
fix: 订单详情展示更多信息
|
2025-03-21 18:12:29 +08:00 |
YeMingfei666
|
6368927de3
|
fix: 增加订单支付各种优惠时的其他优惠重置
|
2025-03-21 17:32:46 +08:00 |
YeMingfei666
|
9609bda23c
|
fix: 优化商品券选择展示
|
2025-03-21 16:54:05 +08:00 |
YeMingfei666
|
d097d73f12
|
fix: 代客下单修复先打折后选会员导致结算价格为负数问题。订单退款增加安全密码校验,代客下单修复选择用户手机号未展示问题
|
2025-03-21 16:01:07 +08:00 |
YeMingfei666
|
5891fe6e1f
|
fix: 不选择用户后清除优惠券,修改优惠券可用数量计算公式为数量-退菜-退款
|
2025-03-21 15:07:18 +08:00 |
YeMingfei666
|
c011ae22e4
|
fix: 耗材单位换算计算统一为第一单位大,第二单位*换算值=第一单位
|
2025-03-21 14:19:19 +08:00 |
YeMingfei666
|
61bdfb924b
|
fix: 耗材出入库计算库存代码优化
|
2025-03-21 13:27:01 +08:00 |
YeMingfei666
|
4ab0efd93a
|
fix: 代码合并,耗材出入库代码修改
|
2025-03-21 11:32:10 +08:00 |
YeMingfei666
|
fddbbf44cf
|
fix: 修改耗材出入库计算逻辑,去除部分无用代码
|
2025-03-21 11:29:05 +08:00 |
duan
|
34e1b48489
|
feat: 修改商品列表保存字符串判断问题
|
2025-03-21 11:01:51 +08:00 |
duan
|
84cea59064
|
feat: 添加修改库存功能
|
2025-03-21 10:17:25 +08:00 |
duan
|
c40281902a
|
feat: 隐藏多规格退款退回库存,修改所有page为1
|
2025-03-21 09:35:32 +08:00 |
YeMingfei666
|
812b01391b
|
fix: 限制积分基本设置最大100,最小0
|
2025-03-20 17:35:42 +08:00 |