Commit Graph

738 Commits

Author SHA1 Message Date
13c0e3a7f0 fix : 修复需求汇总 2024-06-29 00:09:42 +08:00
72171fb573 fix : 需求征集新增/详情样式优化,需求汇总详情优化 2024-06-29 00:07:43 +08:00
942fc219e2 fix : 修复需求上报排版、费用分摊传参、需求汇总查询字段 2024-06-28 22:37:30 +08:00
clay
16c4e07a86 Merge remote-tracking branch 'origin/master' 2024-06-28 21:54:34 +08:00
clay
58d5efb655 fix : 费用分摊选择用户会被批量修改 2024-06-28 21:54:16 +08:00
c199ecb9fb Merge pull request 'fix : 修复项目归档-附件上传后跳转展示页面, 专项资金加"名称"二字' (#407) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/407
2024-06-28 13:50:23 +00:00
aa9001edd7 fix : 修复项目归档-附件上传后跳转展示页面, 专项资金加"名称"二字 2024-06-28 21:50:05 +08:00
clay
377509b62a feat : 分摊汇总小计保留两位小数 2024-06-28 21:41:24 +08:00
clay
fc034cc653 feat : 需求征集字段调整 2024-06-28 20:22:23 +08:00
fe72d0706a Merge pull request 'dd' (#406) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/406
2024-06-28 12:16:35 +00:00
84fb6838fb fix : 优化所属公司选择框 2024-06-28 20:16:24 +08:00
efd06e0da7 fix : 修改需求上报展示 2024-06-28 20:15:58 +08:00
291708e71a fix : 修改新增需求征集"专项资金名称" 2024-06-28 20:05:23 +08:00
9db5ad0052 Merge pull request 'dd' (#404) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/404
2024-06-28 08:39:06 +00:00
b7946d44c8 fix : 修改用户管理展示 2024-06-28 16:38:35 +08:00
daac1812bf fix : 优化审批记录、用户账号切换点击位置、所属公司选择框 2024-06-28 16:25:21 +08:00
wenhua
114c9116b1 feat: 阶段变更详情 2024-06-28 00:08:24 +08:00
wenhua
c5d5066ee1 Merge branch 'master' of http://git.feashow.cn/clay/mosr-web 2024-06-27 23:35:07 +08:00
wenhua
a943687afe feat: 新增移动端适配详情 2024-06-27 23:35:05 +08:00
clay
c61e584dea Merge remote-tracking branch 'origin/master' 2024-06-27 22:53:50 +08:00
clay
9bdad91b7e feat : 首页任务字段调整 2024-06-27 22:53:43 +08:00
8684132fc7 Merge pull request 'fix : 公司选择框' (#400) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/400
2024-06-26 15:04:46 +00:00
7bcd75e6fb fix : 公司选择框 2024-06-26 23:04:30 +08:00
c10f40f668 Merge pull request 'dd' (#398) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/398
2024-06-25 10:47:01 +00:00
bbb8705cee feat : 用户管理主账号-新增绑定账号功能 2024-06-25 18:13:43 +08:00
65b8af3e3e fix : 修复新增分摊复制/添加一行功能 2024-06-25 16:21:40 +08:00
afa0a52898 fix : 修复新增分摊复制/添加一行功能 2024-06-25 16:21:03 +08:00
0e633c40a1 Merge pull request 'fix : 修复分摊编辑传参和台账导出' (#396) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/396
2024-06-25 03:56:00 +00:00
9d0490a253 fix : 修复分摊编辑传参和台账导出 2024-06-25 11:55:48 +08:00
87768bfdf4 Merge pull request 'fix : 修复分摊/资金详情页面移动端适配' (#394) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/394
2024-06-24 05:39:45 +00:00
36c5b04dbc fix : 修复分摊/资金详情页面移动端适配 2024-06-24 13:39:30 +08:00
9945cc1c86 Merge pull request 'fix : 修复详情页面移动端适配' (#392) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/392
2024-06-24 05:25:50 +00:00
6f320a47bb fix : 修复详情页面移动端适配 2024-06-24 13:25:34 +08:00
clay
f66a570f00 feat : 台账导出 2024-06-23 18:55:42 +08:00
clay
5edf97338e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/views/expense-management/share/add.vue
2024-06-23 18:15:07 +08:00
0b9712962d Merge pull request 'dd' (#389) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/389
2024-06-23 04:08:23 +00:00
d03f352169 fix : 注释npm install 2024-06-23 12:08:02 +08:00
dc20a6e33d Merge remote-tracking branch 'origin/master' 2024-06-23 12:06:53 +08:00
1efe8c4aaf fix : 修复项目实施-台账基础信息展示及表格更新功能 2024-06-23 12:04:22 +08:00
wenhua
27b4f41749 Merge branch 'master' of http://git.feashow.cn/clay/mosr-web 2024-06-23 01:36:20 +08:00
wenhua
30bd9da52f feat: 新增移动端详情 2024-06-23 01:36:17 +08:00
74e1938d3c fix : 修改分摊汇总金额展示 2024-06-23 01:02:27 +08:00
5757846e7c Merge pull request 'fix : 修复费用分摊详情合计bug' (#387) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/387
2024-06-22 16:59:07 +00:00
058421bdd7 fix : 修复费用分摊详情合计bug 2024-06-23 00:58:56 +08:00
da9bf2304b Merge pull request 'feat : 项目实施-台账新增表格更新功能' (#385) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/385
2024-06-22 16:39:16 +00:00
1a3d2bcf1a feat : 项目实施-台账新增表格更新功能 2024-06-23 00:37:07 +08:00
e0ba874746 Merge pull request 'fix : 修复用户切换报错提示、税后余额数字输入框、新增分摊时研发人员传参' (#384) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/384
2024-06-22 15:55:21 +00:00
7e524039bd fix : 修复用户切换报错提示、税后余额数字输入框、新增分摊时研发人员传参 2024-06-22 23:54:54 +08:00
2d9bba98a7 fix : 分摊详情小计与导出 2024-06-22 18:49:14 +08:00
e849c6cde6 Merge remote-tracking branch 'origin/master' 2024-06-22 18:45:50 +08:00