Commit Graph

1257 Commits

Author SHA1 Message Date
84e5c2dd7e Merge pull request 'master' (#607) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/607
2024-07-23 05:28:54 +00:00
ad7ca888a9 Merge pull request 'dd' (#606) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/606
2024-07-23 05:28:39 +00:00
838f2edf7e fix : 数据预览时左对齐 2024-07-22 23:06:20 +08:00
3c1fcc327c fix : 征集公司校验,单文件显示改为表格,手机端审批后刷新,需求征集回车触发搜索,组织机构管理搜索 2024-07-22 20:39:26 +08:00
clay
9a66c333c7 Merge pull request 'master' (#605) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/605
2024-07-19 06:23:35 +00:00
clay
ae6da83a1a feat : 科创部直接跳过审批节点 2024-07-19 14:23:00 +08:00
clay
bd01e4c94b feat : 科创部直接跳过审批节点 2024-07-19 14:22:17 +08:00
lilinyuan
9783ca8506 feat: 表单组件添加回车事件 2024-07-19 11:10:51 +08:00
3580fb41f3 Merge pull request 'feat : 部门副职用户选择框无法弹出' (#604) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/604
2024-07-19 02:11:13 +00:00
clay
264f6283dc feat : 部门副职用户选择框无法弹出 2024-07-19 10:07:39 +08:00
dc822bba07 Merge pull request 'master' (#603) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/603
2024-07-18 17:54:35 +00:00
acf261b58b Merge pull request 'feat : 台账导入' (#602) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/602
2024-07-18 17:54:19 +00:00
fde9ba3781 feat : 台账导入 2024-07-19 01:53:51 +08:00
1db5d4b11f Merge pull request 'master' (#601) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/601
2024-07-18 17:06:06 +00:00
04a65c6932 Merge pull request 'dd' (#600) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/600
2024-07-18 16:43:39 +00:00
e9333f7859 feat : 台账导入 2024-07-19 00:43:11 +08:00
0a2004e3ce feat : 台账导入 2024-07-19 00:41:15 +08:00
1ca25d8ec4 Merge pull request 'master' (#599) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/599
2024-07-18 14:56:29 +00:00
b69a147c61 Merge pull request 'feat : 台账导入' (#598) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/598
2024-07-18 14:56:21 +00:00
5deae5d846 feat : 台账导入 2024-07-18 22:56:08 +08:00
a9c7977347 Merge pull request 'master' (#597) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/597
2024-07-18 14:07:11 +00:00
c2c60d01af Merge pull request 'fix : 修复页面bug' (#596) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/596
2024-07-18 14:06:59 +00:00
9d5c393ebe fix : 修复页面bug 2024-07-18 22:06:23 +08:00
3c471b1124 Merge pull request 'master' (#595) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/595
2024-07-18 09:49:25 +00:00
3ec7a9c78e Merge pull request 'dd' (#594) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/594
2024-07-18 09:49:11 +00:00
5dc25d1480 fix : 项目实施台账刷新 2024-07-18 17:48:56 +08:00
ad3e7479f4 fix : 项目实施台账时间搜索 2024-07-18 17:33:54 +08:00
2b94151780 Merge pull request 'master' (#593) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/593
2024-07-18 08:57:15 +00:00
c082ffc884 Merge pull request 'fix : 项目实施台账时间搜索' (#592) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/592
2024-07-18 08:56:59 +00:00
618cc8cb87 fix : 项目实施台账时间搜索 2024-07-18 16:56:38 +08:00
9088a792d1 Merge pull request 'fix : 附件上传修复' (#591) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/591
2024-07-18 08:15:27 +00:00
8e91feb616 fix : 附件上传修复 2024-07-18 16:15:11 +08:00
ff09ed8c8a Merge pull request 'fix : 附件上传修复' (#590) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/590
2024-07-18 07:22:17 +00:00
203b53936f fix : 附件上传修复 2024-07-18 15:21:41 +08:00
fdb76c31a8 Merge pull request 'master' (#589) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/589
2024-07-18 06:53:26 +00:00
f154e2789b Merge remote-tracking branch 'origin/master' 2024-07-18 14:52:23 +08:00
b4cfb8a5c6 fix : 附件上传修复 2024-07-18 14:52:06 +08:00
484efa5854 Merge pull request 'master' (#588) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/588
2024-07-18 04:27:58 +00:00
6c874cac48 Merge pull request 'fix : 修复项目立项校验' (#587) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/587
2024-07-18 04:27:39 +00:00
63eba1d0dc Merge remote-tracking branch 'origin/master' 2024-07-18 12:22:45 +08:00
094474b680 fix : 修复项目立项校验 2024-07-18 12:19:43 +08:00
0cfe4a8698 Merge pull request 'fix : 修复项目立项校验' (#586) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/586
2024-07-18 03:45:59 +00:00
60d9b958bc fix : 修复项目立项校验 2024-07-18 11:45:30 +08:00
07b3457409 Merge pull request 'master' (#585) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/585
2024-07-17 15:11:51 +00:00
1591e5d057 Merge pull request 'feat : 刷新缓存' (#584) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/584
2024-07-17 15:11:41 +00:00
0c3580768b feat : 刷新缓存 2024-07-17 23:11:26 +08:00
1150fdac86 Merge pull request 'master' (#583) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/583
2024-07-17 14:48:03 +00:00
2793a62628 Merge pull request 'feat : 刷新缓存' (#582) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/582
2024-07-17 14:47:52 +00:00
cccd370671 feat : 刷新缓存 2024-07-17 22:47:38 +08:00
930684ac01 Merge pull request 'master' (#581) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/581
2024-07-17 14:11:32 +00:00