Commits · e3b33a96f6f03051aaa118c97cd5a50c5e5443c5 · shenshaokai / jinfa-platform · GitLab

06 Jan, 2021 3 commits
- fix：交易规则中查询已设置交易规则的列表接口添加type字段，处理新增交易规则时选中非交易类型规则和电子合同项联动问题，修复采购订单列表售后功能 · e3b33a96
  前端-钟卫鹏 authored Jan 06, 2021
  
  e3b33a96
- fix：处理内部流转组件圆点显示异常 · 6434f070
  前端-钟卫鹏 authored Jan 06, 2021
  
  6434f070
- fix: 处理需求询价下单没有调用判断是否同一个工作流接口的问题，处理渠道商品修改没有保存物流信息的问题 · 72492c47
  前端-钟卫鹏 authored Jan 06, 2021
  
  72492c47
05 Jan, 2021 29 commits
- Merge branch 'test' of lingxi/lingxi-business-paltform into master · e4afb4bb
  git authored Jan 05, 2021
```
瓴犀前端能力中心v1版本
```
  e4afb4bb
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into test · 72e0ddd9
  前端-钟卫鹏 authored Jan 05, 2021
  
  72e0ddd9
- merge · f7a0df3f
  前端-许佳敏 authored Jan 05, 2021
  
  f7a0df3f
- Merge branch 'dev' into test · 492efd33
  前端-钟卫鹏 authored Jan 05, 2021
  
  492efd33
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 29b18316
  前端-钟卫鹏 authored Jan 05, 2021
  
  29b18316
- fix：处理商品区块同步取消已勾选项，处理资金账户无法正确查询对公账户的问题，处理注册时校验手机号异常，处理采购下单到付方式限制异常/切换会员清空已有的商品和支付信息 · 6a782461
  前端-钟卫鹏 authored Jan 05, 2021
  
  6a782461
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 6fef1884
  GuanHua authored Jan 05, 2021
  
  6fef1884
- refactor: 修改代码规范问题 · 2e694dc8
  GuanHua authored Jan 05, 2021
  
  2e694dc8
- Merge branch 'dev' into test · eb662144
  Bill authored Jan 05, 2021
  
  eb662144
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 04a3136b
  Bill authored Jan 05, 2021
  
  04a3136b
- 修改结算bug · 95ddd461
  Bill authored Jan 05, 2021
  
  95ddd461
- fix: 修改正则 · a438be94
  XieZhiXiong authored Jan 05, 2021
  
  a438be94
- fix: 修改名称 · dd1c0c99
  XieZhiXiong authored Jan 05, 2021
  
  dd1c0c99
- fix: 格式化时间 · 5162f8c0
  XieZhiXiong authored Jan 05, 2021
  
  5162f8c0
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 57433dde
  XieZhiXiong authored Jan 05, 2021
  
  57433dde
- feat: 添加发货单号、入库单号id · 4c9760b3
  XieZhiXiong authored Jan 05, 2021
  
  4c9760b3
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 66fbd8d6
  GuanHua authored Jan 05, 2021
  
  66fbd8d6
- fix: 商品单位是小数时,合计值问题 · 2f0b88d5
  GuanHua authored Jan 05, 2021
  
  2f0b88d5
- fix: 修复样式冲突问题 · 8b656096
  XieZhiXiong authored Jan 05, 2021
  
  8b656096
- fix: 修复单据明细多选旧数据丢失的问题 · bae3ace1
  XieZhiXiong authored Jan 05, 2021
  
  bae3ace1
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 092a1d84
  XieZhiXiong authored Jan 05, 2021
  
  092a1d84
- fix: 修复单据明细多选旧数据丢失的问题 · d881618b
  XieZhiXiong authored Jan 05, 2021
  
  d881618b
- fix: 对调字段 · 398a3b70
  XieZhiXiong authored Jan 05, 2021
  
  398a3b70
- Merge branch 'dev' into test · 7a9592eb
  前端-黄佳鑫 authored Jan 05, 2021
  
  7a9592eb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · f65e49a0
  前端-黄佳鑫 authored Jan 05, 2021
  
  f65e49a0
- 修改商品询价编辑是不可在编辑询价会员 · 8f5d3662
  前端-黄佳鑫 authored Jan 05, 2021
  
  8f5d3662
- Merge branch 'dev' into test · a9f11ed9
  前端-钟卫鹏 authored Jan 05, 2021
  
  a9f11ed9
- fix：处理订单详情物流单号入库单号跳转 · 069a80d8
  前端-钟卫鹏 authored Jan 05, 2021
  
  069a80d8
- fix: 修复最大可换货数量判断错误的问题 · 08dfd448
  XieZhiXiong authored Jan 05, 2021
  
  08dfd448
04 Jan, 2021 8 commits
- fix: 处理订单详情发货信息显示异常，处理询价下单简单流程签署合同异常 · 5ebf02a8
  前端-钟卫鹏 authored Jan 04, 2021
  
  5ebf02a8
- Merge branch 'dev' into test · 62985240
  前端-钟卫鹏 authored Jan 04, 2021
  
  62985240
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 4d3ad00c
  前端-钟卫鹏 authored Jan 04, 2021
  
  4d3ad00c
- fix：订单详情发货明细中添加跳转，处理再次点击同样的菜单重载页面没有清空筛选的数据问题 · d8d19164
  前端-钟卫鹏 authored Jan 04, 2021
  
  d8d19164
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 6b1044b8
  GuanHua authored Jan 04, 2021
  
  6b1044b8
- fix: 店铺收藏列表字段显示问题 · 9b5133ae
  GuanHua authored Jan 04, 2021
  
  9b5133ae
- fix：处理订单模块没有订单状态和订单类型搜索、解决详情页没有查看发票/支付比例没有查看支付结果的问题，处理新增订单到付方式限制使用异常，变更主内容区块的mar… · 49863d81
  前端-钟卫鹏 authored Jan 04, 2021
```
fix：处理订单模块没有订单状态和订单类型搜索、解决详情页没有查看发票/支付比例没有查看支付结果的问题，处理新增订单到付方式限制使用异常，变更主内容区块的margin值，处理资金账户待支付提现查询对公账户异常
```
  49863d81
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 85178a42
  Bill authored Jan 04, 2021
  
  85178a42