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

1341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
b3c3156a08 Merge pull request 'master' (#650) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/650
 2024-08-03 05:22:06 +00:00
odjbin
76d4254f5e Merge pull request 'fix : 需求上报详情加上项目影响, 需求/征集/阶段变更/分摊/专项资金/项目立项/验收/结项编辑加上审批记录, 新增时审批记录加上空提示' (#649) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/649
 2024-08-03 05:21:54 +00:00
odjbin
31928abbd1 fix : 需求上报详情加上项目影响, 需求/征集/阶段变更/分摊/专项资金/项目立项/验收/结项编辑加上审批记录, 新增时审批记录加上空提示 2024-08-03 13:21:18 +08:00
odjbin
df349f1480 Merge pull request 'master' (#648) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/648
 2024-08-02 16:39:43 +00:00
odjbin
15ec2d909c Merge pull request 'fix : 修复部门分管领导回显,需求上报排版' (#647) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/647
 2024-08-02 16:39:28 +00:00
odjbin
fbfbe5c328 fix : 修复部门分管领导回显,需求上报排版 2024-08-03 00:36:51 +08:00
odjbin
067ff09c73 Merge pull request 'master' (#646) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/646
 2024-08-02 11:42:37 +00:00
odjbin
36e76b15b9 Merge pull request 'dd' (#645) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/645
 2024-08-02 11:42:22 +00:00
odjbin
6e612e1f7a fix : 修复抄送节点 2024-08-02 19:41:51 +08:00
odjbin
9b698cfdb3 Merge remote-tracking branch 'origin/master' 2024-08-02 19:39:02 +08:00
clay
45e0bf3c6c Merge pull request 'feat : 抄送和if判断' (#644) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/644
 2024-08-02 11:37:35 +00:00
clay
5111897d13 feat : 抄送和if判断 2024-08-02 19:36:37 +08:00
odjbin
38631df3f9 fix : 修复编辑流程访问接口 2024-08-02 00:09:19 +08:00
odjbin
1e41101f9b Merge pull request 'master' (#643) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/643
 2024-08-01 14:16:57 +00:00
odjbin
36bb362fd7 Merge pull request 'fix : 修复页面排版及项目管理的公司查询' (#642) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/642
 2024-08-01 14:16:45 +00:00
odjbin
2f42a7464a fix : 修复页面排版及项目管理的公司查询 2024-08-01 22:16:30 +08:00
odjbin
db2f0d8daf Merge pull request 'master' (#641) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/641
 2024-08-01 09:01:27 +00:00
odjbin
ff668b1887 Merge pull request 'fix : 表格前方加上序号' (#640) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/640
 2024-08-01 09:01:18 +00:00
odjbin
a4f94099af fix : 表格前方加上序号 2024-08-01 17:00:48 +08:00
odjbin
96bcb30868 Merge pull request 'master' (#639) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/639
 2024-07-26 17:22:27 +00:00
odjbin
40de9f0a4c Merge pull request 'fix : word表格预览手机端宽度适配' (#638) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/638
 2024-07-26 17:22:11 +00:00
odjbin
d265ef5a32 fix : word表格预览手机端宽度适配 2024-07-27 01:18:05 +08:00
odjbin
a21f061589 Merge pull request 'feat : 台账模板下载' (#637) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/637
 2024-07-26 11:46:21 +00:00
odjbin
58c3419b35 feat : 台账模板下载 2024-07-26 19:46:06 +08:00
odjbin
5a443bfab9 Merge pull request 'master' (#636) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/636
 2024-07-25 16:12:20 +00:00
odjbin
d92bcfe0aa Merge pull request 'fix : 多图片格式预览' (#635) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/635
 2024-07-25 16:12:10 +00:00
odjbin
055310b6e7 fix : 多图片格式预览 2024-07-26 00:11:44 +08:00
odjbin
55782df345 Merge pull request 'master' (#634) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/634
 2024-07-25 15:14:42 +00:00
odjbin
e0e5111f32 Merge pull request 'fix : 取消需求上报单文件权限' (#633) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/633
 2024-07-25 15:14:30 +00:00
odjbin
4acd0cbab1 fix : 取消需求上报单文件权限 2024-07-25 23:14:20 +08:00
odjbin
925b4a2eb4 Merge pull request 'master' (#632) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/632
 2024-07-25 14:48:39 +00:00
odjbin
39cb9400f6 Merge pull request 'fix : 修复抄送人回显及取消箭头' (#631) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/631
 2024-07-25 14:10:27 +00:00
odjbin
c6ddba8702 fix : 修复抄送人回显及取消箭头 2024-07-25 22:10:08 +08:00
clay
0fe2bb42ae Merge remote-tracking branch 'origin/master' 2024-07-25 21:24:34 +08:00
clay
e0b937fce9 feat : 抄送 2024-07-25 21:24:26 +08:00
odjbin
6f505ba281 Merge pull request 'master' (#630) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/630
 2024-07-25 11:36:35 +00:00
odjbin
c740929622 Merge pull request 'feat : 需求上报,项目立项,验收加上分管领导选择' (#629) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/629
 2024-07-25 11:36:16 +00:00
odjbin
8901053fd6 feat : 需求上报,项目立项,验收加上分管领导选择 2024-07-25 19:36:06 +08:00
odjbin
15689dfbc1 Merge pull request 'fix : 修复编辑需求征集, 所有公司回显' (#628) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/628
 2024-07-25 09:44:32 +00:00
odjbin
ea660fff65 fix : 修复编辑需求征集, 所有公司回显 2024-07-25 17:44:22 +08:00
odjbin
303e981a0c Merge pull request 'fix : 修复费用台账公司搜索,项目管理前置流程逗号分隔' (#627) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/627
 2024-07-25 09:09:23 +00:00
odjbin
bab9597739 fix : 修复费用台账公司搜索,项目管理前置流程逗号分隔 2024-07-25 17:09:05 +08:00
odjbin
1430b1eae7 Merge pull request 'master' (#626) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/626
 2024-07-24 16:53:36 +00:00
odjbin
45104ecc87 Merge pull request 'fix : 修复流程图icon显示' (#625) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/625
 2024-07-24 16:53:19 +00:00
odjbin
6bb55520cf fix : 修复流程图icon显示 2024-07-25 00:52:51 +08:00
odjbin
95b2193393 Merge pull request 'master' (#624) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/624
 2024-07-24 16:38:26 +00:00
odjbin
74d2033857 Merge pull request 'fix : 修复项目归档切换问题' (#623) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/623
 2024-07-24 16:38:17 +00:00
odjbin
8e8116e869 fix : 修复项目归档切换问题 2024-07-25 00:38:00 +08:00
odjbin
7df05a46f2 Merge pull request 'master' (#622) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/622
 2024-07-24 14:31:12 +00:00
odjbin
5754709a21 Merge pull request 'fix : 修复审核意见显示' (#621) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/621
 2024-07-24 14:30:38 +00:00