Commit Graph

1408 Commits

Author SHA1 Message Date
474cf72333 Merge pull request 'master' (#685) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/685
2024-08-07 15:48:24 +00:00
433f0bc712 Merge pull request 'fix : 修改页面排版' (#684) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/684
2024-08-07 15:48:14 +00:00
e4d0b87069 fix : 修改页面排版 2024-08-07 23:47:49 +08:00
8d87e2a7a0 Merge pull request 'master' (#683) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/683
2024-08-07 15:05:09 +00:00
4b56a92444 Merge pull request 'fix : 选择框为远程搜索解决卡顿问题' (#682) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/682
2024-08-07 15:04:57 +00:00
3289e799be fix : 选择框为远程搜索解决卡顿问题 2024-08-07 23:04:46 +08:00
a7367bef2f Merge pull request 'master' (#681) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/681
2024-08-07 14:51:34 +00:00
87d3493c34 Merge pull request 'dd' (#680) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/680
2024-08-07 14:51:22 +00:00
0250e3008b fix : 选择框为远程搜索解决卡顿问题 2024-08-07 22:51:04 +08:00
cab7311cfb fix : 新增(单选框)默认否,修复需求上报业务描述换行数据显示,选择框为远程搜索解决卡顿问题 2024-08-07 22:37:41 +08:00
89603d1094 Merge pull request 'dd' (#679) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/679
2024-08-07 14:00:39 +00:00
5cdec2b677 fix : 修复详情排版 2024-08-07 21:54:46 +08:00
66746458ee Merge remote-tracking branch 'origin/master' 2024-08-07 17:03:23 +08:00
lilinyuan
892e9c01f1 fix: 修复关闭其他 后地址参数清空bug 2024-08-07 17:02:58 +08:00
203b0c9753 Merge remote-tracking branch 'origin/master' 2024-08-07 15:28:50 +08:00
d9d2d446f6 fix : 修改审批记录打印按钮左边距 2024-08-07 00:46:05 +08:00
bd37eb66a9 Merge pull request 'master' (#678) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/678
2024-08-06 10:45:57 +00:00
9ed6fc1b94 Merge pull request 'fix : 修改审批记录回退节点icon' (#677) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/677
2024-08-06 10:45:44 +00:00
74fd0a8610 fix : 修改审批记录回退节点icon 2024-08-06 18:45:31 +08:00
2244e96484 Merge pull request 'master' (#676) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/676
2024-08-06 10:33:19 +00:00
f99422a8e0 Merge pull request 'fix : drone' (#675) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/675
2024-08-06 10:33:06 +00:00
d27576ede2 fix : drone 2024-08-06 18:32:46 +08:00
c16d86354b Merge pull request 'master' (#674) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/674
2024-08-06 10:27:15 +00:00
d8a01ad3b1 Merge pull request 'fix : 修复详情排版' (#673) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/673
2024-08-06 10:27:01 +00:00
c61b06e8b2 fix : 修复详情排版 2024-08-06 18:26:47 +08:00
88f12c7fce Merge pull request 'master' (#672) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/672
2024-08-06 07:27:28 +00:00
1b1e0a8174 Merge pull request 'fix : 需求上报详情删除重复项,优化台账上方基础信息排版,表格内容少时固定宽度,驳回弹窗'重新提交'改为'发起节点'' (#671) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/671
2024-08-06 07:06:51 +00:00
33e6ad37b9 fix : 需求上报详情删除重复项,优化台账上方基础信息排版,表格内容少时固定宽度,驳回弹窗'重新提交'改为'发起节点' 2024-08-06 15:06:29 +08:00
zhangkaihuai
522eb5025c 更新 .drone.yml 2024-08-06 07:05:02 +00:00
zhangkaihuai
6aeb846ca4 更新 .drone.yml 2024-08-06 06:58:23 +00:00
zhangkaihuai
f5d8a46829 更新 README.md 2024-08-06 06:31:07 +00:00
a7a146c055 Merge pull request 'master' (#670) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/670
2024-08-05 12:57:23 +00:00
94155d2ca6 Merge pull request 'fix : 审批人和当前节点合并' (#669) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/669
2024-08-05 12:57:10 +00:00
ab191e940b fix : 审批人和当前节点合并 2024-08-05 20:56:43 +08:00
5f95f461a8 Merge pull request 'fix : 修复退回节点弹窗' (#668) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/668
2024-08-05 12:32:53 +00:00
173b928412 fix : 修复退回节点弹窗 2024-08-05 20:32:33 +08:00
f0d19e535c Merge pull request 'fix : 修复项目基本信息展示' (#667) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/667
2024-08-05 11:14:21 +00:00
63d8feb712 fix : 修复项目基本信息展示 2024-08-05 19:10:29 +08:00
ebccaaa12f Merge pull request 'dd' (#666) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/666
2024-08-05 09:26:35 +00:00
147d66c756 fix : 修复角色替换接口 2024-08-05 17:26:20 +08:00
04fff31b3a fix : 修改'经费预算'文字及页面排版 2024-08-05 17:22:23 +08:00
96529cccc6 Merge pull request 'master' (#665) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/665
2024-08-04 17:02:22 +00:00
848f167bb6 Merge pull request 'feat : 对接人用户替换' (#664) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/664
2024-08-04 17:02:10 +00:00
ee869f3c34 feat : 对接人用户替换 2024-08-05 01:01:35 +08:00
clay
21a111ae8f Merge pull request 'feat : 研发人员选择' (#663) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/663
2024-08-04 13:02:08 +00:00
clay
5f6f1a7912 feat : 研发人员选择 2024-08-04 21:01:43 +08:00
5912f37ebb Merge pull request 'master' (#662) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/662
2024-08-03 13:33:37 +00:00
66bd341692 Merge pull request 'feat : 审批记录打印' (#661) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/661
2024-08-03 13:33:26 +00:00
39b71a581a Merge pull request 'master' (#660) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/660
2024-08-03 13:32:57 +00:00
28257ceefe feat : 审批记录打印 2024-08-03 21:32:00 +08:00