126 Commits

Author SHA1 Message Date
xiezhijun
fe7834e640 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-04-09 20:00:06 +08:00
xiezhijun
1789e77786 打卡功能优化 2021-04-09 19:59:54 +08:00
huangdeliang
ccef6fa24c 多关键字搜索 2021-04-09 11:58:15 +08:00
xiezhijun
070f36dd7c Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-04-08 14:43:10 +08:00
xiezhijun
164c975c93 小程序打卡 2021-04-08 14:42:53 +08:00
huangdeliang
73d716126c 导出图片切换名字&生成模板自动已审核 2021-04-07 16:57:52 +08:00
xiezhijun
d0b2cf7d3d 营养师、售后更换的提成转移,食谱计划生成优化等 2021-04-03 18:38:20 +08:00
xiezhijun
5d95de3a2a 食谱计划生成修改,根据客户ID重新生成,暂停记录不需要加订单ID 2021-04-01 18:45:41 +08:00
xiezhijun
8b07969264 订单导出修改,增加进粉时间 2021-03-30 15:29:24 +08:00
德仔
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
4bee383358 提成详情 2021-03-27 19:29:15 +08:00
huangdeliang
870efe5b55 老体征信息添加备注 2021-03-27 17:24:32 +08:00
xiezhijun
74cfe232a8 订单按天计算详情 2021-03-26 19:04:44 +08:00
xiezhijun
dffca92564 提成计算优化,新增提成计算开始时间 2021-03-25 17:26:47 +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
0ab35ed6c7 打卡后台,小程序接口 2021-03-23 18:46:10 +08:00
xiezhijun
8c3eb7ab9c 客户案例修改 2021-03-19 16:02:12 +08:00
xiezhijun
88f6b8e955 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj 2021-03-18 18:48:49 +08:00
xiezhijun
9cc0ad82cd 去除食谱生成的时间限制,小程序获取案例接口 2021-03-18 18:48:28 +08:00
德仔
e26a542987 !145 适配中文文件
Merge pull request !145 from 德仔/develop
2021-03-18 16:47:30 +08:00
huangdeliang
a10b8715ce 适配中文文件 2021-03-18 16:45:24 +08:00
德仔
d903f64c7a !135 修复表名称
Merge pull request !135 from 德仔/develop
2021-03-17 13:46:54 +08:00
huangdeliang
8124005e7e 修复表名称 2021-03-17 13:45:54 +08:00
德仔
b037802a9c !133 食材添加信息
Merge pull request !133 from 德仔/develop
2021-03-16 20:10:50 +08:00
huangdeliang
1b5a4f3777 食材添加信息 2021-03-16 20:09:28 +08:00
huangdeliang
03eb2508b6 食材添加信息 2021-03-16 17:53:17 +08:00
xiezhijun
0f03406d4c 工资比例计算 2021-03-15 18:01:59 +08:00
德仔
a2d4c579cc !119 新增1天体验
Merge pull request !119 from 德仔/develop
2021-03-11 18:39:37 +08:00
huangdeliang
c959692e9a 新增1天体验 2021-03-11 18:36:34 +08:00
德仔
415e7f3859 !115 菜品加大类、小类
Merge pull request !115 from 德仔/xzj
2021-03-10 17:38:18 +08:00
德仔
6e742dfdab !114 采购计划开发
Merge pull request !114 from 德仔/develop
2021-03-10 17:37:03 +08:00
xiezhijun
989889f4cf 菜品加大类、小类 2021-03-10 17:36:10 +08:00
huangdeliang
aa555d98c2 采购计划开发 2021-03-10 17:35:19 +08:00
xiezhijun
addf0fc000 案例管理优化 2021-03-09 18:25:13 +08:00
德仔
f584f29685 !103 增加备注信息
Merge pull request !103 from 德仔/develop
2021-03-06 18:24:01 +08:00
huangdeliang
f217adec10 增加备注信息 2021-03-06 18:17:25 +08:00
xiezhijun
e35992d984 案例修改、图片预览 2021-03-06 18:06:39 +08:00
xiezhijun
f1adbb041f 案例管理的文件下载 2021-03-06 00:15:27 +08:00
xiezhijun
b4d5eabf32 案例管理 2021-03-05 20:15:05 +08:00
xiezhijun
2a7c499b24 案例管理,添加修改暂停优化,判断时间不能重叠 2021-03-04 18:35:06 +08:00
xiezhijun
a20ef83dc4 食谱计划优化 2021-03-03 18:17:03 +08:00
huangdeliang
0f47bb8bc9 添加暂停计划 2021-03-02 18:56:19 +08:00
huangdeliang
4dd7a6f643 Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop 2021-03-01 19:04:14 +08:00
huangdeliang
3d20c30edc 食谱模板功能完成 2021-03-01 19:04:01 +08:00
xiezhijun
f92e07f1ed 订单优化、提成分为审核、未审核 2021-03-01 19:00:01 +08:00