魏啾
|
4acb025bb9
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz
|
2024-11-06 17:51:30 +08:00 |
|
魏啾
|
883a6ffa1a
|
添加出入库供应商
|
2024-11-06 17:51:12 +08:00 |
 YeMingfei666
|
a8c1440a02
|
1.代课下单修改监听用户改变事件
减少重复请求
2.当会员优惠未0时不展示会员优惠
|
2024-11-06 15:39:52 +08:00 |
|
YeMingfei666
|
958229f63d
|
代客下单修复：
结算时切换用户未重新获取订单信息
|
2024-11-06 15:29:31 +08:00 |
|
YeMingfei666
|
3ad1407173
|
修改价格计算公式
|
2024-11-06 15:26:52 +08:00 |
|
YeMingfei666
|
8528341101
|
修改价格计算，总价格包含赠送商品价格，最后结果为总价格-赠送商品-会员优惠
|
2024-11-06 15:20:20 +08:00 |
|
YeMingfei666
|
ef8cd6da3a
|
增加会员价展示
|
2024-11-06 14:58:46 +08:00 |
 gyq
|
a9691e5891
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-11-05 17:09:47 +08:00 |
|
gyq
|
da1812f78b
|
优化积分中心新增类型
|
2024-11-05 17:09:40 +08:00 |
|
YeMingfei666
|
dfe65e0ae6
|
修复积分抵扣接口报错问题
|
2024-11-05 16:41:37 +08:00 |
|
YeMingfei666
|
67a892ac01
|
代客下单结账增加积分优惠券支付
|
2024-11-05 16:28:01 +08:00 |
GaoHao
|
7d8673e6cf
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-05 10:54:43 +08:00 |
|
GaoHao
|
649f9bd13f
|
添加优惠券名字修改
|
2024-11-05 10:53:43 +08:00 |
|
YeMingfei666
|
63ef70ab6a
|
修复问题：
【管理系统】数据统计-桌台统计页面中，按时间筛选出当日时间各个桌台订单数量，点击跳转到订单页面结果不准确
|
2024-11-04 15:01:29 +08:00 |
|
YeMingfei666
|
f95ae26298
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf_test
|
2024-11-04 14:53:11 +08:00 |
|
YeMingfei666
|
a9736e69f1
|
增加获取优惠券
|
2024-11-04 14:52:36 +08:00 |
duan
|
f4467b6a2e
|
桌台日期跳转
|
2024-11-04 14:36:55 +08:00 |
|
duan
|
8ab8fa3a9a
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-11-04 14:11:41 +08:00 |
|
duan
|
c9d2e3c80f
|
桌台跳转报错
|
2024-11-04 14:11:28 +08:00 |
|
魏啾
|
1b0747ca91
|
添加耗材价格
|
2024-11-04 14:07:22 +08:00 |
|
duan
|
13b4a82ce6
|
修改耗材出库单位
|
2024-11-04 11:38:42 +08:00 |
|
duan
|
933d70445e
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb
|
2024-11-04 11:28:15 +08:00 |
|
duan
|
51f3a382c8
|
耗材主副单位联动
|
2024-11-04 11:27:44 +08:00 |
|
gyq
|
438c11c324
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-11-01 16:00:26 +08:00 |
|
gyq
|
8acea02448
|
积分中心图片增加预览功能
|
2024-11-01 13:48:50 +08:00 |
|
duan
|
da693c2fa2
|
员工管理
|
2024-11-01 13:36:15 +08:00 |
|
魏啾
|
281a4d200a
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into wwz
|
2024-11-01 13:35:57 +08:00 |
|
魏啾
|
367cb7c2d7
|
隐藏耗材管理
|
2024-11-01 13:35:20 +08:00 |
|
YeMingfei666
|
1067da51c4
|
修复订单列表页面退菜文字错误
|
2024-11-01 11:28:13 +08:00 |
|
YeMingfei666
|
b0fd39fa87
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf_test
|
2024-11-01 11:16:49 +08:00 |
|
YeMingfei666
|
8c99f49700
|
代客下单部分逻辑处理优化，订单管理退款退菜结账跳转功能问题处理
|
2024-11-01 11:16:12 +08:00 |
|
gyq
|
964877f763
|
优惠券api管理
|
2024-11-01 10:24:16 +08:00 |
|
gyq
|
9621b5bb86
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-11-01 10:23:36 +08:00 |
|
gyq
|
9bf1dda6dc
|
1.新增店铺装修小票设置
2.店铺装修新增pad点餐设置
3.应用中心新增会员积分
4.店铺设置新增积分设置
|
2024-11-01 10:23:05 +08:00 |
|
YeMingfei666
|
924f296ad1
|
修改代客下单相关逻辑
|
2024-10-31 18:25:52 +08:00 |
|
duan
|
96730712f3
|
修改副单位样式
|
2024-10-31 16:40:26 +08:00 |
|
YeMingfei666
|
8403afd685
|
代客下单新逻辑梳理
|
2024-10-31 16:36:21 +08:00 |
|
duan
|
20df5c3ca4
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-10-31 16:14:37 +08:00 |
|
duan
|
515b12f09a
|
修改主副单位
|
2024-10-31 16:14:34 +08:00 |
|
魏啾
|
a841858316
|
Merge branch 'wwzdiv' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-10-31 10:18:54 +08:00 |
|
魏啾
|
df10beaaec
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-10-31 10:18:09 +08:00 |
|
魏啾
|
4af25b2b80
|
1
|
2024-10-31 10:17:30 +08:00 |
|
duan
|
58ed04ea71
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dev
|
2024-10-31 10:17:03 +08:00 |
|
duan
|
63a6305d46
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-10-31 10:12:42 +08:00 |
|
duan
|
461150f9ba
|
添加出入库的欠款金额
|
2024-10-31 10:12:39 +08:00 |
|
GaoHao
|
29283c3487
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test
|
2024-10-31 09:30:42 +08:00 |
|
GaoHao
|
f68cf9fab0
|
优惠券详情修改
|
2024-10-31 09:30:18 +08:00 |
|
duan
|
c103e026e5
|
入库出库null的问题
|
2024-10-31 09:14:10 +08:00 |
|
duan
|
909760e9bf
|
耗材副单位回显修改
|
2024-10-30 16:50:32 +08:00 |
|
gyq
|
f4b0414856
|
Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq
|
2024-10-30 13:38:41 +08:00 |
|
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 |