Commit Graph

903 Commits

Author SHA1 Message Date
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
YeMingfei666 445a2caab8 进销存绑定商品增加
选择商品弹窗关闭重置表格的选中
2024-08-27 13:57:06 +08:00
YeMingfei666 f05c49232a Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-08-27 11:13:45 +08:00
YeMingfei666 98aee65db7 修改商品绑定耗材提交的id字段 2024-08-27 11:13:07 +08:00
YeMingfei666 f66d4655d1 修改商品绑定耗材提交的id字段 2024-08-27 11:10:51 +08:00
duan aa8d1b76e4 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-08-27 10:58:17 +08:00
duan c5ec0da61c 修改充值文字。增减余额 2024-08-27 10:58:09 +08:00
YeMingfei666 483ff5d234 修改台桌裂变编辑状态为仅编辑时出现 2024-08-26 17:56:02 +08:00
YeMingfei666 da29e0b249 台桌列表增加编辑台桌里可修改台桌状态 2024-08-26 17:52:39 +08:00
YeMingfei666 c70a6b2f68 代客人下单增加过滤掉下架的单规格商品 2024-08-26 17:51:59 +08:00
gyq 07a3c8e5f4 Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-08-26 17:06:07 +08:00
gyq 9d8e1e1bf2 更新员工优惠折扣 2024-08-26 17:05:58 +08:00
YeMingfei666 770c369ebd Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-08-26 11:15:34 +08:00
YeMingfei666 711bd0ca77 代客下单修复购物车里商品输入框输入数量数据未更新问题 2024-08-26 11:15:23 +08:00
duan 7542134ac7 余额增减修改输入小数点 2024-08-26 10:37:17 +08:00
duan 71b6d1929b Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-08-26 10:14:57 +08:00
duan 30656b3005 Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-08-26 10:14:47 +08:00
duan 2fe66b28a8 修改显示余额 2024-08-26 10:14:36 +08:00
YeMingfei666 5e14f29ecb 代客下单修改是否售尽判断 2024-08-26 09:51:03 +08:00
YeMingfei666 f2c73eca9a 代客下单
1.增加删除挂单判断当前挂单是否为当前订单
2.修复备注问题
2024-08-23 18:14:37 +08:00
YeMingfei666 ec75feddce 代客下单修复
确认挂单后再操作购物车再次存单时挂单列表数据未更新
2024-08-23 16:17:09 +08:00
YeMingfei666 423ad16727 代客下单
1.增加确认此单不删除本地订单
2.修改部分样式
2024-08-23 15:48:10 +08:00
YeMingfei666 963c1c81ba 代客下单修改部分样式 2024-08-23 15:28:08 +08:00
YeMingfei666 ab7c61231b 修改页面布局,增加全屏退出全屏功能 2024-08-23 15:22:19 +08:00
YeMingfei666 4c2d88ed99 修改会员余额支付文字为会员支付 2024-08-23 15:21:51 +08:00
YeMingfei666 d275c5ea3c Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-08-23 14:32:07 +08:00
YeMingfei666 eaaf7f5c60 代客下单挂单增加参数tableID 2024-08-23 14:22:04 +08:00
YeMingfei666 335d604f5f 代客下单增加结账金钱输入键盘 2024-08-23 13:57:53 +08:00
YeMingfei666 34f18e0e07 代客下单增加关台时禁止点餐 2024-08-23 13:57:23 +08:00
gyq d0f567209b Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-08-23 13:56:01 +08:00
gyq f5b364b0f3 添加员工新增优惠类型 2024-08-23 13:55:50 +08:00
duan ccd66bd2be 修改vip颜色 2024-08-23 11:45:54 +08:00
duan 82624d49b5 优化 2024-08-23 10:38:05 +08:00
YeMingfei666 d64555e905 暂时隐藏充值按钮 2024-08-23 10:21:10 +08:00
YeMingfei666 052d06bb75 增加会员余额支付方式 2024-08-23 10:20:52 +08:00
YeMingfei666 b0811452a4 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-08-23 09:57:43 +08:00
duan dfc9667c90 修改活动管理编辑-是否赠送商品开关入参类型 2024-08-22 16:39:16 +08:00
YeMingfei666 5d1961d772 代客下单更新
1.筛选时去除头尾空格来匹配
2024-08-22 16:02:03 +08:00
YeMingfei666 a14a9877c2 代客下单修改
1.默认布局更改为图片文字布局
2.增加选择用户时点击用户或者选择都可选择用户
2024-08-22 14:20:42 +08:00
YeMingfei666 dba71a0f11 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-08-22 09:34:42 +08:00
YeMingfei666 9e4eaf1ebc 代客下单修改文字布局售完展示样式 2024-08-22 09:30:58 +08:00
YeMingfei666 f07b6ec29b 增加不同布局售尽样式 2024-08-21 18:26:30 +08:00
YeMingfei666 3f8a41f694 代客下单增加开台中状态 2024-08-21 15:55:11 +08:00
YeMingfei666 0b3084a3f9 代客下单后付款修复 2024-08-21 15:36:23 +08:00
YeMingfei666 0a36882c8b 代客下单增加先付费后付费选择 2024-08-21 15:23:10 +08:00
YeMingfei666 18c2c68c9f 更新客下单支付订单 2024-08-21 13:44:39 +08:00
YeMingfei666 1bc4cf134c 代客下单增加下单关闭回调,当点餐页面关闭刷新桌台状态 2024-08-21 13:30:09 +08:00
YeMingfei666 8a84a99272 代课下单代码优化,修复部分问题 2024-08-21 10:58:57 +08:00
duan 37f7e51f69 优化和会员问题 2024-08-21 08:58:08 +08:00
YeMingfei666 555d0ebaa0 代课下单修改存单取单以及用户切换时masterid相关逻辑
当是取出的订单状态时使用订单的masterID
2024-08-20 17:46:25 +08:00
duan c563f646cc Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-08-20 16:58:07 +08:00
duan 1fde054290 用户编辑和余额增加减 2024-08-20 16:57:26 +08:00
YeMingfei666 977b2e5cd7 Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf 2024-08-20 16:47:42 +08:00
YeMingfei666 5575b4be9d 代客下单增加更新规格限制 2024-08-20 16:45:13 +08:00
GYJ c39792a0f6 活动页面增加自定义充值金额开关 2024-08-20 10:24:14 +08:00
YeMingfei666 28750b0a2d 代课下单增加多规格下架过滤 2024-08-20 09:52:22 +08:00
YeMingfei666 bcd5458db3 代客下单确认此单将masterid改为改订单的 2024-08-19 18:28:57 +08:00
YeMingfei666 0ae2fbe11b 代课下单-修改取消挂单 2024-08-19 18:03:33 +08:00
duan c51d5cd064 广告功能 2024-08-19 17:54:21 +08:00
YeMingfei666 daa8de48b3 代课下单增加切换用户时逻辑
1.获取新的取餐码
2.更新用户id
2024-08-19 17:37:22 +08:00
YeMingfei666 51e410a4be 修改代课下单本地测试环境 2024-08-19 17:15:00 +08:00
YeMingfei666 e0be30bd02 台桌列表-代课下单禁止修改桌台号 2024-08-17 18:02:38 +08:00
YeMingfei666 4977dcb76b 增加代客下单功能 2024-08-17 17:57:59 +08:00
duan 13df97b949 Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-08-17 16:06:06 +08:00
duan 44e15448d9 耗材列表盘点 2024-08-17 16:05:41 +08:00
duan 21a9548e45 添加赠送商品 2024-08-16 15:23:14 +08:00
duan ce546e09b2 修改所属商品字段 2024-08-16 15:22:29 +08:00
duan b3a48a68af 售卖时间管控 2024-08-15 16:04:22 +08:00
duan 611194b587 售卖时间管控 2024-08-15 15:50:43 +08:00
duan 0bccf5db8a 总的统计未携带分类参数 2024-08-15 13:47:08 +08:00
duan 3b7dbe50a2 将耗材记录加入到耗材列表里 2024-08-14 16:02:52 +08:00
duan 1e52030f5e 通知中心 2024-08-12 15:54:16 +08:00
duan b1bf21ccad 图库修改样式 2024-08-09 16:48:58 +08:00
魏啾 681d1c2c07 选择耗材 2024-08-09 15:01:58 +08:00
魏啾 7733dcf4e9 Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-08-09 14:06:16 +08:00
魏啾 5fc9443a4b 选择耗材 2024-08-09 14:06:02 +08:00
duan 2292bd6b82 Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into dwb 2024-08-09 11:17:21 +08:00
duan 25b348ee12 修改样式 2024-08-09 11:17:10 +08:00
魏啾 14462f98ab 更改总数数量 2024-08-09 10:54:27 +08:00
duan b6b80c3d43 修改图片 2024-08-09 09:48:06 +08:00
duan c4b734ce12 优化样式 2024-08-08 14:28:45 +08:00
duan 69b19bfade 修改添加商品问题 2024-08-08 14:23:10 +08:00
duan 8c0ca8869a 图片样式优化 2024-08-08 11:27:54 +08:00
duan 4ab685fac3 编辑商品的问题 2024-08-08 10:50:33 +08:00
魏啾 87d2f8a7bb Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-08-08 09:38:35 +08:00
魏啾 81f5c68fa7 出库入库修改 2024-08-08 09:38:23 +08:00
duan 9a55093516 商品单规格和多规格之间切换 2024-08-08 09:11:20 +08:00
duan 3b12a2ba06 更改图库功能 2024-08-07 15:51:33 +08:00
duan 7f54c59092 图库上传bug 2024-08-07 11:44:05 +08:00
duan 5377a76365 修改图库BUG 2024-08-07 09:41:13 +08:00
魏啾 d0cc82fdf5 Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz 2024-08-07 09:12:00 +08:00
duan d1ef6fefa0 修改BUG 2024-08-06 17:56:29 +08:00
duan 6c4e992283 商品分页 2024-08-06 15:05:29 +08:00
duan 0971b67010 添加商品列表分页功能 2024-08-06 15:00:49 +08:00
duan 1d39576b34 商品列表-商品图片-选择图片增删改 2024-08-06 13:45:06 +08:00
魏啾 e38545be2d 交班时间 营业时间 2024-08-05 17:01:34 +08:00
魏啾 79e1282c68 11 2024-08-05 15:12:49 +08:00
gyq e67e3525e4 Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq 2024-08-03 18:11:19 +08:00
gyq 7427e2d913 耗材盘点传参更新,新增stockNumber 2024-08-03 18:11:14 +08:00
YeMingfei666 01c4c17d30 进销存商品绑定耗材已选择耗材后展示为黑色文字 2024-08-03 17:03:59 +08:00
gyq 671159277c 交班记录新增sort字段 2024-08-03 16:55:20 +08:00