Commit Graph

668 Commits

Author SHA1 Message Date
516ce90284 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-25 18:21:21 +08:00
c6fed2af32 增加台桌搜索功能 2024-10-25 18:03:00 +08:00
df9a49813a 代客下单无桌台下单隐藏仅下单按钮按照外带模式处理 2024-10-25 17:21:22 +08:00
duan
863630b4c2 打印机部分备注修改 2024-10-25 17:01:33 +08:00
gyq
d87b37fcea Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dev 2024-10-25 16:04:50 +08:00
gyq
435008fbd3 Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-25 16:04:08 +08:00
146e6a617c Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev 2024-10-25 16:03:42 +08:00
gyq
c384188256 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-25 16:01:33 +08:00
gyq
41648aa4c5 优化 2024-10-25 16:01:27 +08:00
ca827999b8 更新修复未调用选取桌台接口 2024-10-25 15:25:16 +08:00
duan
4d6635e9be Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-25 15:23:08 +08:00
duan
869da7f0f0 修改叫号记录菜单 2024-10-25 15:23:06 +08:00
709036c050 增加无台桌下单切换台桌 2024-10-25 14:50:52 +08:00
gyq
6f63576428 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dev 2024-10-25 10:01:59 +08:00
gyq
64794aa8b8 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-25 09:59:04 +08:00
gyq
486733b788 优化 2024-10-25 09:58:48 +08:00
魏啾
5a8a45143b 解决冲突data_forms.vue 2024-10-25 09:54:51 +08:00
魏啾
bf20edf7ef 调整进销存样式 2024-10-25 09:53:16 +08:00
duan
7acc762d59 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-25 09:39:03 +08:00
duan
88db7a720d 桌型表单提交后制空 2024-10-25 09:38:59 +08:00
gyq
82cc068206 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dev 2024-10-25 09:38:25 +08:00
gyq
af54cb73ad 优化数据统计 2024-10-25 09:37:29 +08:00
gyq
647912fa1f Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dev 2024-10-24 17:29:08 +08:00
gyq
01003c84ab 优化 2024-10-24 17:28:30 +08:00
gyq
e1fb69f424 优化 2024-10-24 16:30:27 +08:00
gyq
163757f27b Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dev 2024-10-24 16:08:10 +08:00
gyq
f585e2f020 1.优化首页 2.优化绑定耗材 2024-10-24 15:38:55 +08:00
c473f30a37 修改代客下单商品是否能够下单的逻辑 2024-10-24 14:52:52 +08:00
57ef84aae1 代客下单增加无台桌获取masterId 2024-10-24 11:40:52 +08:00
gyq
2261b0520a Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-24 11:10:46 +08:00
gyq
abac233027 1.店铺设置 - 店铺信息 - 桌位费开启免餐位费不可修改输入框
2.店铺设置 - 店铺信息logo、门店、二维码、小程序码图片添加下载按钮
3.新增pad点单设置
2024-10-24 11:10:33 +08:00
魏啾
b2e27c0035 Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-23 17:13:48 +08:00
3fb8a7b748 代码合并 2024-10-23 16:38:46 +08:00
76e5b89fb7 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev 2024-10-23 16:33:20 +08:00
5ea24d76c8 修复:
1.代客下单先付费下直接点扫码支付获取支付链接失败
2.修复清空购物车删除因为报错导致购物车清空事变
2024-10-23 16:32:04 +08:00
魏啾
e5aec2e236 霸王餐 2024-10-23 16:00:56 +08:00
duan
09716e7492 修改打印机跳转 2024-10-23 14:51:26 +08:00
魏啾
8a7a97c9ca 退出 2024-10-23 14:24:19 +08:00
魏啾
54d4f468c1 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-23 14:23:08 +08:00
魏啾
ea8df2a3b3 全屏 2024-10-23 14:22:04 +08:00
ab1f5bd199 增加订单退款退菜 2024-10-23 13:53:11 +08:00
duan
12e66e8866 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-22 14:28:36 +08:00
duan
9c2ce903b2 叫号语音播放 2024-10-22 14:27:35 +08:00
36d667326e 增加退款退菜功能 2024-10-22 13:28:09 +08:00
9593d8f906 修复退菜数量不对问题 2024-10-22 08:58:27 +08:00
duan
bc3929a32e Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-21 17:17:42 +08:00
duan
998874db87 保存商户信息 2024-10-21 17:17:39 +08:00
f15c2c0135 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-21 11:06:05 +08:00
727d79a253 修复代客下单权限校验后无反应
增加桌台结账权限校验
2024-10-21 11:05:46 +08:00
f93b07e798 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-21 10:58:56 +08:00