odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
853 Commits 11 Branches 0 Tags
380c476cf3fd76e352efcb1aa16c26164e84d715
Commit Graph

853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
clay
380c476cf3 Merge pull request 'master' (#402) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/402
 2024-06-27 14:54:16 +00: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
odjbin
b433efc81a Merge pull request 'master' (#401) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/401
 2024-06-26 15:04:55 +00:00
odjbin
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
odjbin
7bcd75e6fb fix : 公司选择框 2024-06-26 23:04:30 +08:00
odjbin
ab4b9c1bf3 Merge pull request 'master' (#399) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/399
 2024-06-26 14:53:15 +00:00
odjbin
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
odjbin
bbb8705cee feat : 用户管理主账号-新增绑定账号功能 2024-06-25 18:13:43 +08:00
odjbin
65b8af3e3e fix : 修复新增分摊复制/添加一行功能 2024-06-25 16:21:40 +08:00
odjbin
afa0a52898 fix : 修复新增分摊复制/添加一行功能 2024-06-25 16:21:03 +08:00
odjbin
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
odjbin
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
odjbin
9d0490a253 fix : 修复分摊编辑传参和台账导出 2024-06-25 11:55:48 +08:00
odjbin
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
odjbin
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
odjbin
36c5b04dbc fix : 修复分摊/资金详情页面移动端适配 2024-06-24 13:39:30 +08:00
odjbin
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
odjbin
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
odjbin
6f320a47bb fix : 修复详情页面移动端适配 2024-06-24 13:25:34 +08:00
odjbin
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
odjbin
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
odjbin
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
odjbin
d03f352169 fix : 注释npm install 2024-06-23 12:08:02 +08:00
odjbin
dc20a6e33d Merge remote-tracking branch 'origin/master' 2024-06-23 12:06:53 +08:00
odjbin
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
odjbin
74e1938d3c fix : 修改分摊汇总金额展示 2024-06-23 01:02:27 +08:00
odjbin
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
odjbin
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
odjbin
058421bdd7 fix : 修复费用分摊详情合计bug 2024-06-23 00:58:56 +08:00
odjbin
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
odjbin
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
odjbin
1a3d2bcf1a feat : 项目实施-台账新增表格更新功能 2024-06-23 00:37:07 +08:00
odjbin
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
odjbin
7e524039bd fix : 修复用户切换报错提示、税后余额数字输入框、新增分摊时研发人员传参 2024-06-22 23:54:54 +08:00
odjbin
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
odjbin
2d9bba98a7 fix : 分摊详情小计与导出 2024-06-22 18:49:14 +08:00
odjbin
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
odjbin
e849c6cde6 Merge remote-tracking branch 'origin/master' 2024-06-22 18:45:50 +08:00
odjbin
5c60bf91e4 fix : 分摊详情小计与导出 2024-06-22 18:45:40 +08:00
clay
dc189aa726 fix : 修复新增分摊细节 2024-06-22 18:44:49 +08:00
odjbin
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
odjbin
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
odjbin
3f32683d69 fix : 审批记录优化 2024-06-21 18:39:45 +08:00
odjbin
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
odjbin
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