122 Commits (b1a34cc9a06be4367e998723c712a03e8af9b2a3)

Author SHA1 Message Date
chenzhi b1a34cc9a0 优化不打款汇总 4 years ago
廖金灵 feb46d1954 Merge pull request 'feature/add_item_two' (#33) from feature/add_item_two into master
Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/33
4 years ago
zhengyongxing 699449a702 未结算数据的补充 4 years ago
zhengyongxing 0c49d1d655 Merge branch 'release' of 8.136.139.249:wmtx/platform into feature/add_item_two 4 years ago
zhengyongxing 32abdbb390 汇总统计修改 4 years ago
chenzhi fc75b7d81d 优化统计 4 years ago
chenzhi 79588d52e8 优化财务汇总 4 years ago
郑永星 ca8a2ada0e Merge pull request '12月功能提交,手机万能验证码屏蔽提交' (#7) from feature/add_item into release
12月功能提交,手机万能验证码屏蔽提交
4 years ago
zhengyongxing 309b195986 12月功能提交 4 years ago
陈志 9d30d48fac Merge pull request 'feature/st_mange_20201202' (#6) from feature/st_mange_20201202 into release
优化公式
4 years ago
chenzhi f4f430cf61 优化公式 4 years ago
zhengyongxing 23e5632eec 12月功能提交 4 years ago
chenzhi a3e0ecb949 优化结算公式 4 years ago
廖金灵 bdad3f8db9 Merge branch 'release' into feature/add_item 4 years ago
zhengyongxing fb0acddb3f 12份功能提交 4 years ago
zhengyongxing ec3491943b 12月功能提交 4 years ago
zhengyongxing 52ff4a2bc6 12月功能提交 4 years ago
zhengyongxing 9bec07c7d4 不结算bug修改 4 years ago
zhengyongxing 747224dae9 12月功能提交 4 years ago
zhengyongxing 27ffddfe75 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item
# Conflicts:
#	Data/update.sql
4 years ago
zhengyongxing 8bb8e4379f 12月功能提交 4 years ago
zhengyongxing b8af3ea384 12月功能提交 4 years ago
zhengyongxing 7e41ad1e18 12月功能提交 4 years ago
chenzhi 0b979d9b68 Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/st_mange_20201202 4 years ago
chenzhi 24f3489e65 优化导出新增公式 4 years ago
chenzhi 8d156ffb64 新增结算公式 4 years ago
zhengyongxing 166c1d63d6 12月功能提交 4 years ago
zhengyongxing 7c5c67a87c 编辑页面调整,及多个编辑错误修正 4 years ago
zhengyongxing 923851fea7 11月bug修复 4 years ago
zhengyongxing 0572fde5ad 11bug修复 4 years ago
chenzhi 986065ab4b 优化名词 4 years ago
chenzhi e7501be7c3 优化审核流程 4 years ago
zhengyongxing f3a45dfac6 Merge remote-tracking branch 'origin/feature/add_item' into feature/add_item 4 years ago
zhengyongxing a6263b2205 11月功能提交 4 years ago
chenzhi 5bdc0e6f6e 优化汇总方案 4 years ago
chenzhi 55dd67e34d 优化撤回 4 years ago
chenzhi 56681580dd 合并 4 years ago
chenzhi bd125be3dd 优化汇总审核流程 4 years ago
zhengyongxing f49cd75e86 11月功能提交 4 years ago
zhengyongxing 6811eb806c Merge branch 'master' of 47.111.118.107:wmtx/platform into feature/add_item
 Conflicts:
	Application/Admin/Controller/CompanyStatementPoolController.class.php
	Application/Admin/Controller/CompanyStatementSetController.class.php
	Data/update.sql
4 years ago
zhengyongxing e098384635 汇总bug修改 4 years ago
zhengyongxing 3656c555d1 11月功能提交 4 years ago
zhengyongxing 4526b5b741 11月功能提交 4 years ago
chenzhi 3db0914108 优化导出公司 4 years ago
zhengyongxing 859f5b58c9 汇总功能还原修正 4 years ago
zhengyongxing f450df3265 汇总功能修正 4 years ago
zhengyongxing 54a0fde480 汇总公司与上游回退 4 years ago
zhengyongxing 0af52ad4ea 汇总金额为空时添加数据 4 years ago
zhengyongxing f0cbe3cafb 周结算金额bug修改 4 years ago
zhengyongxing 4f35cacbab 汇总模板修改提交 4 years ago