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

1500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
odjbin
bc2c77ff34 fix : 修改打印范围 2024-08-26 20:18:21 +08:00
odjbin
99c93dd582 Merge pull request 'master' (#727) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/727
 2024-08-19 16:57:05 +00:00
odjbin
741187c129 Merge pull request 'fix : 修复公司/人员选择框bug' (#726) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/726
 2024-08-19 16:56:37 +00:00
odjbin
8f9d5eb37b fix : 修复公司/人员选择框bug 2024-08-20 00:56:12 +08:00
odjbin
f0e25b21d3 Merge pull request 'master' (#725) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/725
 2024-08-18 03:13:08 +00:00
odjbin
1541482e76 Merge pull request 'fix : 修复用户管理,角色管理提交时, 一直loading的bug' (#724) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/724
 2024-08-18 03:12:56 +00:00
odjbin
ce2d39e3bf fix : 修复用户管理,角色管理提交时, 一直loading的bug 2024-08-18 11:12:26 +08:00
odjbin
d229f957e5 Merge pull request 'master' (#723) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/723
 2024-08-17 03:27:40 +00:00
odjbin
6d0a1940fc Merge pull request 'feat : 表格分页时序号连续' (#722) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/722
 2024-08-17 03:25:16 +00:00
odjbin
b6b1c8a3ff feat : 表格分页时序号连续 2024-08-17 11:24:43 +08:00
odjbin
4a52ab51df Merge pull request 'master' (#721) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/721
 2024-08-17 02:41:10 +00:00
odjbin
9ecabb8f69 Merge pull request 'fix : 修复人员选择框取消功能' (#720) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/720
 2024-08-17 02:40:59 +00:00
odjbin
09c51f13fc fix : 修复人员选择框取消功能 2024-08-17 10:40:46 +08:00
odjbin
a6ee226073 Merge pull request 'master' (#719) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/719
 2024-08-16 16:13:48 +00:00
odjbin
968eebaa2b Merge pull request 'fix : 修复人员取消功能' (#718) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/718
 2024-08-16 16:13:39 +00:00
odjbin
7637608226 fix : 修复人员取消功能 2024-08-17 00:13:17 +08:00
odjbin
db720f6d1b Merge pull request 'master' (#717) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/717
 2024-08-13 15:07:24 +00:00
odjbin
26ed532684 Merge pull request 'fix : 优化新增分摊,新增专项资金及详情间距,年度计划详情间距' (#716) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/716
 2024-08-13 15:07:14 +00:00
odjbin
2e101d1017 fix : 优化新增分摊,新增专项资金及详情间距,年度计划详情间距 2024-08-13 23:06:59 +08:00
odjbin
abda409817 Merge pull request 'master' (#715) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/715
 2024-08-13 10:03:41 +00:00
odjbin
cb2fe73481 Merge pull request 'fix : 修复项目实施/归档上传附件表格高度,完善归档附件/上传附件时的文件预览' (#714) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/714
 2024-08-13 10:03:32 +00:00
odjbin
c1bba811b9 fix : 修复项目实施/归档上传附件表格高度,完善归档附件/上传附件时的文件预览 2024-08-13 18:01:44 +08:00
odjbin
1183be2987 Merge pull request 'master' (#713) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/713
 2024-08-13 09:21:45 +00:00
odjbin
11598c507b Merge pull request 'dd' (#712) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/712
 2024-08-13 09:21:36 +00:00