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

1293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
odjbin
614bd328d1 fix : 修复审核意见显示 2024-07-24 22:29:53 +08:00
odjbin
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
odjbin
328c75b2e4 fix : 还原drone.yml文件 2024-07-24 22:09:57 +08:00
odjbin
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
odjbin
1716a3a562 fix : 下载新依赖 2024-07-24 21:50:31 +08:00
odjbin
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
odjbin
5048c638b8 Merge remote-tracking branch 'origin/master' 2024-07-24 21:43:02 +08:00
odjbin
b4e9359165 fix : 下载新依赖 2024-07-24 21:42:53 +08:00
odjbin
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
odjbin
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
odjbin
da2721ca56 fix : 下载新依赖 2024-07-24 21:40:29 +08:00
odjbin
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
odjbin
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
odjbin
0c1aa248d5 fix : 下载新依赖 2024-07-24 21:32:33 +08:00
odjbin
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
odjbin
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
clay
fc0451ca32 feat : 动态前置流程 2024-07-24 21:21:36 +08:00
odjbin
5664faccfe fix : 修复专项资金文件预览,优化上报前置流程展示 2024-07-24 20:05:29 +08:00
odjbin
d769ec9755 Merge pull request 'feat : 前置流程组件' (#611) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/611
 2024-07-24 11:42:33 +00:00
odjbin
b9de011871 feat : 前置流程组件 2024-07-24 19:42:20 +08:00
odjbin
d2e672e761 Merge pull request 'feat : 文件预览,项目详情文件表格展示' (#610) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/610
 2024-07-24 10:18:11 +00:00
odjbin
6cc409d744 feat : 文件预览,项目详情文件表格展示 2024-07-24 18:17:55 +08:00
clay
9506d3e0f6 feat : 流程判断条件添加 2024-07-24 18:14:38 +08:00
clay
b90ed53437 feat : 流程判断条件添加 2024-07-24 18:10:37 +08:00
clay
fe8ca80452 feat : 需求汇总年度计划审批前置流程选择 2024-07-24 00:28:42 +08:00
clay
1194f04eb6 feat : 需求汇总年度计划审批前置流程选择 2024-07-23 22:58:43 +08:00
clay
c7866f2e5e feat : 节点参数设置 2024-07-23 19:18:29 +08:00
clay
e5452741e9 Merge remote-tracking branch 'origin/master' 2024-07-23 17:42:31 +08:00
odjbin
ac8cbdc991 Merge pull request 'master' (#609) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/609
 2024-07-23 09:31:02 +00:00
odjbin
d87dd8985c Merge pull request 'fix : 修复组织机构显示及部门副职不能选择bug' (#608) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/608
 2024-07-23 09:30:43 +00:00
odjbin
342b64273c fix : 修复组织机构显示及部门副职不能选择bug 2024-07-23 17:30:27 +08:00
clay
3685174117 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/api/workflow/process-user.js
#	src/views/system/organizationalStructure/index.vue
 2024-07-23 17:02:57 +08:00
lilinyuan
7ee43a9b4d feat: up serachForm 2024-07-23 14:05:31 +08:00
odjbin
84e5c2dd7e Merge pull request 'master' (#607) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/607
 2024-07-23 05:28:54 +00:00
odjbin
ad7ca888a9 Merge pull request 'dd' (#606) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/606
 2024-07-23 05:28:39 +00:00
odjbin
838f2edf7e fix : 数据预览时左对齐 2024-07-22 23:06:20 +08:00
odjbin
3c1fcc327c fix : 征集公司校验,单文件显示改为表格,手机端审批后刷新,需求征集回车触发搜索,组织机构管理搜索 2024-07-22 20:39:26 +08:00
clay
e576000267 feat : 科创部直接跳过审批节点 2024-07-19 14:51:07 +08:00
clay
9a66c333c7 Merge pull request 'master' (#605) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/605
 2024-07-19 06:23:35 +00:00
clay
ae6da83a1a feat : 科创部直接跳过审批节点 2024-07-19 14:23:00 +08:00
clay
bd01e4c94b feat : 科创部直接跳过审批节点 2024-07-19 14:22:17 +08:00
lilinyuan
9783ca8506 feat: 表单组件添加回车事件 2024-07-19 11:10:51 +08:00
odjbin
3580fb41f3 Merge pull request 'feat : 部门副职用户选择框无法弹出' (#604) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/604
 2024-07-19 02:11:13 +00:00
clay
264f6283dc feat : 部门副职用户选择框无法弹出 2024-07-19 10:07:39 +08:00
odjbin
dc822bba07 Merge pull request 'master' (#603) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/603
 2024-07-18 17:54:35 +00:00
odjbin
acf261b58b Merge pull request 'feat : 台账导入' (#602) from dd into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/602
 2024-07-18 17:54:19 +00:00
odjbin
fde9ba3781 feat : 台账导入 2024-07-19 01:53:51 +08:00
odjbin
1db5d4b11f Merge pull request 'master' (#601) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/601
 2024-07-18 17:06:06 +00:00