|
|
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 |
|
clay
|
fc0451ca32
|
feat : 动态前置流程
|
2024-07-24 21:21:36 +08:00 |
|
|
|
5664faccfe
|
fix : 修复专项资金文件预览,优化上报前置流程展示
|
2024-07-24 20:05:29 +08:00 |
|
|
|
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 |
|
|
|
b9de011871
|
feat : 前置流程组件
|
2024-07-24 19:42:20 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
838f2edf7e
|
fix : 数据预览时左对齐
|
2024-07-22 23:06:20 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
fde9ba3781
|
feat : 台账导入
|
2024-07-19 01:53:51 +08:00 |
|
|
|
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 |
|
|
|
04a65c6932
|
Merge pull request 'dd' (#600) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/600
|
2024-07-18 16:43:39 +00:00 |
|
|
|
e9333f7859
|
feat : 台账导入
|
2024-07-19 00:43:11 +08:00 |
|
|
|
0a2004e3ce
|
feat : 台账导入
|
2024-07-19 00:41:15 +08:00 |
|
|
|
1ca25d8ec4
|
Merge pull request 'master' (#599) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/599
|
2024-07-18 14:56:29 +00:00 |
|
|
|
b69a147c61
|
Merge pull request 'feat : 台账导入' (#598) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/598
|
2024-07-18 14:56:21 +00:00 |
|
|
|
5deae5d846
|
feat : 台账导入
|
2024-07-18 22:56:08 +08:00 |
|
|
|
a9c7977347
|
Merge pull request 'master' (#597) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/597
|
2024-07-18 14:07:11 +00:00 |
|
|
|
c2c60d01af
|
Merge pull request 'fix : 修复页面bug' (#596) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/596
|
2024-07-18 14:06:59 +00:00 |
|
|
|
9d5c393ebe
|
fix : 修复页面bug
|
2024-07-18 22:06:23 +08:00 |
|
|
|
3c471b1124
|
Merge pull request 'master' (#595) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/595
|
2024-07-18 09:49:25 +00:00 |
|
|
|
3ec7a9c78e
|
Merge pull request 'dd' (#594) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/594
|
2024-07-18 09:49:11 +00:00 |
|
|
|
5dc25d1480
|
fix : 项目实施台账刷新
|
2024-07-18 17:48:56 +08:00 |
|
|
|
ad3e7479f4
|
fix : 项目实施台账时间搜索
|
2024-07-18 17:33:54 +08:00 |
|
|
|
2b94151780
|
Merge pull request 'master' (#593) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/593
|
2024-07-18 08:57:15 +00:00 |
|
|
|
c082ffc884
|
Merge pull request 'fix : 项目实施台账时间搜索' (#592) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/592
|
2024-07-18 08:56:59 +00:00 |
|
|
|
618cc8cb87
|
fix : 项目实施台账时间搜索
|
2024-07-18 16:56:38 +08:00 |
|
