diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index 3586254e2..a3e26e2bc 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -322,12 +322,23 @@ content.push(res) } } else if (res.type == 'Depart') { + if (!this.selectDepartment) { + res.disabled = true + } content.push(res) } }) this.gData = this.toTree(content) } else { - this.gData = this.toTree(JSON.parse(gData)) + let content = JSON.parse(gData) + if (!this.selectDepartment) { + content.forEach(res => { + if (res.type == 'Depart') { + res.disabled = true + } + }) + } + this.gData = this.toTree(content) } } this.defaultCheckedKeys = this.userIds @@ -524,6 +535,6 @@ } .treeWrap { - height: 600px; + height: calc(100vh - 240px); } \ No newline at end of file diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 64f59d9b7..8fd7b0010 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -208,7 +208,7 @@ @@ -226,7 +226,7 @@