|
|
169423d5f9
|
Merge pull request 'master' (#397) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/397
|
2024-06-25 03:56:29 +00: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 |
|
|
|
ce981882c8
|
Merge pull request 'master' (#395) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/395
|
2024-06-24 05:39:59 +00: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 |
|
|
|
dd13f8d175
|
Merge pull request 'master' (#393) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/393
|
2024-06-24 05:26:03 +00: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 |
|
|
|
47f13d4b1e
|
Merge pull request 'master' (#391) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/391
|
2024-06-24 03:09:53 +00: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 |
|
|
|
433bb7e1a4
|
Merge pull request 'master' (#390) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/390
|
2024-06-23 04:08:40 +00: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 |
|
|
|
08f86517da
|
Merge pull request 'master' (#388) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/388
|
2024-06-22 16:59:19 +00: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 |
|
|
|
794826f0c7
|
Merge pull request 'master' (#386) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/386
|
2024-06-22 16:39:27 +00: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 |
|
|
|
096fa6dc51
|
Merge pull request 'fix : 分摊详情小计与导出' (#383) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/383
|
2024-06-22 10:49:59 +00:00 |
|
|
|
2d9bba98a7
|
fix : 分摊详情小计与导出
|
2024-06-22 18:49:14 +08:00 |
|
|
|
accf65ef10
|
Merge pull request 'master' (#381) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/381
|
2024-06-22 10:46:16 +00:00 |
|
|
|
e849c6cde6
|
Merge remote-tracking branch 'origin/master'
|
2024-06-22 18:45:50 +08:00 |
|
|
|
5c60bf91e4
|
fix : 分摊详情小计与导出
|
2024-06-22 18:45:40 +08:00 |
|
clay
|
dc189aa726
|
fix : 修复新增分摊细节
|
2024-06-22 18:44:49 +08:00 |
|
|
|
eaa8b834bf
|
Merge pull request 'master' (#380) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/380
|
2024-06-21 10:40:13 +00:00 |
|
|
|
82634ddf97
|
Merge pull request 'fix : 审批记录优化' (#379) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/379
|
2024-06-21 10:40:00 +00:00 |
|
|
|
3f32683d69
|
fix : 审批记录优化
|
2024-06-21 18:39:45 +08:00 |
|
|
|
b32ced514b
|
Merge pull request 'master' (#378) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/378
|
2024-06-21 10:36:16 +00:00 |
|
|
|
5fbef17b86
|
Merge pull request 'dj' (#377) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/377
|
2024-06-21 10:35:54 +00:00 |
|
|
|
1cdd2cb02b
|
fix : 主次账号消息框展示、审批记录优化、头像框组件优化
|
2024-06-21 18:35:30 +08:00 |
|
|
|
2a80c8df21
|
fix : 修复项目归档开启/关闭上传文件二次确认
|
2024-06-21 17:17:35 +08:00 |
|
|
|
4bee8bf9e4
|
fix : 修复项目实施/归档上传附件显示,
|
2024-06-21 17:15:01 +08:00 |
|
|
|
78cf7e6857
|
Merge pull request 'master' (#376) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/376
|
2024-06-21 07:31:47 +00:00 |
|
|
|
efe1be3929
|
Merge pull request 'dj' (#375) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/375
|
2024-06-21 07:31:37 +00:00 |
|
|
|
bce9b2d8d2
|
fix : 修复导出表格宽度
|
2024-06-21 15:31:06 +08:00 |
|
|
|
b73b9aad4b
|
fix : 分摊汇总表格及小计导出
|
2024-06-21 15:22:22 +08:00 |
|
|
|
8128766e24
|
Merge pull request 'master' (#374) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/374
|
2024-06-21 05:03:17 +00:00 |
|
|
|
8a9fffb3d0
|
Merge pull request 'fix : 移除输出log' (#373) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/373
|
2024-06-21 05:03:07 +00:00 |
|
|
|
9b758d41d0
|
fix : 移除输出log
|
2024-06-21 13:02:55 +08:00 |
|
|
|
90a08f37f6
|
Merge pull request 'master' (#372) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/372
|
2024-06-21 04:42:08 +00:00 |
|
