Commit Graph

92 Commits (8a24fb37aab12d432149d9946baa8378991b15a6)

Author SHA1 Message Date
chenzhi 56fa287357 优化导出
chenzhi 648fb3ebbf 优化内部公司改进
chenzhi 4b1935676b 新增内外团查询
chenzhi e274f863a8 新增内部公司部门查询
zhengyongxing f2e56125fe 4.22号功能提交
zhengyongxing 69566e1839 4.22号功能提交
zhengyongxing 9080d521fd 4.22号功能提交
chenzhi e7a51c41da 优化前端入口文件
zhengyongxing 016c2e11bd 2.28号功能提交
zhengyongxing 4425750972 2.28号功能提交
chenzhi d06cc0ea10 优化去除同公司奖罚
廖金灵 a2474aaa0b Merge branch 'feature/reward' of wmtx/platform into release
修改时间
yulingwei a01beb9bc6 upt
廖金灵 fc7284de94 Merge branch 'feature/reward' of wmtx/platform into release
奖罚样式问题
yulingwei 9e53db53cd upt
yulingwei de0fc5e074 upt
廖金灵 3c4cf05a72 Merge branch 'feature/reward' of wmtx/platform into release
列表样式
yulingwei d46fa808c0 upt
廖金灵 4b6218f1aa Merge branch 'feature/reward' of wmtx/platform into release
修改选择样式
yulingwei b995ba34d9 upt
ELF 004b540a63 解决冲突
yulingwei e5996b47cc upt
yulingwei e789c941ed upt
yulingwei e0d74cbffd upt
yulingwei 066610f236 upt
yulingwei 877a53e892 upt
yulingwei f373bd2025 upt
yulingwei 28a44019e4 upt
yulingwei 2fbea72d26 up
yulingwei e337ecac5e upt
yulingwei c8bd476a60 upt
yulingwei adc3acd992 upt
yulingwei e155c92ed6 1
zhengyongxing 001e9e70f8 管理后台导出权限添加
zhengyongxing 009ef6719d 结算单管理审核状态bug修改
zhengyongxing 601151718f Merge branch 'feature/admin_optimize' into release
zhengyongxing 260ca6fe9e 结算单管理审核状态bug修改
zhengchanglong 6b68ae8197 Merge branch 'feature/admin_optimize' into release
# Conflicts:
#	Data/update.sql
zhengyongxing 4f65efad9b 结算单管理添加审核状态
zhengyongxing 3c16659bf3 Merge branch 'feature/admin_optimize' into release
zhengyongxing 9edc77bead 生成下游个人结算单bug修改
zhengyongxing 4d1cfb36ec 生成下游个人结算单bug修改
liuweiwen 077a770de7 奖罚记录管理-》奖罚时间为空判读,新增编辑判读
zhengchanglong c6a0f87dfe 奖罚编辑部分字段只读
liuweiwen 5949542b70 Merge branch 'feature/admin_optimize' into release
liuweiwen 6d91ec7c60 推广员-》奖罚记录管理-》上下游公司与公司类型联动,解决未显示下游公司问题
zhengchanglong e55bfcb2d8 奖罚编辑部分字段只读
zhengchanglong 586dbf49e9 添加奖罚记录返回出现错误提示BUG修复
zhengyongxing 2589a76603 生成下游个人结算单bug修改
zhengyongxing c8f333fa9a 生成下游个人结算单bug修改