Commits · feacd910d085644dcde5b29740f6bb8d00dc07f3 · linweijiong / jinfa-platform · GitLab

23 Oct, 2020 35 commits
- Merge branch 'dev' into test · feacd910
  前端-黄佳鑫 authored Oct 23, 2020
  
  feacd910
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · fc0c74b7
  前端-黄佳鑫 authored Oct 23, 2020
  
  fc0c74b7
- 修改需求报价审核的bug · 3902b53e
  前端-黄佳鑫 authored Oct 23, 2020
  
  3902b53e
- fix:修复生成电子合同时没选中 · 03773e6d
  前端-许佳敏 authored Oct 23, 2020
  
  03773e6d
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into test · 38cd6020
  前端-许佳敏 authored Oct 23, 2020
  
  38cd6020
- merge · 7cb628d4
  前端-许佳敏 authored Oct 23, 2020
  
  7cb628d4
- fix:收发货与回单逻辑冲突 · e20e418a
  前端-许佳敏 authored Oct 23, 2020
  
  e20e418a
- fix:仓位出现默认值后无法被initValue修改 · b83216fb
  前端-许佳敏 authored Oct 23, 2020
  
  b83216fb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 52e890ab
  XieZhiXiong authored Oct 23, 2020
  
  52e890ab
- 调整进销存路由相关 · b67e6c03
  XieZhiXiong authored Oct 23, 2020
  
  b67e6c03
- 订单文案修改 · c1dae385
  前端-许佳敏 authored Oct 23, 2020
  
  c1dae385
- fix:修改订单类型文案 · 0a1a83c2
  前端-许佳敏 authored Oct 23, 2020
  
  0a1a83c2
- fix:收货订单查看 · 9d3ec4c2
  前端-许佳敏 authored Oct 23, 2020
  
  9d3ec4c2
- fix:批量提交优化 · 364fb8da
  前端-许佳敏 authored Oct 23, 2020
  
  364fb8da
- 待审核订单批量提交体验优化 · 55bc792d
  前端-许佳敏 authored Oct 23, 2020
  
  55bc792d
- 解决冲突 · 5a63d16f
  前端-黄佳鑫 authored Oct 23, 2020
  
  5a63d16f
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · ebc0a408
  前端-黄佳鑫 authored Oct 23, 2020
  
  ebc0a408
- 修改需求发布新增品类回显的问题，修改商品询价审核二级审核按钮置灰的问题 · 6998047b
  前端-黄佳鑫 authored Oct 23, 2020
  
  6998047b
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 02ac76a9
  前端-许佳敏 authored Oct 23, 2020
  
  02ac76a9
- fix:加入忘记密码校验 · 2bb62c82
  前端-许佳敏 authored Oct 23, 2020
  
  2bb62c82
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · b9e57133
  XieZhiXiong authored Oct 23, 2020
  
  b9e57133
- 调整会员管理相关路由 · efef4efe
  XieZhiXiong authored Oct 23, 2020
  
  efef4efe
- fix:订单流转补充字段 · a5198e4a
  前端-许佳敏 authored Oct 23, 2020
  
  a5198e4a
- fix:商城跳转的订单,加入回显数据,传多一个roleId参数 · 4554d541
  前端-许佳敏 authored Oct 23, 2020
  
  4554d541
- fix: 处理新增商品提交异常、处理新增商品再次变动价格图片清空问题 · 1f43df86
  前端-钟卫鹏 authored Oct 23, 2020
  
  1f43df86
- fix · 840d2089
  前端-许佳敏 authored Oct 23, 2020
  
  840d2089
- 修改构建文件 · 7792ba9a
  前端-许佳敏 authored Oct 23, 2020
  
  7792ba9a
- 修改构建文件 · 5aae74f4
  前端-许佳敏 authored Oct 23, 2020
  
  5aae74f4
- 职位改为必填 · f40bad9b
  前端-许佳敏 authored Oct 23, 2020
  
  f40bad9b
- fix:引入charts首字母大写 · b0ba0430
  前端-许佳敏 authored Oct 23, 2020
  
  b0ba0430
- fix:修复订单金额无法正常显示 · df4c048d
  前端-许佳敏 authored Oct 23, 2020
  
  df4c048d
- fix:物流公司查询新增参数 · 924e6db4
  前端-许佳敏 authored Oct 23, 2020
  
  924e6db4
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · fdc189cf
  XieZhiXiong authored Oct 23, 2020
  
  fdc189cf
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into test · e6e33cf2
  前端-许佳敏 authored Oct 23, 2020
  
  e6e33cf2
- 恢复demo.js · d8a05354
  前端-许佳敏 authored Oct 23, 2020
  
  d8a05354
22 Oct, 2020 5 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · e3b44856
  XieZhiXiong authored Oct 22, 2020
  
  e3b44856
- fixbug · 1b710b91
  XieZhiXiong authored Oct 22, 2020
  
  1b710b91
- Merge branch 'dev' into test · 077c7204
  前端-黄佳鑫 authored Oct 22, 2020
  
  077c7204
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · bea0b8fd
  前端-黄佳鑫 authored Oct 22, 2020
  
  bea0b8fd
- 修改需求发布新增回显等问题和商品询价搜索的问题 · 5fc20dc5
  前端-黄佳鑫 authored Oct 22, 2020
  
  5fc20dc5