|
|
@@ -1359,7 +1359,6 @@
|
|
|
</span>
|
|
|
</div>
|
|
|
</el-tooltip>
|
|
|
-
|
|
|
</el-form-item>
|
|
|
<el-form-item :label="$t('xuan-ze-fen-zu')" v-if="isAddGroupPerson">
|
|
|
<el-select v-model="addGroupPersonData.group" multiple :placeholder="$t('selectagroup')" style="width:100%">
|
|
|
@@ -1376,8 +1375,8 @@
|
|
|
<el-button type="primary" @click="addProPersonSure()" v-else>{{ $t('btn.determine') }}</el-button>
|
|
|
</div>
|
|
|
|
|
|
- <el-dialog append-to-body :title="$t('screening.selectPeople')" v-if="addGroupPersonPdialog" :visible.sync="addGroupPersonPdialog" width="40%">
|
|
|
- <div class="tree" style="height:300px">
|
|
|
+ <el-dialog append-to-body :title="$t('screening.selectPeople')" v-if="addGroupPersonPdialog" :visible.sync="addGroupPersonPdialog" width="40%" top="6.5vh">
|
|
|
+ <div class="tree" style="height:50vh">
|
|
|
<el-scrollbar style="height:100%">
|
|
|
<el-input
|
|
|
:placeholder="$t('keywordfiltering')"
|
|
|
@@ -2072,7 +2071,8 @@ a {
|
|
|
participatorValue: [],
|
|
|
batchChangeStageDialogVisible: false,
|
|
|
batchChangeStageLoading: false,
|
|
|
- batchProjectTaskParticipantVisible: false
|
|
|
+ batchProjectTaskParticipantVisible: false,
|
|
|
+ batchDepartment: []
|
|
|
};
|
|
|
},
|
|
|
// 过滤器
|
|
|
@@ -3081,6 +3081,7 @@ a {
|
|
|
},
|
|
|
addGroupPersonP(){
|
|
|
this.filterText2 = ''
|
|
|
+ this.chosenMembCount = this.addGroupPersonDataPersonNames && this.addGroupPersonDataPersonNames.length || 0
|
|
|
this.addGroupPersonPdialog = true
|
|
|
},
|
|
|
addPersonCheck(){
|
|
|
@@ -3104,7 +3105,7 @@ a {
|
|
|
this.addGroupPersonData.person = listIDs
|
|
|
this.addGroupPersonData.personNames = listNames
|
|
|
this.addGroupPersonDataPersonNames = listNamesList
|
|
|
- console.log('触发', this.addGroupPersonDataPersonNames)
|
|
|
+ this.batchDepartment = chosenList.filter(item => !item.isUser).map(item => item.id)
|
|
|
},
|
|
|
addGroupPersonSure(){
|
|
|
if(this.addGroupPersonData.group.length == 0 || this.addGroupPersonData.person == null){
|
|
|
@@ -3233,6 +3234,7 @@ a {
|
|
|
this.$message(this.$t('defaultText.pleaseSelectSnItem'))
|
|
|
return
|
|
|
}
|
|
|
+ this.batchDepartment = []
|
|
|
this.addGroupPersonDialog = true
|
|
|
this.isAddGroupPerson = false
|
|
|
},
|
|
|
@@ -3253,7 +3255,8 @@ a {
|
|
|
// proArr = proArr.substring(0,proArr.length - 1)
|
|
|
this.http.post('/project/batchSetParticipation',{
|
|
|
userIds: JSON.stringify(this.addGroupPersonData.person),
|
|
|
- projectIdArray: JSON.stringify(proArr)
|
|
|
+ projectIdArray: JSON.stringify(proArr),
|
|
|
+ deptIds: JSON.stringify(this.batchDepartment)
|
|
|
},res => {
|
|
|
if(res.code == 'ok'){
|
|
|
this.addGroupPersonDialog = false,
|
