Commits · 0c7043e1cfeaf0bd0e9022acc887465d88502090 · 王衍超 / rbc-demo · GitLab

14 Mar, 2022 18 commits
- 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
- 添加公式：获取当前登录用户关联职员的某个字段值 · c5948e11
  wangshenyang authored Mar 14, 2022
  
  c5948e11 Browse Files
- 事件注销指定函数 · b49ef690
  qiaoyanqi authored Mar 14, 2022
  
  b49ef690 Browse Files
- Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend… · 965f4b2f
```
Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend into develop-qiaoyanqi
```
  qiaoyanqi authored Mar 14, 2022
  965f4b2f Browse Files
- Merge branch 'develop-qiaoyanqi' into 'develop' · d19d7984
```
上张下张抽取出去一个js  多页签 刷新单据，需要判断是否是当前页签

See merge request GFP/RBC/rbc-frontend!89
```
  乔延琦 authored Mar 14, 2022
  d19d7984 Browse Files
- 删除当前代码 · 149fb751
  qiaoyanqi authored Mar 14, 2022
  
  149fb751 Browse Files
- 同意驳回加信息提示校验 · 56ab16fa
  qiaoyanqi authored Mar 14, 2022
  
  56ab16fa Browse Files
11 Mar, 2022 13 commits
- 上张下张抽取出去一个js 多页签刷新单据，需要判断是否是当前页签 · fc97fca8
  qiaoyanqi authored Mar 11, 2022
  
  fc97fca8 Browse Files
- Merge branch 'develop-yuancheng' into 'develop' · 76168405
```
Develop yuancheng

See merge request GFP/RBC/rbc-frontend!88
```
  乔延琦 authored Mar 11, 2022
  76168405 Browse Files
- fix:同意驳回 · e63c7ea1
  袁成 authored Mar 11, 2022
  
  e63c7ea1 Browse Files
- Merge branch 'develop' of ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend into develop-yuancheng · e6ece811
  袁成 authored Mar 11, 2022
  
  e6ece811 Browse Files
- Merge branch 'develop-zhouyi' into 'develop' · 5d1bf5c9
```
fix(@rbc/workflow-job-view): 表头对齐方式

See merge request GFP/RBC/rbc-frontend!87
```
  乔延琦 authored Mar 11, 2022
  5d1bf5c9 Browse Files
- fix(@rbc/workflow-job-view): 表头对齐方式 · ada6293a
  Joey authored Mar 11, 2022
  
  ada6293a Browse Files
- fix: 审批之后设置只读 · fe3e28cb
  袁成 authored Mar 11, 2022
  
  fe3e28cb Browse Files
- Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend… · a0689578
```
Merge branch 'develop' of http://nvwa.jiuqi.com.cn/gitlab/GFP/RBC/rbc-frontend into develop-qiaoyanqi
```
  qiaoyanqi authored Mar 11, 2022
  a0689578 Browse Files
- 主表映射关系如果是空的就不赋值 · c55c28c9
  qiaoyanqi authored Mar 11, 2022
  
  c55c28c9 Browse Files
- Merge branch 'develop-zhouyi' into 'develop' · 0c0c257a
```
Develop zhouyi

See merge request GFP/RBC/rbc-frontend!86
```
  乔延琦 authored Mar 11, 2022
  0c0c257a Browse Files
- feat(@rbc/bill-runner-query): 记录当前tab，刷新数据时保留tab · 1e07d73a
  Joey authored Mar 11, 2022
  
  1e07d73a Browse Files
- feat(@gms/gms-plugin-billexpand): 审批意见最大长度 · b2ad6a51
  Joey authored Mar 11, 2022
  
  b2ad6a51 Browse Files
- 单据里面的删除接口也改变 · b2bc6f6f
  qiaoyanqi authored Mar 11, 2022
  
  b2bc6f6f Browse Files
10 Mar, 2022 9 commits
- 信息发生变化 · 31a2d696
  qiaoyanqi authored Mar 10, 2022
  
  31a2d696 Browse Files
- 查询列表的删除 · 1b611e3c
  qiaoyanqi authored Mar 10, 2022
  
  1b611e3c Browse Files
- Merge branch 'develop-zhouyi' into 'develop' · aadaa0d6
```
fix(@gms/gms-plugin-billexpand): 保存按钮读取GMS.queryObject报错

See merge request GFP/RBC/rbc-frontend!85
```
  乔延琦 authored Mar 10, 2022
  aadaa0d6 Browse Files
- fix(@gms/gms-plugin-billexpand): 保存按钮读取GMS.queryObject报错 · 05dc5290
  Joey authored Mar 10, 2022
  
  05dc5290 Browse Files
- Merge branch 'develop-yuancheng' into 'develop' · 409e20bb
```
Develop yuancheng

See merge request GFP/RBC/rbc-frontend!83
```
  乔延琦 authored Mar 10, 2022
  409e20bb Browse Files
- Merge branch 'develop-zhouyi' into 'develop' · b9d3aa29
```
feat(@rbc/workflow-job-view): 切换页签时刷新

See merge request GFP/RBC/rbc-frontend!84
```
  乔延琦 authored Mar 10, 2022
  b9d3aa29 Browse Files
- feat(@rbc/workflow-job-view): 切换页签时刷新 · 95b9bc0c
  Joey authored Mar 10, 2022
  
  95b9bc0c Browse Files
- 暂存 · 9193e368
  qiaoyanqi authored Mar 10, 2022
  
  9193e368 Browse Files
- 河北报销 · 8011fb4c
  qiaoyanqi authored Mar 10, 2022
  
  8011fb4c Browse Files