Commit Graph

694 Commits

Author SHA1 Message Date
74e1938d3c fix : 修改分摊汇总金额展示 2024-06-23 01:02:27 +08:00
058421bdd7 fix : 修复费用分摊详情合计bug 2024-06-23 00:58:56 +08:00
1a3d2bcf1a feat : 项目实施-台账新增表格更新功能 2024-06-23 00:37:07 +08:00
e0ba874746 Merge pull request 'fix : 修复用户切换报错提示、税后余额数字输入框、新增分摊时研发人员传参' (#384) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/384
2024-06-22 15:55:21 +00:00
7e524039bd fix : 修复用户切换报错提示、税后余额数字输入框、新增分摊时研发人员传参 2024-06-22 23:54:54 +08:00
2d9bba98a7 fix : 分摊详情小计与导出 2024-06-22 18:49:14 +08:00
e849c6cde6 Merge remote-tracking branch 'origin/master' 2024-06-22 18:45:50 +08:00
5c60bf91e4 fix : 分摊详情小计与导出 2024-06-22 18:45:40 +08:00
82634ddf97 Merge pull request 'fix : 审批记录优化' (#379) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/379
2024-06-21 10:40:00 +00:00
3f32683d69 fix : 审批记录优化 2024-06-21 18:39:45 +08:00
5fbef17b86 Merge pull request 'dj' (#377) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/377
2024-06-21 10:35:54 +00:00
1cdd2cb02b fix : 主次账号消息框展示、审批记录优化、头像框组件优化 2024-06-21 18:35:30 +08:00
2a80c8df21 fix : 修复项目归档开启/关闭上传文件二次确认 2024-06-21 17:17:35 +08:00
4bee8bf9e4 fix : 修复项目实施/归档上传附件显示, 2024-06-21 17:15:01 +08:00
efe1be3929 Merge pull request 'dj' (#375) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/375
2024-06-21 07:31:37 +00:00
bce9b2d8d2 fix : 修复导出表格宽度 2024-06-21 15:31:06 +08:00
b73b9aad4b fix : 分摊汇总表格及小计导出 2024-06-21 15:22:22 +08:00
8a9fffb3d0 Merge pull request 'fix : 移除输出log' (#373) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/373
2024-06-21 05:03:07 +00:00
9b758d41d0 fix : 移除输出log 2024-06-21 13:02:55 +08:00
9a3bfc784e Merge pull request 'fix : 审批记录优化' (#371) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/371
2024-06-21 04:41:58 +00:00
ddc305297f fix : 审批记录优化 2024-06-21 12:41:43 +08:00
853be5f9de Merge pull request 'dj' (#369) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/369
2024-06-21 04:33:31 +00:00
5977f13b91 fix : 修复人员选择框 2024-06-21 12:33:18 +08:00
3f26324747 fix : 修复研发人员选择框 2024-06-21 12:32:46 +08:00
141e965f95 fix : 修复研发人员选择框 2024-06-21 12:31:27 +08:00
e12dd9e5d7 Merge pull request 'dj' (#367) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/367
2024-06-21 04:30:50 +00:00
d97ea2f19e Merge remote-tracking branch 'origin/master' 2024-06-21 12:30:31 +08:00
e3664314d0 fix : 修复所属公司选择框细节 2024-06-21 12:30:19 +08:00
bfc38d035f Merge pull request 'dj' (#365) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/365
2024-06-21 04:23:54 +00:00
cef8530a5b fix : 固定所属公司选择条数为14则隐藏 2024-06-21 12:23:25 +08:00
a6476c359d fix : 审批记录样式优化, 上传费用,新增分摊输入框宽度固定 2024-06-20 16:55:15 +08:00
57f27c2b84 fix : 修复专项资金/费用分摊,编辑,审批记录展示 2024-06-20 15:08:12 +08:00
4c8959e3c4 fix : 修复专项资金/费用分摊,编辑,审批记录展示 2024-06-20 14:39:24 +08:00
clay
a1064f6111 Merge pull request 'fix : 修复分摊明细/汇总导出' (#363) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/363
2024-06-19 19:25:23 +00:00
255dbe67e0 fix : 修复分摊明细/汇总导出 2024-06-20 03:24:58 +08:00
994e474532 feat: 分摊明细异构表格数据对接 + 分摊明细异构表格excel导出 2024-06-20 02:27:42 +08:00
f3e8e12a5a fix : 右上角用户展示样式优化 2024-06-19 11:53:50 +08:00
4289ab2709 fix : 右上角用户展示样式优化 2024-06-19 11:52:07 +08:00
a9dfa26b0d fix : 修改首页待办数量 2024-06-19 11:44:30 +08:00
lilinyuan
c0bfbbfe65 fix: user 暂存 2024-06-19 11:26:01 +08:00
lilinyuan
f812b4af4d feat: 新增table获取数据总量方法 2024-06-19 11:25:50 +08:00
94bb4ce943 Merge pull request 'dj' (#360) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/360
2024-06-18 19:07:21 +00:00
7ad99048f4 fix : 修改右上角用户样式 2024-06-19 03:07:06 +08:00
0eba2c45f5 fix : 修改右上角用户样式 2024-06-19 03:03:29 +08:00
6f33aa1114 fix : 修改用户切换样式 2024-06-19 02:56:00 +08:00
clay
4f8a27e518 Merge remote-tracking branch 'origin/master' 2024-06-19 01:26:31 +08:00
clay
59014f6367 feat : 用户账号切换 2024-06-19 01:26:24 +08:00
20825fee23 Merge pull request 'fix : 修改人员选择框细节' (#359) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/359
2024-06-18 16:08:18 +00:00
bd1393d41c fix : 修改人员选择框细节 2024-06-19 00:08:09 +08:00
a3ac29b28b Merge pull request 'fix : 前置流程回显' (#358) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/358
2024-06-18 16:03:27 +00:00