|
|
08f86517da
|
Merge pull request 'master' (#388) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/388
|
2024-06-22 16:59:19 +00:00 |
|
|
|
5757846e7c
|
Merge pull request 'fix : 修复费用分摊详情合计bug' (#387) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/387
|
2024-06-22 16:59:07 +00:00 |
|
|
|
058421bdd7
|
fix : 修复费用分摊详情合计bug
|
2024-06-23 00:58:56 +08:00 |
|
|
|
794826f0c7
|
Merge pull request 'master' (#386) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/386
|
2024-06-22 16:39:27 +00:00 |
|
|
|
da9bf2304b
|
Merge pull request 'feat : 项目实施-台账新增表格更新功能' (#385) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/385
|
2024-06-22 16:39:16 +00: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 |
|
|
|
096fa6dc51
|
Merge pull request 'fix : 分摊详情小计与导出' (#383) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/383
|
2024-06-22 10:49:59 +00:00 |
|
|
|
2d9bba98a7
|
fix : 分摊详情小计与导出
|
2024-06-22 18:49:14 +08:00 |
|
|
|
accf65ef10
|
Merge pull request 'master' (#381) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/381
|
2024-06-22 10:46:16 +00: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 |
|
|
|
eaa8b834bf
|
Merge pull request 'master' (#380) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/380
|
2024-06-21 10:40:13 +00: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 |
|
|
|
b32ced514b
|
Merge pull request 'master' (#378) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/378
|
2024-06-21 10:36:16 +00: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 |
|
|
|
78cf7e6857
|
Merge pull request 'master' (#376) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/376
|
2024-06-21 07:31:47 +00: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 |
|
|
|
8128766e24
|
Merge pull request 'master' (#374) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/374
|
2024-06-21 05:03:17 +00: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 |
|
|
|
90a08f37f6
|
Merge pull request 'master' (#372) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/372
|
2024-06-21 04:42:08 +00: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 |
|
|
|
ad03a1ed2b
|
Merge pull request 'master' (#370) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/370
|
2024-06-21 04:33:41 +00: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 |
|
|
|
41b1bed81d
|
Merge pull request 'master' (#366) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/366
|
2024-06-21 04:24:08 +00: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
|
bc882f375f
|
Merge pull request 'master' (#364) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/364
|
2024-06-19 19:25:34 +00: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 |
|
|
|
5d23a903fc
|
Merge pull request 'master' (#362) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/362
|
2024-06-19 18:28:50 +00:00 |
|
|
|
994e474532
|
feat: 分摊明细异构表格数据对接 + 分摊明细异构表格excel导出
|
2024-06-20 02:27:42 +08:00 |
|
