odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,524 Commits 11 Branches 0 Tags
b7ebe7e3b9d668965844498908b220687729b007
Commit Graph

1524 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
b7ebe7e3b9 Merge pull request 'master' (#760) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/760
 2024-09-11 16:49:00 +00:00
odjbin
3fb35e085c Merge pull request 'feat : 首页' (#759) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/759
 2024-09-11 16:48:51 +00:00
odjbin
f2b1cad505 feat : 首页 2024-09-12 00:48:34 +08:00
odjbin
e2e4f47c60 Merge pull request 'master' (#758) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/758
 2024-09-10 05:17:25 +00:00
odjbin
87d4633b18 Merge pull request 'fix : 移除多余的>' (#757) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/757
 2024-09-10 05:16:11 +00:00
odjbin
2fdbc144a6 fix : 移除多余的> 2024-09-10 13:15:49 +08:00
odjbin
c43ea8be87 Merge pull request 'master' (#756) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/756
 2024-09-08 12:51:36 +00:00
odjbin
e52efa0a45 Merge pull request 'fix : 修复上传两个文件之后删除一个文件报错问题,分摊研发人员clearable, 修复表格更新项目时间展示问题' (#755) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/755
 2024-09-08 12:51:24 +00:00
odjbin
3c6a8bedc2 fix : 修复上传两个文件之后删除一个文件报错问题,分摊研发人员clearable, 修复表格更新项目时间展示问题 2024-09-08 20:51:11 +08:00
odjbin
a0906ed5c7 Merge pull request 'master' (#754) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/754
 2024-09-08 11:39:22 +00:00
odjbin
a9cfa60b36 Merge pull request 'fix : 修复用户切换时,报错提示' (#753) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/753
 2024-09-08 11:39:13 +00:00
odjbin
09cef9de33 fix : 修复用户切换时,报错提示 2024-09-08 19:38:34 +08:00
odjbin
c884333fc1 Merge pull request 'master' (#752) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/752
 2024-09-07 10:23:16 +00:00
odjbin
8274f9f186 Merge pull request 'fix : 修复文件不能预览时的提示' (#751) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/751
 2024-09-07 10:23:07 +00:00
odjbin
b90d3bc466 fix : 修复文件不能预览时的提示 2024-09-07 18:22:54 +08:00
odjbin
e4094dcd73 Merge pull request 'master' (#750) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/750
 2024-09-07 07:10:35 +00:00
odjbin
e99d217d34 Merge pull request 'fix : 修复金额千位格式化,新增征集时添加"新增专项资金"按钮' (#749) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/749
 2024-09-07 07:10:25 +00:00
odjbin
fc41bd8e6d fix : 修复金额千位格式化,新增征集时添加"新增专项资金"按钮 2024-09-07 15:09:37 +08:00
odjbin
5640978025 Merge pull request 'master' (#748) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/748
 2024-08-28 14:57:41 +00:00
odjbin
cff3198dcd Merge pull request 'fix : 修复项目实施-归档列表页附件项目实施/验收展示及上传附件功能,修复需求上报资金名称传参' (#747) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/747
 2024-08-28 14:57:33 +00:00
odjbin
d4d7601bae fix : 修复项目实施-归档列表页附件项目实施/验收展示及上传附件功能,修复需求上报资金名称传参 2024-08-28 22:57:08 +08:00
odjbin
6018cd6838 Merge pull request 'master' (#746) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/746
 2024-08-28 09:31:13 +00:00
odjbin
1ce0bf708b Merge pull request 'fix : 修复人员选择框取消功能' (#745) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/745
 2024-08-28 09:31:04 +00:00
odjbin
060f6e0fd8 fix : 修复人员选择框取消功能 2024-08-28 17:30:45 +08:00
odjbin
7e110dd656 Merge pull request 'master' (#744) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/744
 2024-08-28 06:31:17 +00:00
odjbin
4d5f163f17 Merge pull request 'fix : 修复费用分摊新增输入框宽度显示' (#743) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/743
 2024-08-28 06:31:09 +00:00
odjbin
f4a1e3e932 fix : 修复费用分摊新增输入框宽度显示 2024-08-28 14:30:49 +08:00
odjbin
195cc714ab Merge pull request 'master' (#742) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/742
 2024-08-28 06:19:33 +00:00
odjbin
43211d6f0c Merge pull request 'fix : 详情修改为一个文件上传入口及测试校验,同步移动端详情展示' (#741) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/741
 2024-08-28 06:19:15 +00:00
odjbin
d59c9d8cca fix : 详情修改为一个文件上传入口及测试校验,同步移动端详情展示 2024-08-28 14:18:55 +08:00
odjbin
8d731ff7c5 Merge pull request 'fix : 修改为一个文件上传入口, 阶段变更增加变更状态,修复项目实施显示' (#740) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/740
 2024-08-27 14:29:12 +00:00
odjbin
50504f4e94 fix : 修改为一个文件上传入口, 阶段变更增加变更状态,修复项目实施显示 2024-08-27 22:28:52 +08:00
odjbin
37ee6af0e5 Merge pull request 'master' (#739) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/739
 2024-08-27 02:41:06 +00:00
odjbin
5362a47d1e Merge pull request 'fix : 修复项目实施展示' (#738) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/738
 2024-08-27 02:40:57 +00:00
odjbin
a1a3c0ac9f fix : 修复项目实施展示 2024-08-27 10:40:35 +08:00
odjbin
f22e14b1ba Merge pull request 'master' (#737) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/737
 2024-08-26 15:10:31 +00:00
odjbin
5d44bae1c3 Merge pull request 'fix : 修复项目实施序号对齐' (#736) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/736
 2024-08-26 15:10:17 +00:00
odjbin
4d78debb92 fix : 修复项目实施序号对齐 2024-08-26 23:10:01 +08:00
odjbin
93d69861bf Merge pull request 'master' (#735) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/735
 2024-08-26 14:53:02 +00:00
odjbin
936f5dbf4c Merge pull request 'fix : 修复项目实施步骤显示' (#734) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/734
 2024-08-26 14:52:54 +00:00
odjbin
d4e7503306 fix : 修复项目实施步骤显示 2024-08-26 22:52:37 +08:00
odjbin
81c24023e9 Merge pull request 'master' (#733) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/733
 2024-08-26 14:14:15 +00:00
odjbin
d1a20fbad1 Merge pull request 'fix : 修复人员选择/公司选择bug' (#732) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/732
 2024-08-26 14:14:06 +00:00
odjbin
6e8f2328c6 fix : 修复人员选择/公司选择bug 2024-08-26 22:13:06 +08:00
odjbin
83e780c17d Merge pull request 'master' (#731) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/731
 2024-08-26 12:56:38 +00:00
odjbin
251fdf7989 Merge pull request 'fix : 修改打印范围, 详情增加项目实施模块' (#730) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/730
 2024-08-26 12:56:27 +00:00
odjbin
30d1664a9b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/components/steps/index.vue
 2024-08-26 20:56:12 +08:00
odjbin
2173cd1cf1 fix : 修改打印范围, 详情增加项目实施模块 2024-08-26 20:52:54 +08:00
odjbin
298d298dc5 Merge pull request 'master' (#729) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/729
 2024-08-26 12:18:57 +00:00
odjbin
9557e8595d Merge pull request 'fix : 修改打印范围' (#728) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/728
 2024-08-26 12:18:47 +00:00