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 |