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

1383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
ab191e940b fix : 审批人和当前节点合并 2024-08-05 20:56:43 +08:00
odjbin
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
odjbin
173b928412 fix : 修复退回节点弹窗 2024-08-05 20:32:33 +08:00
odjbin
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
odjbin
63d8feb712 fix : 修复项目基本信息展示 2024-08-05 19:10:29 +08:00
odjbin
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
odjbin
147d66c756 fix : 修复角色替换接口 2024-08-05 17:26:20 +08:00
odjbin
04fff31b3a fix : 修改'经费预算'文字及页面排版 2024-08-05 17:22:23 +08:00
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
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
odjbin
28257ceefe feat : 审批记录打印 2024-08-03 21:32:00 +08:00
odjbin
e2eed22d73 Merge pull request 'dd' (#659) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/659
 2024-08-03 13:30:46 +00:00
odjbin
790cac67ef feat : 审批记录打印 2024-08-03 21:30:26 +08:00
odjbin
b6ddafdd25 feat : 审批记录打印 2024-08-03 21:29:33 +08:00
clay
bda93c9744 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/components/NameCircle.vue
 2024-08-03 20:56:30 +08:00
clay
2634e9b70c feat : 打印 2024-08-03 20:55:26 +08:00
odjbin
2f3d47e349 Merge pull request 'master' (#658) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/658
 2024-08-03 11:30:35 +00:00
odjbin
f7fcd79251 Merge pull request 'fix : 修复阶段变更, 项目立项/验收部门分管领导编辑回显' (#657) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/657
 2024-08-03 11:30:23 +00:00
odjbin
25f4f33cb0 fix : 修复阶段变更, 项目立项/验收部门分管领导编辑回显 2024-08-03 19:30:12 +08:00
odjbin
e06e2d553e Merge pull request 'master' (#656) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/656
 2024-08-03 10:32:42 +00:00
odjbin
a5e3e269a1 Merge pull request 'fix : 修复需求上报详情排版' (#655) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/655
 2024-08-03 10:32:29 +00:00
odjbin
9d0d722880 fix : 修复需求上报详情排版 2024-08-03 18:29:05 +08:00
odjbin
6ac90f3841 Merge pull request 'master' (#654) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/654
 2024-08-03 10:21:39 +00:00
odjbin
e0bfe67c7e Merge pull request 'fix : 修复移动端详情排版' (#653) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/653
 2024-08-03 10:21:27 +00:00
odjbin
eaed989525 fix : 修复移动端详情排版 2024-08-03 18:21:13 +08:00
odjbin
f08f754002 Merge pull request 'master' (#652) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/652
 2024-08-03 06:17:21 +00:00
odjbin
77ff2143c3 Merge pull request 'fix : 修复需求上报详情排版' (#651) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/651
 2024-08-03 06:17:11 +00:00
odjbin
a55031ed70 fix : 修复需求上报详情排版 2024-08-03 14:16:53 +08:00
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