Commit Graph

936 Commits

Author SHA1 Message Date
94913d558d Merge pull request 'dd' (#464) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/464
2024-07-03 13:31:21 +00:00
9a789db8a7 fix : 修复分摊编辑传参问题 2024-07-03 21:31:05 +08:00
0f0fa0f4e0 fix : 修复研究人员每行的回显 2024-07-03 20:47:47 +08:00
212cbbcb78 Merge pull request 'fix : 修复征集公司回显,所属公司改为征集公司' (#462) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/462
2024-07-03 11:40:08 +00:00
9edf5d484f fix : 修复征集公司回显,所属公司改为征集公司 2024-07-03 19:39:53 +08:00
3bae1d1cc0 Merge pull request 'feat : 优化指定用户时该用户的矩阵状态检查' (#460) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/460
2024-07-03 06:10:26 +00:00
f26a29338a feat : 优化指定用户时该用户的矩阵状态检查 2024-07-03 14:10:10 +08:00
509b216e4c Merge pull request 'feat : 优化指定用户时该用户的矩阵状态检查' (#458) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/458
2024-07-03 05:30:20 +00:00
bffa726cbf feat : 优化指定用户时该用户的矩阵状态检查 2024-07-03 13:30:01 +08:00
a7fb633b89 feat : 优化指定用户时该用户的矩阵状态检查 2024-07-03 01:46:13 +08:00
b1ac328d9d Revert "feat : 优化指定用户时该用户的矩阵状态检查"
This reverts commit d2ddf378bf.
2024-07-03 01:45:10 +08:00
faaeb7be2b Merge remote-tracking branch 'origin/master' 2024-07-03 01:44:38 +08:00
d2ddf378bf feat : 优化指定用户时该用户的矩阵状态检查 2024-07-03 01:44:28 +08:00
c97798696a Merge pull request 'fix : 修复提交校验' (#455) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/455
2024-07-02 16:38:36 +00:00
0d7c303397 fix : 修复提交校验 2024-07-03 00:38:21 +08:00
zhangkaihuai
3d9db30ba3 Merge remote-tracking branch 'origin/master' 2024-07-02 23:58:49 +08:00
66be60d011 Merge pull request 'fix : 调整头部icon,删除没用的代码' (#453) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/453
2024-07-01 12:53:12 +00:00
928f41112c fix : 调整头部icon,删除没用的代码 2024-07-01 20:53:03 +08:00
9d55358d73 Merge pull request 'fix : 调整头部icon,删除没用的代码' (#451) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/451
2024-07-01 10:56:40 +00:00
2fd2d1d25b fix : 调整头部icon,删除没用的代码 2024-07-01 18:56:16 +08:00
daa76ada6e Merge pull request 'fix : 调整部门管理演示,优化移动端详情' (#449) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/449
2024-06-30 14:49:59 +00:00
09e2bfc605 fix : 调整部门管理演示,优化移动端详情 2024-06-30 22:49:37 +08:00
cae3746a7b Merge pull request 'fix : 新增分摊/上传费用输入框显示问题' (#447) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/447
2024-06-30 13:28:56 +00:00
47a5cd3338 fix : 新增分摊/上传费用输入框显示问题 2024-06-30 21:28:46 +08:00
51d2e8357b Merge pull request 'fix : "科研管理平台" 标题放开' (#445) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/445
2024-06-30 13:09:24 +00:00
d87027423e fix : "科研管理平台" 标题放开 2024-06-30 21:08:56 +08:00
592bba132e Merge pull request 'fix : 调整费用分摊,表格更新人员回显' (#443) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/443
2024-06-30 12:50:39 +00:00
a7b898fe48 fix : 调整费用分摊,表格更新人员回显 2024-06-30 20:43:08 +08:00
3c494d038e Merge pull request 'fix : 调整台账显示信息' (#441) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/441
2024-06-30 12:10:05 +00:00
c226715097 fix : 调整台账显示信息 2024-06-30 20:09:53 +08:00
3ba97bca2d Merge pull request 'fix : 调整台账显示信息' (#439) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/439
2024-06-30 12:04:04 +00:00
7daa4b676d fix : 调整台账显示信息 2024-06-30 20:03:31 +08:00
zhangkaihuai
88198a62b2 Merge remote-tracking branch 'origin/master' 2024-06-30 19:33:03 +08:00
a07bc1cc1c Merge remote-tracking branch 'origin/master' 2024-06-30 19:18:04 +08:00
fd3231db4d fix : 添加征集详情 2024-06-30 19:17:56 +08:00
d011dc4008 Merge pull request 'fix : 优化分摊汇总项目阶段显示' (#437) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/437
2024-06-30 09:21:10 +00:00
e43213d9a7 fix : 优化分摊汇总项目阶段显示 2024-06-30 17:21:00 +08:00
zhangkaihuai
9fbfa918e9 Merge remote-tracking branch 'origin/master' 2024-06-30 17:16:34 +08:00
04fa4bc334 Merge pull request 'fix : 优化阶段变更详情/项目编辑界面' (#435) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/435
2024-06-30 08:43:36 +00:00
c89f4db529 fix : 优化阶段变更详情/项目编辑界面 2024-06-30 16:43:21 +08:00
zhangkaihuai
7a49a23128 Merge remote-tracking branch 'origin/master' 2024-06-30 15:54:18 +08:00
7b18a92a26 Merge pull request 'fix : 优化移动端详情界面' (#433) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/433
2024-06-29 17:22:58 +00:00
6434605c7a fix : 优化移动端详情界面 2024-06-30 01:22:29 +08:00
c8eea20196 Merge pull request 'dd' (#431) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/431
2024-06-29 16:10:56 +00:00
87613e8113 fix : 优化移动端详情界面 2024-06-30 00:10:42 +08:00
80aef38e7a fix : 优化移动端详情界面 2024-06-30 00:00:16 +08:00
14ce31262d Merge pull request 'fix : 优化页面细节' (#430) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/430
2024-06-29 15:18:01 +00:00
2e9adb3248 fix : 优化页面细节 2024-06-29 23:17:47 +08:00
68b954a21e Merge pull request 'fix : 修复项目详情单个文件回显' (#428) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/428
2024-06-29 14:46:50 +00:00
1e4397b5ea fix : 修复项目详情单个文件回显 2024-06-29 22:46:37 +08:00