phsl / admin

Merge pull request !375 from moon69/N/A

Merge pull request !311 from dhb52/master

Merge pull request !371 from AKING/N/A

Merge pull request !372 from AKING/N/A

Signed-off-by: moon69 <1016830869@qq.com>

Merge pull request !373 from AKING/N/A

解决了跳转不带参数的问题

Signed-off-by: AKING <2734339436@qq.com>

字段映射的功能点添加，已测

Signed-off-by: AKING <2734339436@qq.com>

此处添加了字段映射字段，方便在description在展示的时候减少slot的使用使用方式如下

// 确认人 confirmUser
  {
    label: '确认人',
    field: 'confirmUser',
    minWidth: 120,
    isForm: false,
    isDetail: true,
    detail: {
      mappedField: 'confirmUserName'
    }
  },

Signed-off-by: AKING <2734339436@qq.com>

Merge pull request !365 from 云开/feature/BPM_CC

Merge pull request !363 from puhui999/dev-crm

Merge pull request !364 from dhb52/crm-msg

# Conflicts:
#	src/router/modules/remaining.ts

Merge pull request !360 from 疯狂的世界/dev

Merge pull request !361 from 安浩浩/dev