 YeMingfei666
|
892434e353
|
feat: 订单管理列表搜索增加时间范围搜索
|
2025-03-31 10:04:00 +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 |
|
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
|
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
|
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 |
|
YeMingfei666
|
31bc2e84f2
|
fix: 剔除耗材统计无用传参
|
2025-03-20 16:03:02 +08:00 |
|
YeMingfei666
|
552e3f20a0
|
fix: 店铺列表增加单独激活码弹窗，修改耗材列表搜索时间筛选条件传参
|
2025-03-20 15:38:47 +08:00 |
|
YeMingfei666
|
c73a838e8c
|
fix: 修复支付成功后未成功发送清空购物车消息
|
2025-03-20 15:09:00 +08:00 |
|
YeMingfei666
|
c4a62b4549
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-03-20 14:47:06 +08:00 |
|
YeMingfei666
|
546b3f4303
|
fix: 限制挂账管理编辑挂账人禁止修改挂账方式
|
2025-03-20 14:46:53 +08:00 |
|
duan
|
112c0dfb8c
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-20 14:07:37 +08:00 |
|
duan
|
3e3d525676
|
feat: 系统用户功能完善
|
2025-03-20 14:07:29 +08:00 |
|
YeMingfei666
|
30f10bed93
|
fix: 增加积分配置1元至少等于1积分,修复跳转到广告页面后其他页面全部为空，调整crud表单样式兼容问题
|
2025-03-20 10:53:58 +08:00 |
|
YeMingfei666
|
b76e67c207
|
fix: 修改桌台统计跳转订单页面展示效果，增加员工修改密码弹窗，修改店铺添加激活码为非必填
|
2025-03-20 10:06:38 +08:00 |
|
YeMingfei666
|
d48199b991
|
fix: 修改桌台统计跳转订单页面传参，订单页面查询查询台桌改为tableCode
|
2025-03-20 09:16:06 +08:00 |
|
YeMingfei666
|
956a8e8aa5
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-03-19 16:51:11 +08:00 |
|
YeMingfei666
|
35ad3050ec
|
fix: 新增会员数字段名修改
|
2025-03-19 16:51:00 +08:00 |
|
duan
|
870785ddcd
|
Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-19 16:29:59 +08:00 |
|
duan
|
bc75b5f5dd
|
feat: 系统用户部分功能完成
|
2025-03-19 16:29:32 +08:00 |
|
YeMingfei666
|
4583b7c16e
|
fix: 修改订单列表页面搜索文字
|
2025-03-19 16:15:10 +08:00 |
|
YeMingfei666
|
c1e4fb9875
|
fix: 修复桌台统计跳转订单功能
|
2025-03-19 16:03:11 +08:00 |
|
YeMingfei666
|
c67424fe2c
|
feat: 增加桌台统计跳转订单页面传参
|
2025-03-19 15:53:09 +08:00 |
|
YeMingfei666
|
47442a52fb
|
fix: 店铺安全设置校验安全密码保存时剔除无用参数
|
2025-03-19 15:17:55 +08:00 |
|
YeMingfei666
|
cae90224a8
|
fix: 修复代客下单积分使用类型切换引起的无法选择问题
|
2025-03-19 15:11:55 +08:00 |
|
YeMingfei666
|
eb93ad889a
|
fix: 修复挂账按订单支付还款传参问题，增加修改密功能
|
2025-03-19 14:56:20 +08:00 |
|
YeMingfei666
|
706ce14395
|
fix: 编辑员工去除密码修改
|
2025-03-19 14:15:43 +08:00 |
|
YeMingfei666
|
35cfc10e81
|
fix: 修改获取订单状态接口,修改数据统计充值统计增加充值退款金额
|
2025-03-19 11:33:34 +08:00 |
|
YeMingfei666
|
4a4a9b7ed6
|
fix: 修复数据统计营业实收金额计算公司
|
2025-03-19 11:17:15 +08:00 |
|
YeMingfei666
|
586e1d5d15
|
fix: 修复销售统计列表销售金额，退款金额未展示问题
|
2025-03-19 10:11:24 +08:00 |
|
YeMingfei666
|
906b949879
|
fix: 修复销售统计分页问题
|
2025-03-19 10:04:38 +08:00 |
|
YeMingfei666
|
5bf49cb29a
|
fix: 优化称重商品的打包状态编辑
|
2025-03-18 18:26:44 +08:00 |
|
YeMingfei666
|
f759cd8aa6
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-18 18:21:13 +08:00 |
|
YeMingfei666
|
2837711105
|
fix: 修复称重商品切换就餐模式时打包数量展示不对问题
|
2025-03-18 18:18:42 +08:00 |
|
duan
|
b51ec0fd05
|
Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-18 17:59:07 +08:00 |
|
duan
|
71e35528c8
|
feat: 售罄字段修改
|
2025-03-18 17:43:40 +08:00 |
|
YeMingfei666
|
8bcc5b8c71
|
fix: 代客下单和台桌管理联动优化
|
2025-03-18 17:25:57 +08:00 |
|
YeMingfei666
|
2de28da055
|
fix: 代客下单优化店铺信息为空时就餐类型联动效果
|
2025-03-18 17:15:48 +08:00 |
|
YeMingfei666
|
75378c9371
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-03-18 16:59:28 +08:00 |
|
YeMingfei666
|
4e835eb43d
|
fix: 修复历史订单切换就餐模式，修改代客下单就餐类型根据店铺信息做限制，修改店铺配置至少勾选一种就餐模式
|
2025-03-18 16:59:06 +08:00 |
|
YeMingfei666
|
c722cd4c79
|
fix: 修改代客下单添加时增加商品类型，修改激活码列表信息展示
|
2025-03-18 16:14:22 +08:00 |
|
duan
|
2058acc254
|
Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-18 16:06:32 +08:00 |
|
duan
|
188aad8035
|
feat: 分组追加商品修复
|
2025-03-18 16:04:30 +08:00 |
|
YeMingfei666
|
7ec4fe0c83
|
fix: 修改支付方式挂单文字改为挂账
|
2025-03-18 14:28:11 +08:00 |
|
YeMingfei666
|
85c22d506e
|
fix: 修复自取模式下添加可选套餐默认打包数量为0问题
|
2025-03-18 14:25:37 +08:00 |
|
YeMingfei666
|
53529df072
|
fix: 修复代客下单初始化时init传参问题
|
2025-03-18 14:10:36 +08:00 |
|
YeMingfei666
|
88cef08f87
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-03-18 14:03:19 +08:00 |
|
YeMingfei666
|
735b325fd3
|
feat: 增加代课下单收到商品信息变动时重新获取商品信息初始化购物车数据
|
2025-03-18 14:03:07 +08:00 |
|
duan
|
0cb12ccc5a
|
Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-18 11:50:32 +08:00 |
|
duan
|
14d3ffb4cf
|
feat: 商品列表跳转到订单列表
|
2025-03-18 11:49:59 +08:00 |
|
YeMingfei666
|
cefabae276
|
fix: 修改优化转桌功能
|
2025-03-18 10:20:42 +08:00 |
|
YeMingfei666
|
90dc61dee8
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-03-18 09:24:14 +08:00 |
|
YeMingfei666
|
259d6db77f
|
fix: 修改代客下单逻辑，收到清空购物车消息和切换台桌时获取该台桌订单
|
2025-03-18 09:22:55 +08:00 |
|
duan
|
b7195ce21e
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-17 18:28:21 +08:00 |
|
duan
|
c410e752dd
|
feat: 商品列表修改退回退款到表格
|
2025-03-17 18:28:14 +08:00 |
|
YeMingfei666
|
df66a131bf
|
Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-17 18:11:27 +08:00 |
|
YeMingfei666
|
61607fcc44
|
fix: 修改积分相关接口传参userId改为shopUserId，修改耗材出入库展示，修改点歌页面跳转
|
2025-03-17 18:07:55 +08:00 |
|
duan
|
d89eda96a9
|
Merge branch 'dwb' of https://e.coding.net/g-cphe0354/cashier/cashier-web
|
2025-03-17 18:07:27 +08:00 |
|
duan
|
5cb3378217
|
feat: 商品列表，绑定耗材
|
2025-03-17 18:06:57 +08:00 |
|
duan
|
e97424262b
|
feat: 商品列表-报损-售罄-库存预警
|
2025-03-17 16:06:51 +08:00 |
|
YeMingfei666
|
2850cb94d4
|
fix: 修改代客下单仅下单后不展示历史下单数据
|
2025-03-17 14:35:52 +08:00 |
|
YeMingfei666
|
09aec0e733
|
Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into ymf
|
2025-03-17 14:19:38 +08:00 |