Commit Graph

654 Commits

Author SHA1 Message Date
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
da49b51b3d fix : 前置流程回显 2024-06-19 00:02:38 +08:00
fbd6c3695d Merge pull request 'dj' (#357) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/357
2024-06-18 15:55:54 +00:00
aa15e9b8d0 fix : 前置流程多选 2024-06-18 23:55:40 +08:00
91f21409f6 fix : 前置流程多选 2024-06-18 23:46:24 +08:00
820349877c fix : 修复需求征集编辑时所属公司回显,项目阶段改成研发阶段,人员选择器主子账号颜色区分 2024-06-18 23:11:27 +08:00
clay
5410b6d248 feat : 菜单与公司选择组件修改 2024-06-18 22:24:50 +08:00
369647f64f Merge pull request 'fix : 修复需求征集/汇总/费用台账页面搜索细节' (#356) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/356
2024-06-18 14:19:02 +00:00
3745c9cb28 fix : 修复需求征集/汇总/费用台账页面搜索细节 2024-06-18 22:18:35 +08:00
45a6b6733f Merge pull request 'fix : 修复列表左侧选择框,及正确json格式' (#355) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/355
2024-06-18 13:27:22 +00:00
6ab1dc806e fix : 修复列表左侧选择框,及正确json格式 2024-06-18 21:27:03 +08:00
a678420f4f Merge pull request 'fix : 修改征集类型为字典、直接上报时详情专项资金回显、项目归档-需求征集文件回显、重大项目前置流程必填' (#353) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/353
2024-06-18 12:43:17 +00:00
5100281c1f fix : 修改征集类型为字典、直接上报时详情专项资金回显、项目归档-需求征集文件回显、重大项目前置流程必填 2024-06-18 20:43:02 +08:00
3a79c85033 Merge pull request 'fix : 修复所属公司选择框右侧的删除功能' (#352) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/352
2024-06-18 08:45:40 +00:00
df513a91fe fix : 修复所属公司选择框右侧的删除功能 2024-06-18 16:45:19 +08:00
lilinyuan
506c794c5d fix: 多标签页bug 2024-06-18 16:09:21 +08:00
1c908017bb Merge pull request 'fix : 修复上传费用输入框垂直居中、台账时间搜索' (#349) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/349
2024-06-17 03:40:03 +00:00
9cbe89007d fix : 修复上传费用输入框垂直居中、台账时间搜索 2024-06-17 11:39:34 +08:00
132ab60d0f Merge pull request 'fix : 修复新增费用分摊输入框垂直居中' (#347) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/347
2024-06-16 13:41:33 +00:00
0c36801e83 fix : 修复新增费用分摊输入框垂直居中 2024-06-16 21:41:20 +08:00
f187e7c5b1 Merge pull request 'fix : 修复费用分摊时间搜索' (#346) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/346
2024-06-16 13:08:13 +00:00
b162bb8977 fix : 修复费用分摊时间搜索 2024-06-16 21:08:04 +08:00
75664822e4 Merge pull request 'fix : 修复项目费用显示bug' (#344) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/344
2024-06-16 12:35:12 +00:00
009d73ce86 fix : 修复项目费用显示bug 2024-06-16 20:34:46 +08:00
33a90e59f6 Merge pull request 'fix : 修改所属公司选择框bug' (#342) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/342
2024-06-16 11:50:30 +00:00
63107ece02 fix : 修改所属公司选择框bug 2024-06-16 19:50:17 +08:00
a75c2dd0fa Merge pull request 'fix : 流程图位置更换' (#341) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/341
2024-06-16 11:36:30 +00:00
d1a8077eea fix : 流程图位置更换 2024-06-16 19:34:08 +08:00
46e67f30a0 Merge pull request 'dj' (#339) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/339
2024-06-16 10:07:18 +00:00
7ffb689927 fix : 修复所属公司选择框 2024-06-16 18:06:53 +08:00
79171758f5 fix : 修复需求汇总重新提交专项资金参数回传 2024-06-16 15:41:38 +08:00
61a999758e fix : 修复默认矩阵审批 2024-06-15 18:02:32 +08:00
f624b4d290 Merge pull request 'fix : 修复公司选择框全选功能' (#337) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/337
2024-06-14 16:47:29 +00:00
9153c20902 fix : 修复公司选择框全选功能 2024-06-15 00:47:17 +08:00
5fdcf42336 Merge pull request 'fix : 修复阶段变更中抄送人员回显' (#335) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/335
2024-06-14 15:26:51 +00:00
73313a1532 fix : 修复阶段变更中抄送人员回显 2024-06-14 23:26:38 +08:00
21cfe73a13 Merge pull request 'fix : 修复新增需求征集所属公司选择弹框' (#333) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/333
2024-06-14 15:18:10 +00:00
532ef440ce fix : 修复新增需求征集所属公司选择弹框 2024-06-14 23:17:32 +08:00
2ff0dbd2a4 Merge pull request 'fix : 修复项目实施台账字典问题' (#331) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/331
2024-06-14 06:01:59 +00:00
58cbceb747 fix : 修复项目实施台账字典问题 2024-06-14 14:01:41 +08:00
49b64c177f Merge pull request 'fix : 修复费用分摊复制功能、数字框默认值为null、项目归档显示是哪个流程的上传附件' (#329) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/329
2024-06-14 05:04:56 +00:00