Commits · 18f2def34bd89d02d541a4fa9dcc9e3c72ae94e3 · 王衍超 / rbc-demo · GitLab

18 Mar, 2022 6 commits
- 组件注销 · 18f2def3
  qiaoyanqi authored Mar 18, 2022
  
  18f2def3 Browse Files
- Merge branch 'basedataapi' into 'develop' · 0fdcb3aa
```
basedata api

See merge request GFP/RBC/rbc-frontend!110
```
  乔延琦 authored Mar 18, 2022
  0fdcb3aa Browse Files
- basedata api · 4c7a83fe
  Joey authored Mar 07, 2022
  
  4c7a83fe Browse Files
- 代码优化 · 53930fc8
  qiaoyanqi authored Mar 18, 2022
  
  53930fc8 Browse Files
- Merge branch 'develop-zhouyi' into 'develop' · 968f104e
```
fix(@gms/gms-plugin-billexpand): 公式applyTemplateString

See merge request GFP/RBC/rbc-frontend!109
```
  乔延琦 authored Mar 18, 2022
  968f104e Browse Files
- fix(@gms/gms-plugin-billexpand): 公式applyTemplateString · d11a979e
```
- 进入单据编辑状态时字段被清空
- 对比子表前后变化避免多次执行
```
  Joey authored Mar 18, 2022
  d11a979e Browse Files
17 Mar, 2022 14 commits
- Merge branch 'develop-fengjiansheng' into 'develop' · 18d1af9d
```
feat(@gms/gms-plugin-billexpand): 增加子表赋值公式

See merge request GFP/RBC/rbc-frontend!107
```
  乔延琦 authored Mar 17, 2022
  18d1af9d Browse Files
- Merge branch 'develop-yuancheng' into 'develop' · 9a237401
```
Develop yuancheng

See merge request GFP/RBC/rbc-frontend!108
```
  乔延琦 authored Mar 17, 2022
  9a237401 Browse Files
- solution.json · 4c07af03
  qiaoyanqi authored Mar 17, 2022
  
  4c07af03 Browse Files
- 查看详情扩展字段参数 · 323a1fa6
  qiaoyanqi authored Mar 17, 2022
  
  323a1fa6 Browse Files
- fix: 基础数据组件 · e5ef073a
  袁成 authored Mar 17, 2022
  
  e5ef073a Browse Files
- Merge branch 'develop' of ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend into develop-yuancheng · ddebe5e9
  袁成 authored Mar 17, 2022
  
  ddebe5e9 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop-fengjiansheng · 653a2fa0
```
# Conflicts:
#	develop/@gms/gms-plugin-billexpand/src/mcon.js
```
  fengjiansheng authored Mar 17, 2022
  653a2fa0 Browse Files
- feat(@gms/gms-plugin-billexpand): 增加子表赋值公式 · 2b22189e
  fengjiansheng authored Mar 17, 2022
  
  2b22189e Browse Files
- 基础数据屏蔽一个不用的方法 · 4824910c
  qiaoyanqi authored Mar 17, 2022
  
  4824910c Browse Files
- Merge branch 'develop' of ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend into develop-yuancheng · 7c790a11
  袁成 authored Mar 17, 2022
  
  7c790a11 Browse Files
- Merge branch 'develop-raojiaguan' into 'develop' · e18ffe10
```
冲突解决

See merge request GFP/RBC/rbc-frontend!106
```
  乔延琦 authored Mar 17, 2022
  e18ffe10 Browse Files
- 冲突解决 · a9d2891f
  raojiaguan authored Mar 17, 2022
  
  a9d2891f Browse Files
- Merge branch 'develop-raojiaguan' into 'develop' · e541c80a
```
冲突解决

See merge request GFP/RBC/rbc-frontend!105
```
  乔延琦 authored Mar 17, 2022
  e541c80a Browse Files
- 冲突解决 · bf49ffe4
  raojiaguan authored Mar 17, 2022
  
  bf49ffe4 Browse Files
16 Mar, 2022 13 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
- fix: 修改提示信息 · c38d5a20
  袁成 authored Mar 16, 2022
  
  c38d5a20 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 7 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