Commit Graph

797 Commits

Author SHA1 Message Date
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 55ebdf9283 Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into dwb 2024-10-31 16:40:50 +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
魏啾 b0d37275f6 dev 2024-10-31 10:34:53 +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
duan 99da7fcf5a Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test 2024-10-29 13:33:36 +08:00
duan c3cd0e704e 商品分类页面需要调整 2024-10-29 13:33:33 +08:00
GaoHao 7ea49cbab8 优惠券修改 2024-10-29 10:15:04 +08:00
gyq a2d21b3776 将接口修改为测试服 2024-10-26 10:34:37 +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