czg_team
/
management
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
940 Commits 12 Branches 0 Tags 6.9 MiB
Commit Graph

903 Commits

Author SHA1 Message Date
gyq c0c3eeeb44 新增会员积分页面 2024-10-30 13:38:34 +08:00
魏啾 30d4be1560 unbind未绑定 2024-10-30 13:32:43 +08:00
duan 4caaa3770f 耗材单位模块 2024-10-29 18:17:03 +08:00
GaoHao 7ea49cbab8 优惠券修改 2024-10-29 10:15:04 +08:00
gyq a67e109744 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-26 10:27:33 +08:00
gyq 7445cfda26 提交pad点餐设置问题 2024-10-26 10:27:26 +08:00
YeMingfei666 516ce90284 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-25 18:21:21 +08:00
YeMingfei666 c6fed2af32 增加台桌搜索功能 2024-10-25 18:03:00 +08:00
YeMingfei666 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
YeMingfei666 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
YeMingfei666 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
YeMingfei666 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
GaoHao 01eeccaecf 添加优惠券相关 2024-10-25 09:55:57 +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
YeMingfei666 c473f30a37 修改代客下单商品是否能够下单的逻辑 2024-10-24 14:52:52 +08:00
YeMingfei666 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
YeMingfei666 3fb8a7b748 代码合并 2024-10-23 16:38:46 +08:00
YeMingfei666 76e5b89fb7 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev 2024-10-23 16:33:20 +08:00
YeMingfei666 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
YeMingfei666 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
YeMingfei666 36d667326e 增加退款退菜功能 2024-10-22 13:28:09 +08:00
YeMingfei666 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
YeMingfei666 f15c2c0135 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-21 11:06:05 +08:00
YeMingfei666 727d79a253 修复代客下单权限校验后无反应 
增加桌台结账权限校验
 2024-10-21 11:05:46 +08:00
YeMingfei666 f93b07e798 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-21 10:58:56 +08:00
YeMingfei666 ec7db7612b 增加代客下单权限校验 2024-10-21 10:58:33 +08:00
GaoHao ae82be372d Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-21 10:40:41 +08:00
GaoHao c017e9d318 用户权限调整 2024-10-21 10:39:42 +08:00
YeMingfei666 c86a85473b Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-10-21 09:34:21 +08:00
YeMingfei666 9fbacf0398 更新页面样式，增加退菜数量选择以及退款原因 2024-10-18 16:55:43 +08:00
duan f442efd357 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-18 15:53:23 +08:00
duan 0fd7264309 打印机修改 2024-10-18 15:53:21 +08:00
魏啾 8cc30448ca Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-18 15:15:56 +08:00
魏啾 0c7637f507 耗材修改 2024-10-18 15:15:32 +08:00
duan 460bbc6e18 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-18 13:44:13 +08:00
duan 401e9fc8d3 打印机默认值 2024-10-18 13:44:11 +08:00
魏啾 d21d4f490d Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-18 11:19:41 +08:00
魏啾 49b1eae1fa 库存盘点 2024-10-18 11:19:35 +08:00
gyq dfcc643e8f 修复UI提出的问题 2024-10-18 10:26:46 +08:00
gyq 9b144138e9 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-18 09:10:35 +08:00
gyq b52ed29d11 优化面包屑首页跳转 2024-10-18 09:10:26 +08:00
GaoHao a9aad48ef3 Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-17 14:18:59 +08:00
GaoHao 511d266f72 数据统计销售金额，充值金额隐藏 2024-10-17 14:17:52 +08:00
duan 527714c16f Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-17 14:03:51 +08:00
duan 453955ca76 排队样式修改 2024-10-17 14:03:49 +08:00
YeMingfei666 d40a7b1856 修改默认布局 2024-10-17 13:55:01 +08:00
YeMingfei666 c224469c35 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-10-17 13:41:50 +08:00
GaoHao 489baa80d8 员工权限校验 2024-10-17 11:46:00 +08:00
YeMingfei666 eee6b3c9fa 增加无可用台桌时的提示 2024-10-17 11:39:10 +08:00
GaoHao 2c54a2a1d1 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into gh 2024-10-17 11:35:33 +08:00
GaoHao c75ff0ee68 员工权限校验 2024-10-17 11:35:03 +08:00
魏啾 585c26fd4d Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-17 11:32:19 +08:00
魏啾 904c6be6ba 商品修改 耗材修改 2024-10-17 11:31:04 +08:00
duan 90573dac96 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-17 10:11:15 +08:00
duan c625d9a886 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-17 10:11:13 +08:00
duan 21197e6258 打印机本地或网络判断 2024-10-17 10:11:00 +08:00
gyq b2a3854f2b Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-17 09:05:24 +08:00
gyq 9cf170e289 优化面包屑首页跳转失败 2024-10-17 09:04:51 +08:00
duan fa28b9d8ac Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-16 18:01:11 +08:00
duan 866c395558 打印机 2024-10-16 18:00:46 +08:00
魏啾 d3bfab8010 Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-16 10:40:47 +08:00
魏啾 0c289d21a4 修改出库"in" 2024-10-16 10:05:11 +08:00
duan 9f2af5cf76 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-10-16 09:52:41 +08:00
duan b9709d9fd4 打印机第5次修改 2024-10-16 09:52:32 +08:00
YeMingfei666 411b434b26 代客下单将之前的打包赠送等接口从添加改为更新 2024-10-15 17:19:18 +08:00
魏啾 c5816b1d85 Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-15 16:40:35 +08:00
魏啾 b3ea406b6e detail.createdAt | paidTime | timeFilter报错 2024-10-15 16:40:15 +08:00
魏啾 2acc46e811 耗材出库入库参数修改 2024-10-15 16:20:17 +08:00
gyq 9513f7a3ec 优化 2024-10-15 15:42:58 +08:00
gyq acf055ee72 修复耗材绑定有限打开多规格后单规格样式错乱问题 2024-10-15 15:27:32 +08:00
gyq a3e6c066a3 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-15 09:21:43 +08:00
gyq b391a7da80 修复样式污染 2024-10-15 09:16:07 +08:00
duan e1a8f59bbf Merge branch 'dwb' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-15 09:10:29 +08:00
duan 0069fb7185 打印机第4次修改 2024-10-15 09:09:42 +08:00
gyq 9e269a690c Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-15 09:03:06 +08:00
gyq ef53332726 优化规格绑定耗材样式 2024-10-15 09:02:39 +08:00
魏啾 2b6a4f9a83 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-14 14:49:03 +08:00
魏啾 f1a599881c 耗材列表 2024-10-14 14:48:51 +08:00
YeMingfei666 3ebbfb6324 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-12 15:55:35 +08:00
YeMingfei666 2c7042e6e2 修复代客下单扫码支付金额不对 2024-10-12 15:53:29 +08:00
魏啾 f623106dce Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-12 14:48:26 +08:00
魏啾 327e8ef17c 订单编号点击跳转 2024-10-12 14:47:54 +08:00
YeMingfei666 0e7f5885e0 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-12 13:59:46 +08:00
YeMingfei666 79e27f0098 代客下单修改 
先付费模式下只要生成订单就清空购物车
 2024-10-12 13:59:16 +08:00
魏啾 fec143eb44 操作类型 2024-10-12 13:46:44 +08:00
魏啾 893ec1bec4 耗材修改 2024-10-12 11:00:50 +08:00
duan 49a458de76 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-10-12 10:44:06 +08:00
duan 8f7aaf87d5 打印机部分修改优化 2024-10-12 10:43:56 +08:00
gyq 9c561ff725 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-12 10:37:15 +08:00
gyq 5608d7569b 优化商品列表首页统计 2024-10-12 10:37:05 +08:00
魏啾 9d42cda990 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-12 10:08:40 +08:00
魏啾 7bad259789 耗材 2024-10-12 10:08:27 +08:00
gyq 7a065c64cc Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-12 09:48:10 +08:00
gyq a21199d217 优化商品列表 2024-10-12 09:47:58 +08:00
YeMingfei666 23782f0f82 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-11 17:22:12 +08:00
YeMingfei666 9785038621 修复代课下单用户扫码支付后未清除定时器 2024-10-11 17:21:44 +08:00
duan 6882f41786 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-11 14:51:49 +08:00
duan c52422d4f6 Merge branch 'dwb' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-11 14:51:46 +08:00
duan 0e030b29c1 打印机部分修改 2024-10-11 14:51:27 +08:00
魏啾 eb11c3a082 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-11 10:55:40 +08:00
魏啾 ca496bf0db 按钮置灰 2024-10-11 10:55:28 +08:00
gyq 8d8def8e52 销售统计增加订单号 2024-10-11 09:41:48 +08:00
gyq 43d619f7bd Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-10 16:33:11 +08:00
gyq 5c10f30eae 优化 2024-10-10 16:33:02 +08:00
魏啾 6fb458b824 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-10 15:57:43 +08:00
魏啾 fb355a1913 商品分类和添加‘使用微信扫描二维码绑定订阅消息’ 2024-10-10 15:57:23 +08:00
gyq 64b4ebb88a Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-10 11:22:42 +08:00
gyq abd6385f02 优化店铺装修 2024-10-10 11:22:29 +08:00
魏啾 275cf34424 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-09 17:42:48 +08:00
魏啾 f6324f0cfe 销量统计 2024-10-09 17:42:13 +08:00
duan 089a92bcac Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-09 16:19:51 +08:00
duan f619a448b3 打印机优化 2024-10-09 16:19:34 +08:00
YeMingfei666 510039789a Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-09 15:05:34 +08:00
YeMingfei666 e8634dc187 代客下单获取masterId增加传参orderId 2024-10-09 15:04:27 +08:00
YeMingfei666 bd97ca779d 代客下单修改 
台桌列表跳转到代客下单立即结账时使用当前台桌的masterId
 2024-10-09 14:44:12 +08:00
duan d703e77ce7 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-09 14:13:14 +08:00
duan f3554b2b4a 修改打印机状态接口 2024-10-09 14:13:11 +08:00
魏啾 63f8aca317 商品分组修改 2024-10-09 13:58:30 +08:00
gyq 940ceee222 优化商品列表数据展示 2024-10-09 09:33:30 +08:00
gyq 44c2f6c3dd 商品列表新增时间筛选，增加库存预警，优化耗材绑定显示 2024-10-08 16:37:39 +08:00
gyq 976aecb7bf Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-10-08 15:25:43 +08:00
gyq 477906d4c5 优化商品列表 2024-10-08 15:25:33 +08:00
魏啾 b432b8b3b9 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-10-08 14:42:09 +08:00
魏啾 ab42e8d9f9 商品列表与订单列表的详情 2024-10-08 14:41:58 +08:00
duan df3546c378 员工权限颜色 2024-10-08 13:57:35 +08:00
gyq 544038bb36 优化首页销售趋势数据变化 2024-10-08 13:34:59 +08:00
YeMingfei666 89d5974fd2 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-08 10:56:44 +08:00
YeMingfei666 4056eae94f 代客下单增加根据店铺配置的就餐类型来判断该就餐类型是否可用 2024-10-08 09:53:00 +08:00
YeMingfei666 e6e0ecced6 代客下单增加用户扫描二维码支付 2024-09-29 10:01:05 +08:00
魏啾 a6b3d7c065 更改交班记录 2024-09-28 09:40:04 +08:00
YeMingfei666 b8e5751f30 代客下单增加限制无tableid时不发送修改就餐人数请求 2024-09-27 18:29:56 +08:00
魏啾 87f0b1131b 店铺管理添加两个支付宝参数 2024-09-27 18:03:37 +08:00
魏啾 d1b2739fc7 注释stockNumber 2024-09-27 16:00:38 +08:00
gyq 3ab87c6c29 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-09-27 15:51:46 +08:00
gyq 41fa886d23 优化 2024-09-27 15:51:37 +08:00
YeMingfei666 8562f2243a Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-27 13:49:15 +08:00
YeMingfei666 1acf00daab 代客下单增加单品备注，退客座费 
台桌列表修改时间展示不足1分钟显示0分
 2024-09-27 13:46:11 +08:00
gyq 89da9cc1fc Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-09-27 13:44:26 +08:00
gyq f0bca6e0d1 优化问题、更换接口 2024-09-27 13:44:17 +08:00
魏啾 bac738d80c 店铺设置>>通知中心>>下载图片 2024-09-27 11:18:06 +08:00
YeMingfei666 60bc61d40f 代客下单修改先付费页面逻辑样式 2024-09-27 09:39:25 +08:00
魏啾 fe6e6c2553 第三方配置支付宝appid 2024-09-26 18:04:38 +08:00
魏啾 5dc46dd622 Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-26 17:30:12 +08:00
魏啾 9215757381 订单列表中取消订单金额显示支付方式，耗材列表调整 2024-09-26 17:29:48 +08:00
duan e70518c81c Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-09-26 10:56:43 +08:00
duan a7083b85ab 打印机 2024-09-26 10:53:38 +08:00
YeMingfei666 a210389439 代客下单修复就餐人数问题，台桌人数限制问题 2024-09-25 14:50:09 +08:00
YeMingfei666 66e15de9eb 修改部分请求顺序 2024-09-25 14:32:44 +08:00
YeMingfei666 6f952970d6 代客下单修改部分代码逻辑 2024-09-25 09:58:38 +08:00
YeMingfei666 da70ad3aa6 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-25 08:59:14 +08:00
YeMingfei666 483d183a09 代客下单修复不必要的选择人数请求 2024-09-25 08:57:41 +08:00
YeMingfei666 2e1f6b133a 代客下单部分问题修复优化 2024-09-24 18:06:49 +08:00
YeMingfei666 34fc9c4ee1 代客下单从弹窗修改为页面，修改台桌列表弹窗为跳转，代客下单完毕后跳转至台桌页面 2024-09-24 17:56:03 +08:00
魏啾 41b5156605 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-09-24 16:16:13 +08:00
魏啾 2da14d86c2 更改路由背景颜色 2024-09-24 16:15:48 +08:00
duan 0420158601 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-09-24 15:38:18 +08:00
duan 5c8786a5c0 播报弹窗样式修改 2024-09-24 15:38:06 +08:00
gyq dc758120c4 优化登录页样式污染 2024-09-24 15:26:55 +08:00
gyq e5eeb7c1ce Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-09-24 15:13:13 +08:00
gyq d1893abd05 隐藏店铺配置的店铺装修 2024-09-24 15:13:05 +08:00
duan bb42d4cd59 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-24 13:57:44 +08:00
duan 1de4816ecc 添加菜单 2024-09-24 13:57:14 +08:00
gyq 19be296326 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-09-24 13:47:35 +08:00
gyq 5c47408c96 商品列表新增绑定耗材 2024-09-24 13:47:09 +08:00
duan c48b9f4ab3 员工编辑 2024-09-24 13:47:07 +08:00
YeMingfei666 148ac92e80 代客下单增加已开台台桌就餐方式 2024-09-23 17:23:24 +08:00
YeMingfei666 fc9b1dfda3 代客下单增加已开太台桌就餐方式 2024-09-23 17:22:01 +08:00
YeMingfei666 632ecda8e4 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-23 15:59:20 +08:00
YeMingfei666 3d75bbaaae 代客下单更新部分请求参数 2024-09-23 15:58:48 +08:00
duan 5db9cc69a3 排队bug修改 2024-09-23 14:03:56 +08:00
YeMingfei666 4d00346766 添加台桌增加提交限制 2024-09-23 11:23:50 +08:00
YeMingfei666 6afa9a3c48 代客下单修复 
当点击仅下单时请求报错提示请选择就餐人数后。未改变订单请求状态导致点击无反应
 2024-09-20 17:41:21 +08:00
gyq 899fd4b93d Merge branch 'gyq' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into test 2024-09-20 15:06:15 +08:00
魏啾 a979d390a3 Merge branch 'wwz' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-20 15:03:50 +08:00
gyq 673afeb5f3 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-09-20 15:03:44 +08:00
gyq e4e99585d4 优化店铺配置 2024-09-20 15:03:09 +08:00
魏啾 ce9799b290 耗材 2024-09-20 15:02:26 +08:00
duan 14395401db 排队 2024-09-20 11:26:51 +08:00
YeMingfei666 d6836d240c 代客下单修复多规格商品按钮禁用问题 
增加用餐模式切换
 2024-09-19 16:38:45 +08:00
YeMingfei666 5f1688173f 代客下单增加就餐类型切换 2024-09-19 10:53:03 +08:00
YeMingfei666 4fd8d61756 代客下单修改 
当台桌为空闲时第一次选择就餐人数，当设置人数请求结束时再请求购物车数据
 2024-09-14 14:55:12 +08:00
YeMingfei666 69d758ab68 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-14 13:37:42 +08:00
YeMingfei666 f83fc9da7e 修复台桌列表页面餐位费与代客下单不一致问题 2024-09-14 13:37:24 +08:00
YeMingfei666 56ad19d992 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-14 10:15:49 +08:00
YeMingfei666 7dbaf46d52 修改部分样式避免样式冲突 2024-09-14 10:15:35 +08:00
YeMingfei666 353ead73f5 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-14 09:52:57 +08:00
YeMingfei666 76de94ee7c 台桌状态台桌清理中改为待清台 2024-09-13 16:15:55 +08:00
YeMingfei666 0f39d2cde1 台桌列表增加清台弹窗 2024-09-13 15:59:34 +08:00
YeMingfei666 f767d12f4a 代客下单增加台桌切换 
当台桌切换时重新获取取餐码，购物车数据，订单数据，就餐人数
 2024-09-13 15:05:59 +08:00
魏啾 31979af1ea Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-13 11:09:39 +08:00
魏啾 5e7f7faa1b 商品列表20240913 2024-09-13 11:09:35 +08:00
YeMingfei666 cf36010926 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-09-13 09:31:56 +08:00
YeMingfei666 61156edf85 代客下单增加支付订单时桌位费展示 2024-09-13 09:29:11 +08:00
gyq d61c0cbb22 店铺配置新增功能 2024-09-13 09:17:18 +08:00
YeMingfei666 f5df624f3e 代客下单增加退菜改购物车商品状态 2024-09-12 17:16:16 +08:00
YeMingfei666 3df43ddbaa 代客下单增加餐位费展示 2024-09-12 16:48:33 +08:00
YeMingfei666 c95c630a75 更新桌台列表页面 
代客下单修改部分样式，修复创建订单后未刷新订单问题
 2024-09-12 14:08:03 +08:00
gyq 24d6a192b1 1.优化后台样式 
2.改版并对接新版数据统计页面
 2024-09-12 08:53:44 +08:00
YeMingfei666 6795f2ccd3 代客下单增加退单,选择就餐人数，更改桌台， 修改样式 
台桌列表增加改为批量增加
 2024-09-11 18:14:40 +08:00
YeMingfei666 e59919c6f1 增加选择台桌和选择人数 2024-09-10 17:42:55 +08:00
YeMingfei666 3cc53ec6e1 处理打印机列表页面报错未定义name 2024-09-06 15:57:27 +08:00
YeMingfei666 a81c8b8352 将oss文件上传返回的http链接改为https链接 2024-09-06 13:59:00 +08:00
YeMingfei666 e6d421dfb1 增加上传文件取消提示 2024-09-06 13:37:14 +08:00
YeMingfei666 5f8cecfa90 增加阿里云切片上传，版本管理文件上传切换为阿里云上传，增加上传进度条 2024-09-06 11:08:43 +08:00
YeMingfei666 050b13e2eb 版本管理修复重置按钮 2024-09-05 14:17:19 +08:00
YeMingfei666 d7b5a1329e 版本管理修改下载地址样式 2024-09-05 13:48:12 +08:00
YeMingfei666 fe90fd7fc2 版本管理限制上传exe文件 2024-09-05 13:41:52 +08:00
YeMingfei666 b8a08eea4f 修复版本管理编辑保存报错问题 2024-09-05 13:37:57 +08:00
YeMingfei666 ac11e23df5 封装请求增加取消请求方法 2024-09-05 13:37:22 +08:00
YeMingfei666 5c3028a2d2 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-09-05 11:11:38 +08:00
YeMingfei666 d88276f366 修复版本管理编辑报错 2024-09-05 11:06:13 +08:00
YeMingfei666 2a1422d281 代客下单增加扫码支付 2024-09-05 10:56:38 +08:00
gyq 433fa38c55 优化添加员工折扣比例 2024-09-05 09:47:26 +08:00
gyq 89a4ab2c72 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-09-05 09:42:25 +08:00
YeMingfei666 24a044427b 代客下单更新储值卡为扫码支付 2024-09-05 09:32:50 +08:00
YeMingfei666 178a06f2d7 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-09-04 17:22:56 +08:00
YeMingfei666 37c1c9fa2b 增加扫码支付 2024-09-04 17:22:50 +08:00
duan 1cfec880ca 商品编辑和添加隐藏成本和售出 2024-09-03 16:18:25 +08:00
duan 8ae5c20714 修改商品编辑和添加页面的冲突 2024-09-03 16:04:14 +08:00
duan 299a38f3f9 商品编辑和添加表格隐藏原价和成本价 2024-09-03 16:02:58 +08:00
YeMingfei666 4fc08ca05a Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-09-03 09:24:42 +08:00
YeMingfei666 24db020363 修复商品编辑报错问题 2024-09-03 09:24:31 +08:00
YeMingfei666 7c777b72df 台桌列表样式调整 2024-09-02 18:30:03 +08:00
duan 3805882787 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into test 2024-09-02 17:25:41 +08:00
duan 0e50ec6998 余额列表 2024-09-02 17:25:26 +08:00
YeMingfei666 7a1122ece6 Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-09-02 15:34:44 +08:00
YeMingfei666 234f070977 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-09-02 15:34:28 +08:00
YeMingfei666 7db7f0c463 代客下单 
去除历史订单，创建订单增加状态，当状态完成时才继续允许请求
 2024-09-02 15:34:06 +08:00
duan b9e41d220a 将通知中心，改成店铺配置 2024-09-02 14:29:30 +08:00
YeMingfei666 422a44ca15 更新版本上传文件接口 2024-09-02 11:13:44 +08:00
duan e2aa28b9d8 通知中心，修改字段名称 2024-09-02 10:36:57 +08:00
魏啾 d99fb079c0 更改商品添加初始化为undefined 2024-09-01 17:56:27 +08:00
YeMingfei666 d538252399 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-08-31 11:10:25 +08:00
YeMingfei666 d1317f9c7f 修改页面样式 2024-08-31 11:09:49 +08:00
YeMingfei666 c45f8a5f6a 代客下单 
创建订单时增加如果是取单将取到订单id也歘传参
 2024-08-31 11:09:37 +08:00
YeMingfei666 3070a5a6b4 增加一个图标 2024-08-31 11:07:18 +08:00
YeMingfei666 6def1406bb 台桌列表样式调整 2024-08-30 17:34:58 +08:00
YeMingfei666 f53f9b0f07 修改余额支付为会员支付 2024-08-30 17:34:38 +08:00
duan 38f8bd1ea9 隐藏余额列表 2024-08-30 17:07:41 +08:00
YeMingfei666 4748ea46e3 代客下单修复已下单菜品选中时再添加商品，未取消已下单菜品选中 2024-08-30 17:07:04 +08:00
YeMingfei666 16b49e08d2 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-08-30 17:00:51 +08:00
YeMingfei666 d889b9b1ad 代客下单增加历史订单，代码优化 2024-08-30 17:00:29 +08:00
YeMingfei666 eb7522c222 修改台桌状态，开台中时按钮展示加菜和结账 2024-08-30 16:59:12 +08:00
YeMingfei666 d5dd4d0915 代客下单备份 2024-08-30 16:37:38 +08:00
YeMingfei666 773af51758 修改判断商品是否可以下单 2024-08-30 16:37:19 +08:00
YeMingfei666 016bc3fc0c 商品库存修改库存关闭时的样式 2024-08-30 16:36:42 +08:00
YeMingfei666 2e154dd749 增加部分辅助类样式 2024-08-30 16:35:15 +08:00
duan aee738ca00 优化上线问题，安全设置等 2024-08-30 16:28:05 +08:00
duan ae6dcc295a 修改入参两端的空格 2024-08-30 09:16:32 +08:00
YeMingfei666 06e4292de8 代课下单修改折扣传参位数 2024-08-29 18:22:29 +08:00
YeMingfei666 36b307fbbe 代客下单增加折扣 2024-08-29 18:10:01 +08:00
YeMingfei666 891ab22903 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-08-29 13:53:41 +08:00
YeMingfei666 5292956f59 代客下单增加扫码支付退款弹窗 2024-08-29 13:53:27 +08:00
YeMingfei666 5b95ce2d56 修改会员支付为余额支付 2024-08-29 13:38:42 +08:00
YeMingfei666 97680afa8e 增加辅助类公共样式 2024-08-29 13:38:16 +08:00
YeMingfei666 d9c9e6ac9c 台桌列表和添加台桌 
剔除旧的开台中状态
 2024-08-29 09:29:26 +08:00
YeMingfei666 c887f48035 台桌管理-台桌列表修复 
修复状态不存在时页面报错导致白屏
 2024-08-29 09:24:27 +08:00
YeMingfei666 9aaeb7f0d6 管理后台系统管理-版本管理修改更新选中当前版本接口 2024-08-29 09:10:56 +08:00
YeMingfei666 7d3251f1d6 增加管理员版本管理页面 2024-08-28 18:30:33 +08:00
YeMingfei666 18b6509b26 过滤null商品 2024-08-28 18:30:02 +08:00
duan dfdfac7ca7 充值消费字段更改 2024-08-27 17:42:25 +08:00
duan a9ba6579fc Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-08-27 16:38:21 +08:00
duan 7876ed1c11 任务id1000083 完成率80% 2024-08-27 16:38:11 +08:00
YeMingfei666 83d0c54717 修改商品绑定耗材选 
择商品和耗材的弹窗设置最大高度
 2024-08-27 16:22:56 +08:00
YeMingfei666 1516b84c42 修复代课下单商品搜索问题 2024-08-27 15:56:27 +08:00
duan a0cad20d31 合并代码 2024-08-27 15:43:02 +08:00
YeMingfei666 f5b36c5f0e 耗材列表所属商品样式修复 2024-08-27 15:36:59 +08:00
YeMingfei666 1d1dabf492 修复耗材列表所属商品不换行问题 2024-08-27 15:22:03 +08:00