duan
|
1528469d88
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0
|
2024-11-01 17:46:59 +08:00 |
|
duan
|
ab5c746b80
|
提交耗材问题
|
2024-11-01 17:46:57 +08:00 |
 YeMingfei666
|
073baea2f9
|
Merge branch 'ymf_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0
|
2024-11-01 17:24:34 +08:00 |
|
YeMingfei666
|
ed6657199a
|
增加单规格商品绑定至规格时弹窗提醒
|
2024-11-01 17:23:47 +08:00 |
|
YeMingfei666
|
f38ff3e3de
|
优化首页nan问题
|
2024-11-01 16:55:33 +08:00 |
|
YeMingfei666
|
c066341ee6
|
去除app.vue报错
|
2024-11-01 16:48:44 +08:00 |
|
YeMingfei666
|
02be200b9b
|
修改首页样式兼容app
|
2024-11-01 16:40:48 +08:00 |
|
duan
|
a40d7bf142
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb
|
2024-11-01 16:36:24 +08:00 |
|
duan
|
dc1ff9ba43
|
修改耗材问题
|
2024-11-01 16:36:14 +08:00 |
|
YeMingfei666
|
71cd53dfc4
|
增加图标
|
2024-11-01 16:23:03 +08:00 |
|
YeMingfei666
|
e6f5e93d4b
|
增加总收入点击提示
|
2024-11-01 16:22:47 +08:00 |
|
YeMingfei666
|
1219a53496
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf_1.0.0
|
2024-11-01 15:12:53 +08:00 |
|
duan
|
5e4022f85c
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb
|
2024-11-01 15:12:03 +08:00 |
|
duan
|
7f55234a75
|
修改问题
|
2024-11-01 15:11:52 +08:00 |
|
YeMingfei666
|
788a0c8bdf
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf
|
2024-11-01 15:01:36 +08:00 |
|
YeMingfei666
|
24011fab8c
|
调整首页部分样式
|
2024-11-01 14:57:40 +08:00 |
|
YeMingfei666
|
a9ae16d213
|
去重重复菜单栏
|
2024-11-01 14:55:28 +08:00 |
|
YeMingfei666
|
4f9d7b9546
|
增加菜单栏图标
|
2024-11-01 14:44:12 +08:00 |
|
YeMingfei666
|
94823867d6
|
修改首页将设置中心改到左上角图标跳转
|
2024-11-01 14:43:42 +08:00 |
|
YeMingfei666
|
bd003e9d62
|
增加登录账号密码不对时提示将英文改成中文
|
2024-11-01 14:27:04 +08:00 |
|
YeMingfei666
|
aa96ff5848
|
去除桌台列表定时刷新
|
2024-11-01 14:26:06 +08:00 |
|
YeMingfei666
|
49f55e580b
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf
|
2024-11-01 13:59:29 +08:00 |
|
duan
|
1a2efdf804
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb
|
2024-11-01 13:37:03 +08:00 |
|
duan
|
110e6a0076
|
Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0
|
2024-11-01 13:36:39 +08:00 |
|
duan
|
82d9e44827
|
员工列表样式
|
2024-11-01 13:36:37 +08:00 |
|
duan
|
88d2816946
|
耗材样式
|
2024-11-01 11:36:33 +08:00 |
|
YeMingfei666
|
678c325fb6
|
修复订单列表筛选条件展示不对的问题
|
2024-11-01 09:14:06 +08:00 |
|
YeMingfei666
|
745f68f2e4
|
修复my-date-picker组件开始时间大于结束时间时限制效果未起作用的问题
|
2024-11-01 09:13:11 +08:00 |
|
duan
|
7605773087
|
合并代码
|
2024-10-31 16:47:16 +08:00 |
|
duan
|
70bf859fba
|
修改耗材盘点
|
2024-10-31 16:16:06 +08:00 |
GaoHao
|
69712862d9
|
Merge branch 'dev' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dev_1.0.0
|
2024-10-31 15:51:17 +08:00 |
|
YeMingfei666
|
1e8de97835
|
退菜增加弹框关闭时重置选择原因以及输入
|
2024-10-31 15:08:10 +08:00 |
|
YeMingfei666
|
6bf5c69361
|
增加商品编辑绑定至耗材还是规格默认展示
|
2024-10-31 15:05:50 +08:00 |
|
YeMingfei666
|
3d2f43761e
|
更新确认订单没选择用户时不展示用户信息
|
2024-10-31 14:21:17 +08:00 |
|
YeMingfei666
|
83b3202d0e
|
修改客座费退款失败
|
2024-10-31 11:17:15 +08:00 |
|
YeMingfei666
|
e8b5f1d2e7
|
退款客座费限制只能全选
|
2024-10-31 11:09:16 +08:00 |
|
YeMingfei666
|
1621a1feed
|
订单管理更新
|
2024-10-31 10:26:27 +08:00 |
|
YeMingfei666
|
9833e137f9
|
修改代客下单部分逻辑
1：加菜时用订单传来的masterID不再重新货区，并置空选择商品数量
2：优化代码，去除重复请求
订单管理加菜
1：跳转加菜页面参数增加mastrID
|
2024-10-31 10:25:59 +08:00 |
|
YeMingfei666
|
d48e16d739
|
更新公共方法
|
2024-10-31 10:05:44 +08:00 |
|
YeMingfei666
|
ad00b46a24
|
订单管理更新
|
2024-10-31 09:54:48 +08:00 |
|
YeMingfei666
|
be0b3af8dd
|
代客下单更新
|
2024-10-31 09:54:35 +08:00 |
|
GaoHao
|
fef46aa24f
|
Merge branch 'gh' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-10-31 09:31:44 +08:00 |
|
YeMingfei666
|
b92aaf3564
|
增加复制订单号
|
2024-10-30 17:42:39 +08:00 |
|
YeMingfei666
|
1d73d501d1
|
增加复制图标
|
2024-10-30 17:42:25 +08:00 |
|
YeMingfei666
|
8a1718a547
|
修改无台桌时也获取一次购物车
|
2024-10-30 17:06:42 +08:00 |
|
YeMingfei666
|
b8977bd81a
|
修改订单部分逻辑代码，提取公共方法
|
2024-10-30 16:59:20 +08:00 |
|
YeMingfei666
|
a958a401b3
|
修改部分公共方法代码
|
2024-10-30 16:55:07 +08:00 |
|
YeMingfei666
|
5d177fb7c8
|
增加代客下单，商品公共处理函数
|
2024-10-30 16:51:14 +08:00 |
|
duan
|
5ba238ddfd
|
Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test
|
2024-10-30 16:02:22 +08:00 |
|
duan
|
042c20a52d
|
耗材问题提交，盘点传值问题计算问题
|
2024-10-30 16:02:19 +08:00 |