Commit Graph

543 Commits

Author SHA1 Message Date
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
YeMingfei666 3173fcddc4 付款打折限制仅数字输入 2024-10-30 14:55:57 +08:00
YeMingfei666 b6d79c9319 增加就餐人数限制处理 2024-10-30 14:55:18 +08:00
YeMingfei666 13550e90d2 Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf 2024-10-30 13:55:49 +08:00
YeMingfei666 1f099e2174 修复微信小程序上空值是undefined导致的台桌接口报错和确认订单商品不展示的问题 2024-10-30 13:55:32 +08:00
YeMingfei666 9b09088e63 增加微信小程序更新 2024-10-29 17:02:12 +08:00
YeMingfei666 397f25f0da Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into ymf 2024-10-29 16:03:17 +08:00
YeMingfei666 1791d5f3d8 修改为正式服 2024-10-29 15:57:49 +08:00
YeMingfei666 4ae487a0b3 样式修改 2024-10-29 15:48:20 +08:00
duan 8b0e22e2cd Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-29 15:46:56 +08:00
duan 764c9461ae 小程序适配 2024-10-29 15:46:53 +08:00
YeMingfei666 b414db310d 代码合并 2024-10-29 10:45:16 +08:00
YeMingfei666 4ba6ffa48f 删除无用组件 2024-10-29 10:43:27 +08:00
GaoHao 94c0fdfe05 订阅 通知保存修改 2024-10-29 10:31:52 +08:00
GaoHao 0108ce36b5 优惠券修改 2024-10-29 10:18:48 +08:00
YeMingfei666 7fcf8f9cde 第一版隐藏优惠券 2024-10-29 09:53:37 +08:00
YeMingfei666 ba308fa5b5 增加正式环境 2024-10-29 09:53:15 +08:00
YeMingfei666 13ecd39c8c 更新选中台桌样式 2024-10-29 09:43:52 +08:00
YeMingfei666 a06c32334e 增加订单详情页退款打包等tag标签展示 2024-10-28 17:07:07 +08:00
YeMingfei666 b31a908609 增加餐位费和打包费额外判断 2024-10-28 13:51:14 +08:00
YeMingfei666 c05a9ff000 修复无台桌下单nan 2024-10-28 13:50:41 +08:00
YeMingfei666 85b92986a7 Merge branch 'ymf' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-28 09:23:22 +08:00
YeMingfei666 96a9dfb5b5 增加订单列表详情的客座费打包费 2024-10-28 09:22:47 +08:00
GaoHao 680ed5b634 Merge branch 'gh' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test 2024-10-26 16:18:31 +08:00
GaoHao 79b258243a 新增优惠券 2024-10-26 16:17:34 +08:00