diff --git a/src/pages/src/views/organization/details/UserMaterial.vue b/src/pages/src/views/organization/details/UserMaterial.vue index 558da3f1f..45152055c 100644 --- a/src/pages/src/views/organization/details/UserMaterial.vue +++ b/src/pages/src/views/organization/details/UserMaterial.vue @@ -223,7 +223,7 @@ export default { this.activeFieldsList.forEach((item) => { if (item.options.length > 0) { item.options.map((key) => { - if (key.id === this.currentProfile[item.key]) { + if (key.id === this.currentProfile[item.key] || key.id === Number(this.currentProfile[item.key])) { item.value = key.value; } }); diff --git a/src/pages/src/views/organization/index.vue b/src/pages/src/views/organization/index.vue index e68cede79..5e38f3c05 100644 --- a/src/pages/src/views/organization/index.vue +++ b/src/pages/src/views/organization/index.vue @@ -557,6 +557,7 @@ export default { this.filterTreeData(catalog, this.treeDataList); catalog.children = catalog.departments; catalog.children.forEach((department) => { + this.$set(department, 'category_id', catalog.id); this.filterTreeData(department, catalog, catalog.type === 'local'); }); }); diff --git a/src/pages/src/views/organization/table/UserTable.vue b/src/pages/src/views/organization/table/UserTable.vue index 1ea670869..20a64de37 100644 --- a/src/pages/src/views/organization/table/UserTable.vue +++ b/src/pages/src/views/organization/table/UserTable.vue @@ -263,7 +263,7 @@ export default { return ''; } for (let i = 0; i < options.length; i++) { - if (options[i].id === value) { + if (options[i].id === value || options[i].id === Number(value)) { if (this.$i18n.locale === 'en') { return value; }