Commit Graph

721 Commits

Author SHA1 Message Date
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