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

1362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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