Commits · d57eb46bb448644f2b146d2130dde28e41b717cc · zry / performance · GitLab

09 Apr, 2019 2 commits
- Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop · d57eb46b
  ruyun.zhang@suvalue.com committed Apr 09, 2019
  
  d57eb46b Browse Files
- 上传文件复制配置bug修改 · a4689af6
  ruyun.zhang@suvalue.com committed Apr 09, 2019
  
  a4689af6 Browse Files
08 Apr, 2019 3 commits
- 新增绩效医院是增加是否开放年资系数，修改copy方法。人员名单不上传是，根据年月倒序取最后一次的人员名单。对于绩效人员的增删改。 · 6d1539c3
  李承祥 committed Apr 08, 2019
  
  6d1539c3 Browse Files
- 新增错误返回 · 6e63e344
  ruyun.zhang@suvalue.com committed Apr 08, 2019
  
  6e63e344 Browse Files
- 新增错误返回 · 21c221f4
  ruyun.zhang@suvalue.com committed Apr 08, 2019
  
  21c221f4 Browse Files
04 Apr, 2019 8 commits
- no message · d02f323a
  ruyun.zhang@suvalue.com committed Apr 04, 2019
  
  d02f323a Browse Files
- no message · ba5d6c19
  ruyun.zhang@suvalue.com committed Apr 04, 2019
  
  ba5d6c19 Browse Files
- no message · b50e3d78
  ruyun.zhang@suvalue.com committed Apr 04, 2019
  
  b50e3d78 Browse Files
- 二次分配科室详情 · f864d218
  ruyun.zhang@suvalue.com committed Apr 04, 2019
  
  f864d218 Browse Files
- 菜单新增过滤 · ae1699bc
  ruyun.zhang@suvalue.com committed Apr 04, 2019
  
  ae1699bc Browse Files
- 全员绩效发放 · 8e69766d
  李承祥 committed Apr 04, 2019
  
  8e69766d Browse Files
- Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop · c14ecb96
  ruyun.zhang@suvalue.com committed Apr 04, 2019
  
  c14ecb96 Browse Files
- no message · 48faa801
  ruyun.zhang@suvalue.com committed Apr 04, 2019
  
  48faa801 Browse Files
03 Apr, 2019 8 commits
- 绩效归档，归档前检查数据 · 2c0b4dc7
  李承祥 committed Apr 03, 2019
  
  2c0b4dc7 Browse Files
- Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop · 741530f5
```
# Conflicts:
#	performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs
```
  ruyun.zhang@suvalue.com committed Apr 03, 2019
  741530f5 Browse Files
- 二次绩效 · 13971029
  ruyun.zhang@suvalue.com committed Apr 03, 2019
  
  13971029 Browse Files
- 上传文件、获取二次绩效记录调整 · d54d5350
  李承祥 committed Apr 03, 2019
  
  d54d5350 Browse Files
- Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop · debc4131
  ruyun.zhang@suvalue.com committed Apr 03, 2019
  
  debc4131 Browse Files
- 接口调整 · 03cfac74
  ruyun.zhang@suvalue.com committed Apr 03, 2019
  
  03cfac74 Browse Files
- 当前用户医院下绩效列表、二次绩效上传文件、二次绩效基础配置 · 1c4df99b
  李承祥 committed Apr 03, 2019
  
  1c4df99b Browse Files
- 二次绩效分配 · ac20c91e
  ruyun.zhang@suvalue.com committed Apr 03, 2019
  
  ac20c91e Browse Files
02 Apr, 2019 5 commits
- Merge branch 'feature/again' into develop · 59012bec
  ruyun.zhang@suvalue.com committed Apr 02, 2019
  
  59012bec Browse Files
- Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop · c1dc6ac7
  ruyun.zhang@suvalue.com committed Apr 02, 2019
  
  c1dc6ac7 Browse Files
- 绩效初次计算完成 · fa80f4ee
  ruyun.zhang@suvalue.com committed Apr 02, 2019
  
  fa80f4ee Browse Files
- 开发到一半 · 96cec430
  ruyun.zhang@suvalue.com committed Apr 02, 2019
  
  96cec430 Browse Files
- appsetting修改 · f6f59741
  ruyun.zhang@suvalue.com committed Apr 02, 2019
  
  f6f59741 Browse Files
01 Apr, 2019 3 commits
- 用户管理--新增，修改时增加角色管理 · 4d1b0846
  李承祥 committed Apr 01, 2019
  
  4d1b0846 Browse Files
- 二次分配 · 0659e75d
  ruyun.zhang@suvalue.com committed Apr 01, 2019
  
  0659e75d Browse Files
- 二次分配 · 05252f98
  ruyun.zhang@suvalue.com committed Apr 01, 2019
  
  05252f98 Browse Files
29 Mar, 2019 11 commits
- sheet页添加系数值 · 99ba5e8c
  李承祥 committed Mar 29, 2019
  
  99ba5e8c Browse Files
- dbug · 67b6b622
  ruyun.zhang@suvalue.com committed Mar 29, 2019
  
  67b6b622 Browse Files
- dbug · 246eb7c2
  ruyun.zhang@suvalue.com committed Mar 29, 2019
  
  246eb7c2 Browse Files
- 日志 · c41efa40
  ruyun.zhang@suvalue.com committed Mar 29, 2019
  
  c41efa40 Browse Files
- 绩效发放根据核算单元排序（正序），全院绩效倒序（核算单元可为空） · 8957169e
  李承祥 committed Mar 29, 2019
  
  8957169e Browse Files
- 绩效发放--职称 · d231caca
  李承祥 committed Mar 29, 2019
  
  d231caca Browse Files
- Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop · eb12f21a
  ruyun.zhang@suvalue.com committed Mar 29, 2019
  
  eb12f21a Browse Files
- dbug · ad933cd9
  ruyun.zhang@suvalue.com committed Mar 29, 2019
  
  ad933cd9 Browse Files
- Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop · b80bfcfd
```
# Conflicts:
#	performance/Performance.EntityModels/Entity/res_compute.cs
```
  李承祥 committed Mar 29, 2019
  b80bfcfd Browse Files
- Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop · 9a462f6c
```
# Conflicts:
#	performance/Performance.EntityModels/Entity/res_compute.cs
```
  李承祥 committed Mar 29, 2019
  9a462f6c Browse Files
- 绩效发放--实发绩效字段，护理组科室绩效foreach循环出错；原始数据列头重复，时间格式更改； · 2c67d64e
  李承祥 committed Mar 29, 2019
  
  2c67d64e Browse Files