Commit Graph

1325 Commits

Author SHA1 Message Date
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
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
a4f94099af fix : 表格前方加上序号 2024-08-01 17:00:48 +08:00
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
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
d265ef5a32 fix : word表格预览手机端宽度适配 2024-07-27 01:18:05 +08:00
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
58c3419b35 feat : 台账模板下载 2024-07-26 19:46:06 +08:00
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
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
055310b6e7 fix : 多图片格式预览 2024-07-26 00:11:44 +08:00
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
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
4acd0cbab1 fix : 取消需求上报单文件权限 2024-07-25 23:14:20 +08:00
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
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
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
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
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
8901053fd6 feat : 需求上报,项目立项,验收加上分管领导选择 2024-07-25 19:36:06 +08:00
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
ea660fff65 fix : 修复编辑需求征集, 所有公司回显 2024-07-25 17:44:22 +08:00
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
bab9597739 fix : 修复费用台账公司搜索,项目管理前置流程逗号分隔 2024-07-25 17:09:05 +08:00
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
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
6bb55520cf fix : 修复流程图icon显示 2024-07-25 00:52:51 +08:00
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
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
8e8116e869 fix : 修复项目归档切换问题 2024-07-25 00:38:00 +08:00
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
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
614bd328d1 fix : 修复审核意见显示 2024-07-24 22:29:53 +08:00
cc322f3352 Merge pull request 'fix : 还原drone.yml文件' (#620) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/620
2024-07-24 14:10:10 +00:00
328c75b2e4 fix : 还原drone.yml文件 2024-07-24 22:09:57 +08:00
d6f53a69da Merge pull request 'fix : 下载新依赖' (#619) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/619
2024-07-24 13:50:51 +00:00
1716a3a562 fix : 下载新依赖 2024-07-24 21:50:31 +08:00
b5933a9016 Merge pull request 'master' (#618) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/618
2024-07-24 13:43:19 +00:00
5048c638b8 Merge remote-tracking branch 'origin/master' 2024-07-24 21:43:02 +08:00
b4e9359165 fix : 下载新依赖 2024-07-24 21:42:53 +08:00
24f4a4a498 Merge pull request 'master' (#617) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/617
2024-07-24 13:41:16 +00:00
42befadca5 Merge pull request 'fix : 下载新依赖' (#616) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/616
2024-07-24 13:40:53 +00:00
da2721ca56 fix : 下载新依赖 2024-07-24 21:40:29 +08:00
19db2667c2 Merge pull request 'master' (#615) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/615
2024-07-24 13:32:55 +00:00
291f91bc61 Merge pull request 'fix : 下载新依赖' (#614) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/614
2024-07-24 13:32:45 +00:00
0c1aa248d5 fix : 下载新依赖 2024-07-24 21:32:33 +08:00
f617b815a1 Merge pull request 'master' (#613) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/613
2024-07-24 13:22:31 +00:00
a13006d630 Merge pull request 'fix : 修复专项资金文件预览,优化上报前置流程展示' (#612) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/612
2024-07-24 13:22:14 +00:00