Commits · 1fc81bdfb987690b85db888aaa73c07e0e500eae · shenshaokai / jinfa-platform

07 May, 2022 18 commits
- feat: 调整流程引擎-请购单规则 · 1fc81bdf
  前端-李俊鑫 authored May 07, 2022
  
  1fc81bdf
- feat: 新增规则引擎配置 · 02339e87
  前端-李俊鑫 authored May 07, 2022
  
  02339e87
- Merge branch 'v2-220518' into 'v2-220518' · 4bfe58ae
  许佳敏 authored May 07, 2022
```
合同流程相关

See merge request linkseeks-design/pro-platform!635
```
  4bfe58ae
- Merge branch 'v2-220518' of… · 70c9118d
  wuting authored May 07, 2022
```
Merge branch 'v2-220518' of https://gitlab.shushangyun.com/linkseeks-design/pro-platform into v2-220518
```
  70c9118d
- feat: 合同按钮权限 · 712039e6
  wuting authored May 07, 2022
  
  712039e6
- Merge branch 'v2-220418-1' into v2-220518 · 4f8594ef
  前端-许佳敏 authored May 07, 2022
  
  4f8594ef
- Merge branch 'v2-220418-1' of… · 853ad8eb
  前端-许佳敏 authored May 07, 2022
```
Merge branch 'v2-220418-1' of ssh://gitlab.shushangyun.com:8122/linkseeks-design/pro-platform into v2-220418-1
```
  853ad8eb
- feat: 合同规则相关 · d5f58b56
  wuting authored May 07, 2022
  
  d5f58b56
- Merge branch 'v2-220518' into 'v2-220518' · eda4e617
  前端-彭佳文 authored May 07, 2022
```
V2 220518

See merge request linkseeks-design/pro-platform!629
```
  eda4e617
- 物料合并518 · a97bb222
  hemin authored May 07, 2022
  
  a97bb222
- Merge branch 'feat-v2-220518-member' into 'v2-220518' · 031ce68d
  XieZhiXiong authored May 07, 2022
```
会员地址信息、发票信息

See merge request linkseeks-design/pro-platform!627
```
  031ce68d
- chore: (会员地址信息发票信息) · 2fc5bd58
  Bill authored May 07, 2022
  
  2fc5bd58
- 物料增加模块 · ffa88982
  hemin authored May 07, 2022
  
  ffa88982
- merge: 合并远程v2-220518 · 4c4fa521
  Bill authored May 07, 2022
  
  4c4fa521
- feat: (会员地址信息会员发票信息)开发完成 · c99f8609
  Bill authored May 07, 2022
  
  c99f8609
- Merge branch 'v2-220518-order' into 'v2-220518' · 1d5b4963
  XieZhiXiong authored May 07, 2022
```
feat: 对接采购订单关联请购单

See merge request linkseeks-design/pro-platform!619
```
  1d5b4963
- fix: 采购订单部分样式 · 975e2c02
  何洋 authored May 07, 2022
  
  975e2c02
- Merge branch 'v2-220518' of… · 33223642
  何洋 authored May 07, 2022
```
Merge branch 'v2-220518' of ssh://gitlab.shushangyun.com:8122/linkseeks-design/pro-platform into v2-220518-order
```
  33223642
06 May, 2022 22 commits
- Merge branch 'fix-0518-bug' into 'v2-220518' · ee33bfdd
  前端-许冠华 authored May 06, 2022
```
Fix 0518 bug

See merge request linkseeks-design/pro-platform!621
```
  ee33bfdd
- chore: 恢复router文件代码 · 05124304
  GuanHua authored May 06, 2022
  
  05124304
- fix: 发票表格项跳转页面问题 · a98422d3
  GuanHua authored May 06, 2022
  
  a98422d3
- fix: 修复国际化问题 · 2dbc366d
  GuanHua authored May 06, 2022
  
  2dbc366d
- feat: 对接采购订单关联请购单 · bfe4250a
  何洋 authored May 06, 2022
  
  bfe4250a
- Merge branch 'v2-220518' of… · e5bd6edd
  何洋 authored May 06, 2022
```
Merge branch 'v2-220518' of ssh://gitlab.shushangyun.com:8122/linkseeks-design/pro-platform into v2-220518-order
```
  e5bd6edd
- feat: 对接采购订单关联请购单 · 9a4b771c
  何洋 authored May 06, 2022
  
  9a4b771c
- Merge branch 'v2-220518-order' into 'v2-220518' · 29ce8a86
  XieZhiXiong authored May 06, 2022
```
feat: 对接采购订单关联请购单

See merge request linkseeks-design/pro-platform!616
```
  29ce8a86
- Merge branch 'v2-220518' of… · 66024135
  何洋 authored May 06, 2022
```
Merge branch 'v2-220518' of ssh://gitlab.shushangyun.com:8122/linkseeks-design/pro-platform into v2-220518-order
```
  66024135
- feat: 对接采购订单关联请购单 · 311f60ec
  何洋 authored May 06, 2022
  
  311f60ec
- Merge branch 'v2-220518' into 'v2-220518' · d7ecc726
  前端-彭佳文 authored May 06, 2022
```
fix: 跳转链接修复

See merge request linkseeks-design/pro-platform!610
```
  d7ecc726
- Merge branch 'v2-220518' into 'v2-220518' · d7cbc892
  前端-许冠华 authored May 06, 2022
```
fix: 修改请请款单配置没有流程时的展示效果

See merge request linkseeks-design/pro-platform!614
```
  d7cbc892
- Merge branch 'feat-220518' into 'v2-220518' · 61fa187b
  前端-许冠华 authored May 06, 2022
```
feat:货源清单——添加供应商物料

See merge request linkseeks-design/pro-platform!613
```
  61fa187b
- fix: 修改请请款单配置没有流程时的展示效果 · e1f9d5e6
  前端-黄佳鑫 authored May 06, 2022
  
  e1f9d5e6
- feat:货源清单——添加供应商物料 · b3b8ced4
  吴春梅 authored May 06, 2022
  
  b3b8ced4
- fix: 跳转链接修复 · 9b391edc
  wuting authored May 06, 2022
  
  9b391edc
- Merge branch 'v2-220518-order' into 'v2-220518' · deb7822b
  XieZhiXiong authored May 06, 2022
```
feat: 新增合同采购订单静态

See merge request linkseeks-design/pro-platform!609
```
  deb7822b
- feat: 新增合同采购订单静态 · 6f61e864
  何洋 authored May 06, 2022
  
  6f61e864
- feat: 新增合同采购订单静态 · c49d659e
  何洋 authored May 06, 2022
  
  c49d659e
- Merge branch 'fix-template' into 'v2-220418' · 2d967b97
  许佳敏 authored May 06, 2022
```
fix: 添加移动端装修优惠券空数据的校验

See merge request linkseeks-design/pro-platform!608

(cherry picked from commit fd1b37e8)

fcbfd187 fix: 添加移动端装修优惠券空数据的校验
```
  2d967b97
- Merge branch 'fix-template' into 'v2-220418' · 2f45f348
  许佳敏 authored May 06, 2022
```
fix: 添加移动端装修优惠券空数据的校验

See merge request linkseeks-design/pro-platform!608

(cherry picked from commit fd1b37e8)

fcbfd187 fix: 添加移动端装修优惠券空数据的校验
```
  2f45f348
- Merge branch 'v2-220518' of… · 4dcccd2c
  何洋 authored May 06, 2022
```
Merge branch 'v2-220518' of ssh://gitlab.shushangyun.com:8122/linkseeks-design/pro-platform into v2-220518-order
```
  4dcccd2c