|
@@ -126,7 +126,7 @@ export default {
|
|
|
{ prop: 'account', label: this.$t('platform.org.employee.prop.account'), width: 150 },
|
|
{ prop: 'account', label: this.$t('platform.org.employee.prop.account'), width: 150 },
|
|
|
// { prop: 'wcAccount', label: this.$t('platform.org.employee.prop.wcAccount'),width:120},
|
|
// { prop: 'wcAccount', label: this.$t('platform.org.employee.prop.wcAccount'),width:120},
|
|
|
{ prop: 'orgName', label: this.$t('platform.org.employee.prop.orgPath'), sortable: false, width: 250 },
|
|
{ prop: 'orgName', label: this.$t('platform.org.employee.prop.orgPath'), sortable: false, width: 250 },
|
|
|
- // { prop: 'qq', label: '客户单位名称', width: 250 },
|
|
|
|
|
|
|
+ // { prop: 'qq', label: '客户单位名称', width: 250 },
|
|
|
{ prop: 'status', label: this.$t('platform.org.employee.prop.status'), tags: statusOptions, width: 100 },
|
|
{ prop: 'status', label: this.$t('platform.org.employee.prop.status'), tags: statusOptions, width: 100 },
|
|
|
{ prop: 'createTime', label: this.$t('common.field.createTime') }
|
|
{ prop: 'createTime', label: this.$t('common.field.createTime') }
|
|
|
],
|
|
],
|
|
@@ -623,7 +623,7 @@ export default {
|
|
|
const deptName = item.position.split('\n')
|
|
const deptName = item.position.split('\n')
|
|
|
const roleItemList = []
|
|
const roleItemList = []
|
|
|
const posItemList = []
|
|
const posItemList = []
|
|
|
- roleName.forEach(r => {
|
|
|
|
|
|
|
+ deptName.forEach(r => {
|
|
|
const temp = roleList.find(i => i.name === r.trim().replace(/\r/g, ''))
|
|
const temp = roleList.find(i => i.name === r.trim().replace(/\r/g, ''))
|
|
|
if (temp) {
|
|
if (temp) {
|
|
|
roleItemList.push({
|
|
roleItemList.push({
|