Commits · 791c5481bdf7acd5d50db2dc17694fce1cc984d1 · zry / performance · GitLab

05 Sep, 2022 3 commits
- Merge branch 'develop' of http://192.168.18.110:8880/zry/performance into develop · 791c5481
  纪旭韦 committed Sep 05, 2022
  
  791c5481 Browse Files
- 保存手工录入取UserId · 5d13d9c6
  纪旭韦 committed Sep 05, 2022
  
  5d13d9c6 Browse Files
- Merge branch '医院其他绩效' into develop · 96a30536
  Licx committed Sep 05, 2022
  
  96a30536 Browse Files
31 Aug, 2022 2 commits
- 提交按钮只允许自己点击 · 62202722
  Licx committed Aug 31, 2022
  
  62202722 Browse Files
- 1.获取其他绩效详情添加时间条件 · 5ed08789
```
2.审核驳回获取等待审核、审核通过的数据
```
  Licx committed Aug 31, 2022
  5ed08789 Browse Files
30 Aug, 2022 9 commits
- 二次分配保存数据时填报模板忽略工作量配置 · b664ef9e
  ruyun.zhang@suvalue.com committed Aug 30, 2022
  
  b664ef9e Browse Files
- 审核列表只查看已提交、审核通过的数据 · b04e7959
  Licx committed Aug 30, 2022
  
  b04e7959 Browse Files
- Merge branch 'develop' into 医院其他绩效 · 34972b5a
```
# Conflicts:
#	performance/Performance.Services/EmployeeService.cs
```
  Licx committed Aug 30, 2022
  34972b5a Browse Files
- 1.添加绩效类型 · 91a49d67
```
2.按时间倒序
3.添加验证
```
  Licx committed Aug 30, 2022
  91a49d67 Browse Files
- 创建绩效时，JOBNUMBER不自动补充personalnumber · 152ebb34
```
初次设置人员字典标签时初始states问题
```
  纪旭韦 committed Aug 30, 2022
  152ebb34 Browse Files
- 医院其他绩效AccountingUnit去掉首尾空值 · dc7e98da
  Licx committed Aug 30, 2022
  
  dc7e98da Browse Files
- 其他绩效上传，返回错误内容 · 21b54e71
  Licx committed Aug 30, 2022
  
  21b54e71 Browse Files
- 生成错误 · f6b15eac
  ruyun.zhang@suvalue.com committed Aug 30, 2022
  
  f6b15eac Browse Files
- 医院其他绩效 · 7df0eac0
  ruyun.zhang@suvalue.com committed Aug 30, 2022
  
  7df0eac0 Browse Files
29 Aug, 2022 2 commits
- 批量添加人员字典正确核算组别判断 · 8557ff6a
  纪旭韦 committed Aug 29, 2022
  
  8557ff6a Browse Files
- 模板选择BUG修复;科室改名调用存储过程矫正 · 968e980b
  ruyun.zhang@suvalue.com committed Aug 29, 2022
  
  968e980b Browse Files
26 Aug, 2022 3 commits
- 审核驳回时，获取数据状态修改 · f2f5ee46
  Licx committed Aug 26, 2022
  
  f2f5ee46 Browse Files
- 医院其他绩效8.23问题修改 · 784696c4
  Licx committed Aug 26, 2022
  
  784696c4 Browse Files
- 人员字典标签下载只显示开启的列头 · 002f472e
  纪旭韦 committed Aug 26, 2022
  
  002f472e Browse Files
23 Aug, 2022 2 commits
- 修改提交获取列表接口 · 4d55acf9
  Licx committed Aug 23, 2022
  
  4d55acf9 Browse Files
- 医院其他绩效添加提交撤销功能 · 1390990c
  Licx committed Aug 23, 2022
  
  1390990c Browse Files
18 Aug, 2022 1 commit
- 读取Sheet名称时错误 · 2126f8d4
  Licx committed Aug 18, 2022
  
  2126f8d4 Browse Files
17 Aug, 2022 7 commits
- Merge branch 'release/v22.4.18-Beta-wuzhou' into develop · 9e9168f0
  Licx committed Aug 17, 2022
  
  9e9168f0 Browse Files
- 调用打开时更新的方法 · 686f9f95
  Licx committed Aug 17, 2022
  
  686f9f95 Browse Files
- Merge branch 'release/v22.4.18-Beta-wuzhou' into develop · 4483de48
  Licx committed Aug 17, 2022
  
  4483de48 Browse Files
- 设置打开Excel时将更新公式 · 846e58a9
  Licx committed Aug 17, 2022
  
  846e58a9 Browse Files
- 删除单个人员字典备份 · 60a4934c
  纪旭韦 committed Aug 17, 2022
  
  60a4934c Browse Files
- Merge branch 'release/v22.4.18-Beta-wuzhou' into develop · a0ebe224
  Licx committed Aug 17, 2022
  
  a0ebe224 Browse Files
- 清除数据时，公式重新计算 - 统一计算时出错会跳过 · 79095838
  Licx committed Aug 17, 2022
  
  79095838 Browse Files
15 Aug, 2022 2 commits
- Merge branch 'release/v22.4.18-Beta-wuzhou' into develop · 45af3feb
  Licx committed Aug 15, 2022
  
  45af3feb Browse Files
- 提取数据，工作量单元簿根据医生护理选取 · 56185588
  Licx committed Aug 15, 2022
  
  56185588 Browse Files
12 Aug, 2022 1 commit
- 删除人员字典时插入备份表，当粘贴之前的数据时，标签根据备份表带出来 · 829748d3
  纪旭韦 committed Aug 12, 2022
  
  829748d3 Browse Files
11 Aug, 2022 2 commits
- Merge branch 'release/v22.4.18-Beta-wuzhou' into develop · 0fa00668
  Licx committed Aug 11, 2022
  
  0fa00668 Browse Files
- 二次绩效详情无法显示 · 476dd7b5
  Licx committed Aug 11, 2022
  
  476dd7b5 Browse Files
10 Aug, 2022 2 commits
- Merge branch 'release/v22.4.18-Beta-wuzhou' into develop · 26d65988
```
# Conflicts:
#	performance/Performance.Services/ConfigService.cs
```
  Licx committed Aug 10, 2022
  26d65988 Browse Files
- 核算单元编码重复 · 12d1025e
  Licx committed Aug 10, 2022
  
  12d1025e Browse Files
03 Aug, 2022 2 commits
- Merge branch 'release/v22.4.18-Beta-wuzhou' into develop · 73103dad
  Licx committed Aug 03, 2022
  
  73103dad Browse Files
- 二次分配继承 · 5e3b9fd4
  Licx committed Aug 03, 2022
  
  5e3b9fd4 Browse Files
02 Aug, 2022 2 commits
- Merge branch 'feature/管理绩效数据展示' into develop · 363a8768
  Licx committed Aug 02, 2022
  
  363a8768 Browse Files
- 预留管理保存 · 7b15f709
  纪旭韦 committed Aug 02, 2022
  
  7b15f709 Browse Files