Commits · 19275003af41000970c0e3c3f1d5b4a1fe01f063 · 王衍超 / rbc-demo

16 Mar, 2022 12 commits
- 还原计划任务得版本 · 19275003
  wangcong authored Mar 16, 2022
  
  19275003 Browse Files
- Merge branch 'develop-raojiaguan' into 'develop' · 6a60fe2d
```
借款单引用公式

See merge request GFP/RBC/rbc-frontend!102
```
  乔延琦 authored Mar 16, 2022
  6a60fe2d Browse Files
- Merge branch 'develop-zhouyi' into 'develop' · 3ce45cf4
```
fix(@gms/gms-plugin-billexpand): 写入主表模板字符串若字段为空不应显示undefined

See merge request GFP/RBC/rbc-frontend!103
```
  乔延琦 authored Mar 16, 2022
  3ce45cf4 Browse Files
- 借款单引用公式 · 50085fe5
  raojiaguan authored Mar 16, 2022
  
  50085fe5 Browse Files
- solution.json · f436e92a
  qiaoyanqi authored Mar 16, 2022
  
  f436e92a Browse Files
- Merge branch 'develop-yuancheng' into 'develop' · 8a8b35c9
```
Develop yuancheng

See merge request GFP/RBC/rbc-frontend!101
```
  乔延琦 authored Mar 16, 2022
  8a8b35c9 Browse Files
- Merge branch 'develop' of ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend into develop-yuancheng · 99de5a76
  袁成 authored Mar 16, 2022
  
  99de5a76 Browse Files
- fix · 4af115aa
  袁成 authored Mar 16, 2022
  
  4af115aa Browse Files
- 撤回 · 6ce4ca83
  qiaoyanqi authored Mar 16, 2022
  
  6ce4ca83 Browse Files
- 刷新异步 · 83bbf04f
  qiaoyanqi authored Mar 16, 2022
  
  83bbf04f Browse Files
- Merge branch 'develop-yuancheng' into 'develop' · 770a8f92
```
Develop yuancheng

See merge request GFP/RBC/rbc-frontend!100
```
  乔延琦 authored Mar 16, 2022
  770a8f92 Browse Files
- fix(@gms/gms-plugin-billexpand): 写入主表模板字符串若字段为空不应显示undefined · bbd45658
  Joey authored Mar 16, 2022
  
  bbd45658 Browse Files
15 Mar, 2022 15 commits
- Merge branch 'develop' of ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend into develop-yuancheng · 13baccc0
  袁成 authored Mar 15, 2022
  
  13baccc0 Browse Files
- fix同意驳回 · a769d436
  袁成 authored Mar 15, 2022
  
  a769d436 Browse Files
- Merge branch 'develop-zhouyi' into 'develop' · 629849b7
```
Develop zhouyi

See merge request GFP/RBC/rbc-frontend!99
```
  乔延琦 authored Mar 15, 2022
  629849b7 Browse Files
- feat(@gms/gms-plugin-billexpand): 增加根据子表往主表写字符串的公式 · 8430fd31
  Joey authored Mar 15, 2022
  
  8430fd31 Browse Files
- feat(@gms/gms-plugin-billexpand): 审批意见最大长度 · eefdf093
  Joey authored Mar 15, 2022
  
  eefdf093 Browse Files
- Merge branch 'develop-yinliqian' into 'develop' · 5b38e437
```
修改保存提示

See merge request GFP/RBC/rbc-frontend!98
```
  乔延琦 authored Mar 15, 2022
  5b38e437 Browse Files
- 修改保存提示 · cbc5eba1
  yinliqian authored Mar 15, 2022
  
  cbc5eba1 Browse Files
- fix: 同意驳回增加登陆人与审批人校验 · f26f1564
  袁成 authored Mar 15, 2022
  
  f26f1564 Browse Files
- 提交 · df951d37
  qiaoyanqi authored Mar 15, 2022
  
  df951d37 Browse Files
- 页签和不是页签 · 2f945dc9
  qiaoyanqi authored Mar 15, 2022
  
  2f945dc9 Browse Files
- 没有页签 · 0fa8667a
  qiaoyanqi authored Mar 15, 2022
  
  0fa8667a Browse Files
- 刷新气泡 · b0a8f7db
  qiaoyanqi authored Mar 15, 2022
  
  b0a8f7db Browse Files
- 错误提示 · ee49da15
  qiaoyanqi authored Mar 15, 2022
  
  ee49da15 Browse Files
- Merge branch 'develop-yinliqian' into 'develop' · 537ebe08
```
修改保存提示信息

See merge request GFP/RBC/rbc-frontend!97
```
  乔延琦 authored Mar 15, 2022
  537ebe08 Browse Files
- 修改保存提示信息 · 851b6d33
  yinliqian authored Mar 15, 2022
  
  851b6d33 Browse Files
14 Mar, 2022 13 commits
- Merge branch 'develop-zhouyi' into 'develop' · 7a2ef886
```
feat(@gms/gms-plugin-billexpand): 提交、同意、驳回换接口

See merge request GFP/RBC/rbc-frontend!96
```
  乔延琦 authored Mar 14, 2022
  7a2ef886 Browse Files
- feat(@gms/gms-plugin-billexpand): 提交、同意、驳回换接口 · 0c7043e1
  Joey authored Mar 14, 2022
  
  0c7043e1 Browse Files
- Merge branch 'develop-raojiaguan' into 'develop' · 9cba7d81
```
修改公式描述

See merge request GFP/RBC/rbc-frontend!95
```
  饶甲官 authored Mar 14, 2022
  9cba7d81 Browse Files
- 修改公式描述 · b5d4395b
  raojiaguan authored Mar 14, 2022
  
  b5d4395b Browse Files
- Merge branch 'develop-raojiaguan' into 'develop' · 83568842
```
Develop raojiaguan

See merge request GFP/RBC/rbc-frontend!94
```
  饶甲官 authored Mar 14, 2022
  83568842 Browse Files
- Merge remote-tracking branch 'origin/develop-raojiaguan' into develop · c91d3175
```
# Conflicts:
#	develop/@gms/gms-plugin-billexpand/src/emcon.js
#	develop/@gms/gms-plugin-billexpand/src/mcon.js
```
  raojiaguan authored Mar 14, 2022
  c91d3175 Browse Files
- 上张下张加减 · d271528e
  qiaoyanqi authored Mar 14, 2022
  
  d271528e Browse Files
- 根据多个条件去过滤基础数据 · 0d6725de
  raojiaguan authored Mar 14, 2022
  
  0d6725de Browse Files
- Merge branch 'develop-zhouyi' into 'develop' · 4d148173
```
fix(@gms/gms-plugin-billexpand): 基础数据选择不显示停用基础数据

See merge request GFP/RBC/rbc-frontend!92
```
  乔延琦 authored Mar 14, 2022
  4d148173 Browse Files
- fix(@gms/gms-plugin-billexpand): 基础数据选择不显示停用基础数据 · 0b540dce
  Joey authored Mar 14, 2022
  
  0b540dce Browse Files
- Merge branch 'develop-zhouyi' into 'develop' · 49516c21
```
feat(@gms/gms-plugin-billexpand): 同意时运行公式，并处理确认保存

See merge request GFP/RBC/rbc-frontend!91
```
  乔延琦 authored Mar 14, 2022
  49516c21 Browse Files
- feat(@gms/gms-plugin-billexpand): 同意时运行公式，并处理确认保存 · 9fc87344
  Joey authored Mar 14, 2022
  
  9fc87344 Browse Files
- Merge branch 'develop-wangshenyang' into 'develop' · ca04a616
```
添加公式：获取当前登录用户关联职员的某个字段值

See merge request GFP/RBC/rbc-frontend!90
```
  王申洋 authored Mar 14, 2022
  ca04a616 Browse Files