320 Commits

Author SHA1 Message Date
德仔
3119fa90e2 !182 进粉统计加上时间范围筛选
Merge pull request !182 from 德仔/xzj
2021-03-29 19:44:47 +08:00
huangdeliang
8f94c50d22 处理暂停日期 2021-03-29 19:42:00 +08:00
huangdeliang
6fe95722e2 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 2021-03-29 18:59:55 +08:00
xiezhijun
e93bce4731 进粉统计加上时间范围筛选 2021-03-29 18:40:28 +08:00
xiezhijun
b87b96d46e 提成明细优化 2021-03-28 17:38:38 +08:00
xiezhijun
b90eff14b0 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-27 19:29:28 +08:00
xiezhijun
4bee383358 提成详情 2021-03-27 19:29:15 +08:00
huangdeliang
870efe5b55 老体征信息添加备注 2021-03-27 17:24:32 +08:00
德仔
5d4f07a6e4 !179 修改合同签订页面
Merge pull request !179 from 德仔/develop
2021-03-27 11:23:22 +08:00
huangdeliang
cd22a2ca7f 修改合同签订页面 2021-03-27 11:22:20 +08:00
xiezhijun
b1d2c60f4f Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-26 19:04:57 +08:00
xiezhijun
74cfe232a8 订单按天计算详情 2021-03-26 19:04:44 +08:00
huangdeliang
d75984ed3a 修复食谱备注 2021-03-26 18:09:12 +08:00
huangdeliang
36384820bb 修复同一天同一餐别菜名相同合并的情况 2021-03-26 16:55:55 +08:00
huangdeliang
4ce5f3f7da 食谱导出功能 2021-03-26 16:09:27 +08:00
huangdeliang
6fe2d84e5e 修改细节 2021-03-26 14:41:33 +08:00
huangdeliang
86bb66a757 修复食谱采购统计问题 2021-03-26 14:16:08 +08:00
xiezhijun
4fece27960 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-25 17:27:01 +08:00
xiezhijun
dffca92564 提成计算优化,新增提成计算开始时间 2021-03-25 17:26:47 +08:00
德仔
2a23b51612 !170 修改食材,菜品删除逻辑
Merge pull request !170 from 德仔/develop
2021-03-25 16:58:34 +08:00
huangdeliang
b4e66b2cda 修改食材,菜品删除逻辑 2021-03-25 16:42:05 +08:00
德仔
0546388916 !168 打卡接口sql优化
Merge pull request !168 from 德仔/xzj
2021-03-24 19:04:33 +08:00
德仔
7cd539e8a4 !167 新增当天采购计划
Merge pull request !167 from 德仔/develop
2021-03-24 17:18:53 +08:00
xiezhijun
6213754ca0 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-24 17:17:29 +08:00
huangdeliang
51a9c5c798 新增当天采购计划 2021-03-24 17:16:49 +08:00
xiezhijun
23015d814c 健康报告下载名称修改,打卡相关接口优化 2021-03-24 17:16:36 +08:00
德仔
12484d77b2 !166 修复忌口展示
Merge pull request !166 from 德仔/develop
2021-03-24 10:57:50 +08:00
huangdeliang
c4d1cba225 修复忌口展示 2021-03-24 10:55:31 +08:00
德仔
ec0b426ceb !163 新增忌口编写功能
Merge pull request !163 from 德仔/develop
2021-03-23 20:11:26 +08:00
huangdeliang
2ea3d01d6e 新增忌口编写功能 2021-03-23 20:10:29 +08:00
xiezhijun
c2d6a3c3df Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-23 18:46:24 +08:00
xiezhijun
0ab35ed6c7 打卡后台,小程序接口 2021-03-23 18:46:10 +08:00
德仔
f3d8ab4a96 !159 图片预览
Merge pull request !159 from 德仔/develop
2021-03-23 14:43:32 +08:00
huangdeliang
424b98ad57 图片预览 2021-03-23 14:42:01 +08:00
德仔
726f4e6b9d !158 生成食谱并制作完成后不能直接改未审核
Merge pull request !158 from 德仔/develop
2021-03-23 11:03:44 +08:00
huangdeliang
cdb93a1702 生成食谱并制作完成后不能直接改未审核 2021-03-23 11:03:16 +08:00
德仔
414bcd0939 !157 调整饼图
Merge pull request !157 from 德仔/develop
2021-03-23 10:08:16 +08:00
huangdeliang
d91543ea5e 调整饼图 2021-03-23 10:01:53 +08:00
德仔
f1386bb21d !156 图表宽度
Merge pull request !156 from 德仔/develop
2021-03-22 19:53:15 +08:00
huangdeliang
0e5eeac7d4 图表宽度 2021-03-22 19:52:08 +08:00
德仔
510769cc25 !155 修复删除&食谱展示
Merge pull request !155 from 德仔/develop
2021-03-22 19:45:34 +08:00
huangdeliang
c536b20b63 修复删除&食谱展示 2021-03-22 19:44:20 +08:00
huangdeliang
6d912988ac 调整食谱信息顺序 2021-03-22 17:57:44 +08:00
德仔
d1af8341f6 !154 调整图表展示
Merge pull request !154 from 德仔/develop
2021-03-22 17:02:04 +08:00
huangdeliang
5f84333c30 调整图表展示 2021-03-22 16:58:19 +08:00
德仔
bee860e4b9 !153 优化校验逻辑
Merge pull request !153 from 德仔/develop
2021-03-20 19:33:01 +08:00
huangdeliang
180f994141 优化校验逻辑 2021-03-20 19:31:00 +08:00
德仔
76d2b5b2fb !151 客户案例修改
Merge pull request !151 from 德仔/xzj
2021-03-19 18:13:23 +08:00
huangdeliang
efd7820da5 调整操作 2021-03-19 17:18:37 +08:00
huangdeliang
144e3550aa 跟换菜品控件 2021-03-19 17:08:21 +08:00