Commits · 1ef0ce76df6115c1042c769fb916214ce0f6f10c · 王衍超 / rbc-demo · GitLab

11 Feb, 2022 6 commits
- fix: 图标样式 · 1ef0ce76
  袁成 authored Feb 11, 2022
  
  1ef0ce76 Browse Files
- fix:隐藏已选 · 775d570e
  袁成 authored Feb 11, 2022
  
  775d570e Browse Files
- Merge branch 'develop-fengjiansheng' into 'develop' · dd458d64
```
fix(@gms/gms-plugin-billexpand): 保存和暂存按钮报错信息

See merge request GFP/RBC/rbc-frontend!39
```
  乔延琦 authored Feb 11, 2022
  dd458d64 Browse Files
- fix(@gms/gms-plugin-billexpand): 保存和暂存按钮报错信息 · a4b3f92d
  fengjiansheng authored Feb 11, 2022
  
  a4b3f92d Browse Files
- Merge branch 'develop-yuancheng' into 'develop' · 9ac4722f
```
fix: 暂存保存状态

See merge request GFP/RBC/rbc-frontend!38
```
  乔延琦 authored Feb 11, 2022
  9ac4722f Browse Files
- fix: 暂存保存状态 · 42250457
  袁成 authored Feb 11, 2022
  
  42250457 Browse Files
10 Feb, 2022 23 commits
- Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend… · ff20ea8a
```
Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend into develop-qiaoyanqi
```
  qiaoyanqi authored Feb 10, 2022
  ff20ea8a Browse Files
- 改版本号 · 811e5d10
  qiaoyanqi authored Feb 10, 2022
  
  811e5d10 Browse Files
- Merge branch 'develop-yuancheng' into 'develop' · 0a33af53
```
Develop yuancheng

See merge request GFP/RBC/rbc-frontend!37
```
  乔延琦 authored Feb 10, 2022
  0a33af53 Browse Files
- fix:按钮禁用状态 · 7e6587ac
  袁成 authored Feb 10, 2022
  
  7e6587ac Browse Files
- Merge branch 'develop' of ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend into develop-yuancheng · 09ca1dca
  袁成 authored Feb 10, 2022
  
  09ca1dca Browse Files
- Merge branch 'develop-zhouyi' into 'develop' · 30938bc1
```
fix(@rbc/rbc-login): 低版本浏览器报错

See merge request GFP/RBC/rbc-frontend!36
```
  乔延琦 authored Feb 10, 2022
  30938bc1 Browse Files
- 草稿不回显账户信息 · f978d436
  qiaoyanqi authored Feb 10, 2022
  
  f978d436 Browse Files
- fix(@rbc/rbc-login): 低版本浏览器报错 · 119ce245
  Joey authored Feb 10, 2022
  
  119ce245 Browse Files
- fix: vxeTable 中获取定义时机问题 · 2041ff3b
  袁成 authored Feb 10, 2022
  
  2041ff3b Browse Files
- Merge branch 'develop-fengjiansheng' into 'develop' · 0ba08ff0
```
fix(@gms/gms-plugin-billexpand): 修改暂存按钮调用统一接口

See merge request GFP/RBC/rbc-frontend!35
```
  乔延琦 authored Feb 10, 2022
  0ba08ff0 Browse Files
- fix(@gms/gms-plugin-billexpand): 修改暂存按钮调用统一接口 · c951a8a7
  fengjiansheng authored Feb 10, 2022
  
  c951a8a7 Browse Files
- Merge branch 'develop-yuancheng' into 'develop' · 23d0e4a2
```
Develop yuancheng

See merge request GFP/RBC/rbc-frontend!34
```
  乔延琦 authored Feb 10, 2022
  23d0e4a2 Browse Files
- fix: 分组列表类型基础数据过滤叶子节点 · c17a68c8
  袁成 authored Feb 10, 2022
  
  c17a68c8 Browse Files
- Merge branch 'develop' of ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend into develop-yuancheng · dc3023cf
  袁成 authored Feb 10, 2022
  
  dc3023cf Browse Files
- Merge branch 'develop-zhouyi' into 'develop' · 4d6860db
```
Develop zhouyi

See merge request GFP/RBC/rbc-frontend!33
```
  乔延琦 authored Feb 10, 2022
  4d6860db Browse Files
- fix(@gms/gms-plugin-billexpand): 修复作为外部系统嵌入找不到taskId的问题 · b18058d6
```
- 改用将taskId保存在window.GMS上的方式
```
  Joey authored Feb 10, 2022
  b18058d6 Browse Files
- fix(@gms/gms-plugin-billexpand): 增加没有找到选择审批人时的提示 · f6d68162
  Joey authored Feb 10, 2022
  
  f6d68162 Browse Files
- fix: indexMixin watch value · 4db6d38f
  袁成 authored Feb 10, 2022
  
  4db6d38f Browse Files
- fix: 查看单据情况下按钮状态 · 3b3a8c24
  袁成 authored Feb 10, 2022
  
  3b3a8c24 Browse Files
- Merge branch 'develop-zhouyi' into 'develop' · 6ebac789
```
Develop zhouyi

See merge request GFP/RBC/rbc-frontend!32
```
  乔延琦 authored Feb 10, 2022
  6ebac789 Browse Files
- fix(@gms/gms-plugin-billexpand): 获取审批人204时应直接同意 · 5033f557
  Joey authored Feb 10, 2022
  
  5033f557 Browse Files
- feat(@gms/gms-plugin-billexpand): 驳回单据审批轨迹显示被驳回流程 · 06107e61
  Joey authored Feb 10, 2022
  
  06107e61 Browse Files
- 上张页码不能无限减小 · a2335d68
  qiaoyanqi authored Feb 10, 2022
  
  a2335d68 Browse Files
09 Feb, 2022 11 commits
- Merge branch 'develop-zhouyi' into 'develop' · 948b88d9
```
fix(@gms/gms-plugin-billexpand): 保存和审批按钮报错信息

See merge request GFP/RBC/rbc-frontend!31
```
  乔延琦 authored Feb 09, 2022
  948b88d9 Browse Files
- fix(@gms/gms-plugin-billexpand): 保存和审批按钮报错信息 · f96dfed7
  Joey authored Feb 09, 2022
  
  f96dfed7 Browse Files
- Merge branch 'develop-yuancheng' into 'develop' · 256dcad8
```
Develop yuancheng

See merge request GFP/RBC/rbc-frontend!30
```
  乔延琦 authored Feb 09, 2022
  256dcad8 Browse Files
- Merge branch 'develop' of ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend into develop-yuancheng · 5007b8b4
  袁成 authored Feb 09, 2022
  
  5007b8b4 Browse Files
- fix:去掉报销单 · 2a76815f
  袁成 authored Feb 09, 2022
  
  2a76815f Browse Files
- Merge branch 'develop-qiaoyanqi' into 'develop' · 1bfe9f4c
```
Develop qiaoyanqi

See merge request GFP/RBC/rbc-frontend!28
```
  乔延琦 authored Feb 09, 2022
  1bfe9f4c Browse Files
- Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend… · dd118328
```
Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend into develop-qiaoyanqi

# Conflicts:
#	develop/@gms/gms-plugin-billexpand/src/actions/saveAction.js
```
  qiaoyanqi authored Feb 09, 2022
  dd118328 Browse Files
- 保存。上张下张index · b02fe999
  qiaoyanqi authored Feb 09, 2022
  
  b02fe999 Browse Files
- Merge branch 'develop-yuancheng' into 'develop' · 75370c16
```
Develop yuancheng

See merge request GFP/RBC/rbc-frontend!27
```
  乔延琦 authored Feb 09, 2022
  75370c16 Browse Files
- fix: 下拉和弹框同时显示问题 · 23173b3e
  袁成 authored Feb 09, 2022
  
  23173b3e Browse Files
- Merge branch 'develop-zhouyi' into 'develop' · e13d2a4f
```
fix(@gms/gms-plugin-billexpand): 报销单保存按钮驳回后禁用

See merge request GFP/RBC/rbc-frontend!26
```
  乔延琦 authored Feb 09, 2022
  e13d2a4f Browse Files