|
@@ -555,12 +555,13 @@
|
|
<span>{{ $t('departmentofscreening') }}</span>
|
|
<span>{{ $t('departmentofscreening') }}</span>
|
|
<el-cascader
|
|
<el-cascader
|
|
size="small"
|
|
size="small"
|
|
|
|
+ collapse-tags
|
|
@change="departmentOptionsChg"
|
|
@change="departmentOptionsChg"
|
|
v-model="departmentSel"
|
|
v-model="departmentSel"
|
|
:options="departmentOptions"
|
|
:options="departmentOptions"
|
|
:placeholder="$t('qing-xuan-ze-bu-men')"
|
|
:placeholder="$t('qing-xuan-ze-bu-men')"
|
|
:show-all-levels="false"
|
|
:show-all-levels="false"
|
|
- :props="{ checkStrictly: true }"
|
|
|
|
|
|
+ :props="{ multiple: true }"
|
|
clearable></el-cascader>
|
|
clearable></el-cascader>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
@@ -930,8 +931,14 @@ export default {
|
|
let param = {
|
|
let param = {
|
|
leaveCode: this.leaveTypeItem,
|
|
leaveCode: this.leaveTypeItem,
|
|
companyId: this.user.companyId,
|
|
companyId: this.user.companyId,
|
|
- departmentId: this.departmentSel ? this.departmentSel[this.departmentSel.length - 1] : '',
|
|
|
|
|
|
+ // departmentId: this.departmentSel ? this.departmentSel[this.departmentSel.length - 1] : '',
|
|
}
|
|
}
|
|
|
|
+ let arrList = []
|
|
|
|
+ for(let i in this.departmentSel) {
|
|
|
|
+ arrList.push(this.departmentSel[i][this.departmentSel[i].length - 1])
|
|
|
|
+ }
|
|
|
|
+ console.log(arrList, '处理好的')
|
|
|
|
+ param.departmentId = arrList
|
|
if(this.userSelId != '') {
|
|
if(this.userSelId != '') {
|
|
param.userId = this.userSelId
|
|
param.userId = this.userSelId
|
|
}
|
|
}
|
|
@@ -1034,9 +1041,16 @@ export default {
|
|
pageIndex: this.page,
|
|
pageIndex: this.page,
|
|
leaveCode: this.leaveTypeItem
|
|
leaveCode: this.leaveTypeItem
|
|
}
|
|
}
|
|
- if(this.departmentSel.length != 0){
|
|
|
|
- item.departmentId = this.departmentSel[this.departmentSel.length - 1]
|
|
|
|
|
|
+ console.log(this.departmentSel, '甚于')
|
|
|
|
+ // if(this.departmentSel.length != 0){
|
|
|
|
+ // item.departmentId = this.departmentSel[this.departmentSel.length - 1]
|
|
|
|
+ // }
|
|
|
|
+ let arrList = []
|
|
|
|
+ for(let i in this.departmentSel) {
|
|
|
|
+ arrList.push(this.departmentSel[i][this.departmentSel[i].length - 1])
|
|
}
|
|
}
|
|
|
|
+ console.log(arrList, '处理好的')
|
|
|
|
+ item.departmentId = arrList
|
|
if(this.userSelId != ''){
|
|
if(this.userSelId != ''){
|
|
item.userId = this.userSelId
|
|
item.userId = this.userSelId
|
|
}
|
|
}
|