|
@@ -122,14 +122,14 @@
|
|
<el-option v-for="item in hasReportUserList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
<el-option v-for="item in hasReportUserList" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
|
|
|
|
- <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'350'" :subject="hasReportUserList" :clearable="true" :multiSelect="true" @selectCal="selectCal" :distinction="'1'"></selectCat>
|
|
|
|
|
|
+ <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'350'" :filterable="true" :subject="hasReportUserList" :clearable="true" :multiSelect="true" @selectCal="selectCal" :distinction="'1'"></selectCat>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item prop="userIds" :label="$t('screening.selectPeople')" v-if="radio == $t('other.project') || radio == $t('projectclassification')">
|
|
<el-form-item prop="userIds" :label="$t('screening.selectPeople')" v-if="radio == $t('other.project') || radio == $t('projectclassification')">
|
|
<el-select v-if="user.userNameNeedTranslate != '1'" v-model="exportParam.userIds" :placeholder="$t('lable.allStaff')" multiple="true" clearable style="width:350px;" filterable="true">
|
|
<el-select v-if="user.userNameNeedTranslate != '1'" v-model="exportParam.userIds" :placeholder="$t('lable.allStaff')" multiple="true" clearable style="width:350px;" filterable="true">
|
|
<el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
<el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
|
|
|
|
- <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'350'" :subject="users" :clearable="true" :multiSelect="true" @selectCal="selectCal" :distinction="'1'"></selectCat>
|
|
|
|
|
|
+ <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'350'" :filterable="true" :subject="users" :clearable="true" :multiSelect="true" @selectCal="selectCal" :distinction="'1'"></selectCat>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item prop="projectId" :label="user.timeType.fixMonthcost==0?$t('time.dateRange'):$t('Selectmonth')">
|
|
<el-form-item prop="projectId" :label="user.timeType.fixMonthcost==0?$t('time.dateRange'):$t('Selectmonth')">
|
|
<el-date-picker v-show="user.timeType.fixMonthcost==0"
|
|
<el-date-picker v-show="user.timeType.fixMonthcost==0"
|
|
@@ -302,12 +302,19 @@
|
|
|
|
|
|
showExportDialog() {
|
|
showExportDialog() {
|
|
// console.log(12345)
|
|
// console.log(12345)
|
|
|
|
+ // 清空选择的人
|
|
|
|
+ if(this.radio == this.$t('ren-yuan')) {
|
|
|
|
+ this.exportParam.userIds = new Array()
|
|
|
|
+ }
|
|
|
|
+ console.log(this.exportParam)
|
|
|
|
+
|
|
this.exportDialog = true;
|
|
this.exportDialog = true;
|
|
this.exportParam.dateRange = this.dateRange;
|
|
this.exportParam.dateRange = this.dateRange;
|
|
// console.log(this.hasReportUserList)
|
|
// console.log(this.hasReportUserList)
|
|
if (this.radio == this.$t('ren-yuan')) {
|
|
if (this.radio == this.$t('ren-yuan')) {
|
|
// this.exportParam.userIds = [];
|
|
// this.exportParam.userIds = [];
|
|
}
|
|
}
|
|
|
|
+
|
|
if (this.radio == this.$t('other.project')) {
|
|
if (this.radio == this.$t('other.project')) {
|
|
this.exportParam.deptId = []
|
|
this.exportParam.deptId = []
|
|
}
|
|
}
|