Commits · d89297fd670c698044496b130e77bf42349d3730 · zhangyusheng / YX_IDENT_beijing_auxiliary_YD

08 May, 2019 1 commit
- 修改查询膜、卡体统计报表 · d89297fd
  dahai authored May 08, 2019
  
  d89297fd
07 May, 2019 14 commits
- Merge remote-tracking branch 'origin/dev' into dev · 6782a3e0
  dahai authored May 07, 2019
  
  6782a3e0
- 修改查询膜、卡体出入库记录（管理人员查看全部工作人员查看本人记录） · deced8b9
  dahai authored May 07, 2019
  
  deced8b9
- 修改页面词语描述，添加耗材数量校验 · effdda8f
  ad authored May 07, 2019
  
  effdda8f
- Merge remote-tracking branch 'origin/dev' into dev · 42b1cf44
  dahai authored May 07, 2019
```
# Conflicts:
#	src/main/resources/static/views/filmManagement/filmManagement.html
```
  42b1cf44
- 搜索框添加工作组属性 · 3c1c71da
  dahai authored May 07, 2019
  
  3c1c71da
- 修改页面词语描述，添加出库数量校验，注释分拣任务单选择框禁用 · 0710ea76
  ad authored May 07, 2019
  
  0710ea76
- 分拣转出任务单弹框bug · ba56389b
  liboyang authored May 07, 2019
  
  ba56389b
- Merge remote-tracking branch 'origin/dev' into dev · c60202fa
  liboyang authored May 07, 2019
  
  c60202fa
- 分拣转出任务单弹框bug · 92d6d24c
  liboyang authored May 07, 2019
  
  92d6d24c
- push · 25f8ca54
  dahai authored May 07, 2019
  
  25f8ca54
- Merge remote-tracking branch 'origin/dev' into dev · 22e694ae
  liboyang authored May 07, 2019
  
  22e694ae
- 膜管理页面上传 · 60ef1a62
  liboyang authored May 07, 2019
  
  60ef1a62
- push · c9bf7319
  dahai authored May 07, 2019
  
  c9bf7319
- push · 7948f25b
  dahai authored May 07, 2019
  
  7948f25b
06 May, 2019 11 commits
- 查询未审核的耗材记录和所选日期的已审核的耗材记录 · 898fc81c
  liboyang authored May 06, 2019
  
  898fc81c
- Merge remote-tracking branch 'origin/dev' into dev · 970805ae
  liboyang authored May 06, 2019
  
  970805ae
- 查询未审核的耗材记录和所选日期的已审核的耗材记录 · 69868142
  liboyang authored May 06, 2019
  
  69868142
- Merge remote-tracking branch 'origin/dev' into dev · 901a6f17
  dahai authored May 06, 2019
  
  901a6f17
- 修改查询卡机操作记录未审核的详情 · e2e27668
  dahai authored May 06, 2019
  
  e2e27668
- 膜打印更新工作组 · 48c31f4a
  liboyang authored May 06, 2019
  
  48c31f4a
- 膜打印更新工作组 · 7ab7d08a
  liboyang authored May 06, 2019
  
  7ab7d08a
- Merge branch 'dev' of… · 2d751025
  liboyang authored May 06, 2019
```
Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev
```
  2d751025
- 查询提交人上传的废证详情 · d57c79cd
  liboyang authored May 06, 2019
  
  d57c79cd
- Merge branch 'dev' of… · 4f2e970e
  ad authored May 06, 2019
```
Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev
```
  4f2e970e
- 查询提交人上传的废证详情 · 0bd6a4f2
  liboyang authored May 06, 2019
  
  0bd6a4f2
05 May, 2019 1 commit
- 修改页面排版 · e3208199
  ad authored May 05, 2019
  
  e3208199
30 Apr, 2019 3 commits
- Merge branch 'dev' of… · 4698358a
  ad authored Apr 30, 2019
```
Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev
```
  4698358a
- 添加并修改查询提交人提交的废证详情 · 01d623dd
  dahai authored Apr 30, 2019
  
  01d623dd
- Merge branch 'dev' of… · 318e838f
  ad authored Apr 30, 2019
```
Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev
```
  318e838f
29 Apr, 2019 9 commits
- 分拣转出任务单时，没选中任务单给提示 · 8c4dd12e
  liboyang authored Apr 29, 2019
  
  8c4dd12e
- Merge remote-tracking branch 'origin/dev' into dev · 427e18fb
  dahai authored Apr 29, 2019
  
  427e18fb
- push · b06ab6e5
  dahai authored Apr 29, 2019
  
  b06ab6e5
- 膜耗材和卡体耗材报表 · be2c4b0c
  liboyang authored Apr 29, 2019
  
  be2c4b0c
- push · b1f92810
  dahai authored Apr 29, 2019
  
  b1f92810
- push · 4b352260
  dahai authored Apr 29, 2019
  
  4b352260
- push · ffa69f1c
  dahai authored Apr 29, 2019
  
  ffa69f1c
- 添加查询操作人信息 · e0a89967
  dahai authored Apr 29, 2019
  
  e0a89967
- 添加卡机统计报表、膜统计报表 · e8631987
  dahai authored Apr 29, 2019
```
修改耗材统计流程
添加耗材审核工位
```
  e8631987
28 Apr, 2019 1 commit
- Merge remote-tracking branch 'origin/dev' into dev · 083f6f22
  dahai authored Apr 28, 2019
  
  083f6f22