clay
|
7bf6336a46
|
fix : 年度计划删除
|
2024-07-10 23:19:41 +08:00 |
|
wenhua
|
50a4e21a99
|
Merge branch 'master' of http://git.feashow.cn/clay/mosr-web
|
2024-07-10 22:18:43 +08:00 |
|
wenhua
|
e8d3148937
|
fix: 调整样式
|
2024-07-10 22:18:40 +08:00 |
|
zhangkaihuai
|
dfdeaec16c
|
Merge remote-tracking branch 'origin/master'
|
2024-07-10 18:09:02 +08:00 |
|
zhangkaihuai
|
42fd8d9740
|
feat:增加项目负责人和成员选择功能
在项目申请详情中，新增了项目负责人和成员的选择功能，使用user-picker组件实现。
同时，对前置流程的展示进行了调整，并完善了审批记录和流程图的相关逻辑。
|
2024-07-10 18:08:51 +08:00 |
|
|
|
17994928bf
|
Merge pull request 'fix : 细节优化' (#516) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/516
|
2024-07-10 08:57:20 +00:00 |
|
|
|
71b9065f29
|
fix : 细节优化
|
2024-07-10 16:56:28 +08:00 |
|
zhangkaihuai
|
b1616b716c
|
Merge remote-tracking branch 'origin/master'
|
2024-07-10 16:53:48 +08:00 |
|
wenhua
|
7836450a10
|
fix: bug修复
|
2024-07-09 23:31:10 +08:00 |
|
|
|
cbc97891b8
|
Merge pull request 'fix : 修复年度计划详情展示' (#513) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/513
|
2024-07-09 11:35:25 +00:00 |
|
|
|
7a38c34da9
|
fix : 修复年度计划详情展示
|
2024-07-09 19:35:04 +08:00 |
|
|
|
9f06ecbc62
|
Merge pull request 'fix : 修复专项资金权限, 费用台账时间搜索' (#511) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/511
|
2024-07-07 15:36:36 +00:00 |
|
|
|
23975e056a
|
fix : 修复专项资金权限, 费用台账时间搜索
|
2024-07-07 23:36:20 +08:00 |
|
|
|
ac409710d8
|
Merge pull request 'fix : 修复归档-附件搜索传参问题' (#509) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/509
|
2024-07-06 20:13:29 +00:00 |
|
|
|
2c8de29fcd
|
fix : 修复归档-附件搜索传参问题
|
2024-07-07 04:12:06 +08:00 |
|
|
|
c5a3bc9b58
|
Merge pull request 'fix : 修复征集公司选择' (#507) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/507
|
2024-07-06 19:31:33 +00:00 |
|
|
|
09d95babd0
|
fix : 修复征集公司选择
|
2024-07-07 03:31:18 +08:00 |
|
|
|
584adb63d4
|
Merge pull request 'dd' (#505) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/505
|
2024-07-06 18:43:56 +00:00 |
|
|
|
06090fc00b
|
fix : 修复费用台账时间搜索
|
2024-07-07 02:43:40 +08:00 |
|
|
|
fce1bfdb6f
|
fix : 修复年度计划编辑功能
|
2024-07-07 02:36:40 +08:00 |
|
|
|
c10f7b2398
|
Merge pull request 'fix : 修复台账基础信息展示及年度计划通过后跳转' (#503) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/503
|
2024-07-06 18:22:36 +00:00 |
|
|
|
b21719aaa0
|
fix : 修复台账基础信息展示及年度计划通过后跳转
|
2024-07-07 02:22:17 +08:00 |
|
wenhua
|
9b19de0ff9
|
feat: 添加需求汇总详情
|
2024-07-07 00:56:20 +08:00 |
|
|
|
10e5db2cd6
|
Merge pull request 'fix : 修复需求上报预期成果形式回显' (#501) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/501
|
2024-07-06 16:46:43 +00:00 |
|
|
|
2a25942cdf
|
fix : 修复需求上报预期成果形式回显
|
2024-07-07 00:46:19 +08:00 |
|
wenhua
|
a5864a32ce
|
feat： 添加详情静态路由
|
2024-07-07 00:45:16 +08:00 |
|
|
|
5d661e1276
|
Merge pull request 'fix : 修复需求上报预期成果形式回显' (#499) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/499
|
2024-07-06 16:05:57 +00:00 |
|
|
|
8feef06c11
|
fix : 修复需求上报预期成果形式回显
|
2024-07-07 00:05:47 +08:00 |
|
|
|
dd5fb4f44a
|
Merge pull request 'fix : 修复征集公司回显' (#497) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/497
|
2024-07-06 15:29:45 +00:00 |
|
|
|
57776764f8
|
fix : 修复征集公司回显
|
2024-07-06 23:29:33 +08:00 |
|
|
|
ce5297145b
|
Merge pull request 'fix : 修复文件删除功能' (#495) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/495
|
2024-07-06 15:10:57 +00:00 |
|
|
|
3c564b600b
|
fix : 修复文件删除功能
|
2024-07-06 23:10:45 +08:00 |
|
|
|
e7ee3fbc9d
|
Merge pull request 'fix : 修复文件删除功能' (#494) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/494
|
2024-07-06 15:09:04 +00:00 |
|
|
|
edec70ebbb
|
fix : 修复文件删除功能
|
2024-07-06 23:08:36 +08:00 |
|
|
|
13cbd1c7cd
|
Merge pull request 'fix : 年度计划权限按钮' (#492) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/492
|
2024-07-06 14:38:49 +00:00 |
|
|
|
06524178c7
|
fix : 年度计划权限按钮
|
2024-07-06 22:38:31 +08:00 |
|
|
|
564084cb02
|
Merge pull request 'fix : 年度计划权限按钮' (#491) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/491
|
2024-07-06 14:38:05 +00:00 |
|
|
|
e5777b55bc
|
fix : 年度计划权限按钮
|
2024-07-06 22:37:51 +08:00 |
|
|
|
41134a6266
|
Merge pull request 'fix : 台账表格更新输入框对齐' (#489) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/489
|
2024-07-06 13:39:51 +00:00 |
|
|
|
7e07010f0d
|
fix : 台账表格更新输入框对齐
|
2024-07-06 21:39:37 +08:00 |
|
zhangkaihuai
|
ac28c3235e
|
Merge remote-tracking branch 'origin/master'
|
2024-07-06 17:40:24 +08:00 |
|
|
|
2a5443dc4e
|
Merge pull request 'fix : 流程管理中人员回显,表格更新负责人按钮更换位置,需求汇总选择框过滤' (#487) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/487
|
2024-07-06 09:36:54 +00:00 |
|
|
|
12f6f27b1a
|
fix : 流程管理中人员回显,表格更新负责人按钮更换位置,需求汇总选择框过滤
|
2024-07-06 17:36:39 +08:00 |
|
|
|
9eebacc47a
|
Merge pull request 'fix : 修复审批记录主次账号显示, 年度计划详情显示' (#485) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/485
|
2024-07-06 07:46:35 +00:00 |
|
|
|
ddc3b70ddf
|
fix : 修复审批记录主次账号显示, 年度计划详情显示
|
2024-07-06 15:46:22 +08:00 |
|
clay
|
bd57a54931
|
fix : 矩阵审批选择自己时可以跳过自己审批
|
2024-07-06 15:05:19 +08:00 |
|
|
|
8f3d97ec1c
|
Merge pull request 'feat : 年度计划生成功能及分摊汇总导出功能' (#483) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/483
|
2024-07-05 18:21:44 +00:00 |
|
|
|
8180c248ac
|
feat : 年度计划生成功能及分摊汇总导出功能
|
2024-07-06 02:21:26 +08:00 |
|
zhangkaihuai
|
a7c1c3a483
|
Merge remote-tracking branch 'origin/master'
|
2024-07-05 09:29:40 +08:00 |
|
lilinyuan
|
fce1708f5c
|
Merge branch 'master' of http://git.feashow.cn/clay/mosr-web
|
2024-07-04 17:18:41 +08:00 |
|
