|
|
12f6f27b1a
|
fix : 流程管理中人员回显,表格更新负责人按钮更换位置,需求汇总选择框过滤
|
2024-07-06 17:36:39 +08:00 |
|
|
|
9eebacc47a
|
Merge pull request 'fix : 修复审批记录主次账号显示, 年度计划详情显示' (#485) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/485
|
2024-07-06 07:46:35 +00:00 |
|
|
|
ddc3b70ddf
|
fix : 修复审批记录主次账号显示, 年度计划详情显示
|
2024-07-06 15:46:22 +08:00 |
|
clay
|
bd57a54931
|
fix : 矩阵审批选择自己时可以跳过自己审批
|
2024-07-06 15:05:19 +08:00 |
|
|
|
8f3d97ec1c
|
Merge pull request 'feat : 年度计划生成功能及分摊汇总导出功能' (#483) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/483
|
2024-07-05 18:21:44 +00:00 |
|
|
|
8180c248ac
|
feat : 年度计划生成功能及分摊汇总导出功能
|
2024-07-06 02:21:26 +08:00 |
|
zhangkaihuai
|
a7c1c3a483
|
Merge remote-tracking branch 'origin/master'
|
2024-07-05 09:29:40 +08:00 |
|
lilinyuan
|
fce1708f5c
|
Merge branch 'master' of http://git.feashow.cn/clay/mosr-web
|
2024-07-04 17:18:41 +08:00 |
|
lilinyuan
|
dd80659044
|
fix: 样式调整
|
2024-07-04 17:18:38 +08:00 |
|
|
|
d7de238c38
|
Merge pull request 'fix : 分摊研发人员回显' (#480) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/480
|
2024-07-04 06:13:40 +00:00 |
|
|
|
08bc318875
|
fix : 分摊研发人员回显
|
2024-07-04 14:13:26 +08:00 |
|
|
|
888f97125b
|
Merge pull request 'fix : 统一按钮颜色' (#478) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/478
|
2024-07-04 05:58:46 +00:00 |
|
|
|
c065008da0
|
fix : 统一按钮颜色
|
2024-07-04 13:58:26 +08:00 |
|
|
|
b2fdfc6227
|
Merge pull request 'fix : 流程图/人员与按钮间距' (#476) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/476
|
2024-07-04 05:08:33 +00:00 |
|
|
|
05585bb980
|
fix : 流程图/人员与按钮间距
|
2024-07-04 13:08:00 +08:00 |
|
|
|
f2863557f9
|
Merge pull request 'fix : 修复分摊编辑传参' (#474) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/474
|
2024-07-04 04:30:52 +00:00 |
|
|
|
70ffe5c1eb
|
fix : 修复分摊编辑传参
|
2024-07-04 12:30:38 +08:00 |
|
|
|
a17ab96395
|
Merge pull request 'fix : 修改所属公司->征集公司' (#472) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/472
|
2024-07-04 03:31:06 +00:00 |
|
|
|
2466e15659
|
fix : 修改所属公司->征集公司
|
2024-07-04 11:30:03 +08:00 |
|
lilinyuan
|
5c889e41c2
|
Merge branch 'master' of http://git.feashow.cn/clay/mosr-web
|
2024-07-04 10:04:31 +08:00 |
|
lilinyuan
|
8ae817ffb3
|
fix: 分页
|
2024-07-04 10:04:28 +08:00 |
|
|
|
df09fbbd38
|
Merge pull request 'fix : 人员选择框,主次账号回显' (#469) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/469
|
2024-07-03 14:58:20 +00:00 |
|
|
|
842fa7b782
|
fix : 人员选择框,主次账号回显
|
2024-07-03 22:58:01 +08:00 |
|
|
|
a8afb48cf7
|
Merge pull request 'fix : 修复更新表格' (#467) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/467
|
2024-07-03 13:52:55 +00:00 |
|
|
|
bbc883a116
|
fix : 修复更新表格
|
2024-07-03 21:52:33 +08:00 |
|
|
|
216b0d273e
|
Merge pull request 'fix : 修复台账表格最小高度' (#465) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/465
|
2024-07-03 13:40:13 +00:00 |
|
|
|
361510242c
|
fix : 修复台账表格最小高度
|
2024-07-03 21:38:51 +08:00 |
|
|
|
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 |
|
