Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

src/views/platform/org/employee/list.vue

@@ -123,9 +123,10 @@ export default {
         columns: [
           { prop: 'name', label: this.$t('platform.org.employee.prop.name'),width:120 },
           { 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:250},
           { prop: 'orgName', label: this.$t('platform.org.employee.prop.orgPath'), sortable: false ,width:250},
-           { prop: 'status', label: this.$t('platform.org.employee.prop.status'), tags: statusOptions,width:100},
+          { prop: 'wcAccount', label: '客户单位名称',width:250},
+          { prop: 'status', label: this.$t('platform.org.employee.prop.status'), tags: statusOptions,width:100},
           { prop: 'createTime', label: this.$t('common.field.createTime')},
         ],
         rowHandle: {