|
|
@@ -54,7 +54,7 @@
|
|
|
<div class="contents" v-if="allWrong">
|
|
|
<div class="headine headConCon" ref="headine" :style="'width:'+(windowWidth - 400)+'px'">
|
|
|
<h3 ref="headHe" style="padding-left: 10px;float:left;width:15%">{{shuz[ins]}}</h3>
|
|
|
- <div class="headScreen" :style="ins == 9 ? 'width:60%' : 'width:70%'">
|
|
|
+ <div class="headScreen" :style="ins == 9 ? 'width:60%' : 'width:72%'">
|
|
|
<!-- 客户项目利润表的筛选 -->
|
|
|
<template v-if="ins == 4">
|
|
|
<el-select v-model="customerId" :placeholder="$t('pleaseelectcustomers')" clearable filterable size="small" @change="selcts(4)" style="margin-right:20px">
|
|
|
@@ -69,7 +69,7 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
<!-- 时间段筛选 -->
|
|
|
- <template v-if="ins == 6 || ins == 8 || ins == 9 || ins == 10 || ins == 11 || ins == 12 || ins == 15">
|
|
|
+ <template v-if="ins == 6 || ins == 8 || ins == 9 || ins == 10 || ins == 11 || ins == 12">
|
|
|
<span>
|
|
|
<span class="demonstration" style="color:#999;padding:0 10px">
|
|
|
{{ ins == 15 ? $t('xiang-mu-chuang-jian-shi-jian-duan') : $t('message.period') }}
|
|
|
@@ -91,11 +91,11 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
<!-- 月份选择 -->
|
|
|
- <el-date-picker v-if="ins == 14" value-format="yyyy-MM" v-model="monthPersonnel" type="month" :placeholder="$t('Selectmonth')" :clearable="false" @change="selcts()" size="small"></el-date-picker>
|
|
|
+ <el-date-picker v-if="ins == 14 || ins == 15" value-format="yyyy-MM" v-model="monthPersonnel" type="month" :placeholder="$t('Selectmonth')" :clearable="false" @change="selcts()" size="small"></el-date-picker>
|
|
|
|
|
|
<!-- 部门筛选 -->
|
|
|
<el-cascader v-if="(ins == 15 || (ins == 9 && permissions.reportAllTimely) || (ins == 8 && permissions.reportAllTimeDivide) || (ins == 6 && permissions.reportAllOvertime) || (ins == 11 && permissions.reportPersonnel) || (ins == 14)) && user.userNameNeedTranslate != 1" v-model="departmentIdArray" :options="departmentList" :placeholder="$t('qing-xuan-ze-bu-men')"
|
|
|
- :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable
|
|
|
+ :props="{ checkStrictly: true,expandTrigger: 'hover',multiple: ins == 6 ? true : false }" collapse-tags :show-all-levels="false" clearable
|
|
|
@change="selcts(9)" size="small" style="margin-left:10px"
|
|
|
></el-cascader>
|
|
|
|
|
|
@@ -729,9 +729,12 @@
|
|
|
<!-- 部门参与项目情况表 -->
|
|
|
<el-table v-if="ins == 15" key="15" border :data="tableList" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
|
|
|
<el-table-column align="center" prop="deptName" :label="$t('departmentname')" min-width="150"></el-table-column>
|
|
|
+ <el-table-column align="center" prop="deptHeadCount" :label="'部门人数'" min-width="150"></el-table-column>
|
|
|
<el-table-column align="center" prop="projectCount" :label="$t('can-yu-de-xiang-mu-de-shu-liang')" min-width="150"></el-table-column>
|
|
|
+ <el-table-column align="center" prop="centerCount" :label="this.user.timeType.customDegreeName + '数量'" min-width="150"></el-table-column>
|
|
|
<el-table-column align="center" prop="peopleCount" :label="$t('can-yu-ren-ci')" min-width="150"></el-table-column>
|
|
|
<el-table-column align="center" prop="tripCount" :label="$t('chu-cha-de-tian-shu')" min-width="150"></el-table-column>
|
|
|
+ <el-table-column align="center" prop="tripPeopleCount" :label="'出差人数'" min-width="150"></el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
<!--工具条-->
|
|
|
@@ -1469,8 +1472,7 @@ export default {
|
|
|
} else if(this.ins == 15) {
|
|
|
fName = this.$t('bumenchanyuqingkuang') + '.xls'
|
|
|
url += "/exportDeptPartInProjects"
|
|
|
- sl.startDate= this.rangeDatas ? this.rangeDatas[0] : '',
|
|
|
- sl.endDate = this.rangeDatas ? this.rangeDatas[1] : '',
|
|
|
+ sl.month = this.monthPersonnel + '-01'
|
|
|
sl.departmentId = this.departmentIdArray.length > 0 ? this.departmentIdArray[this.departmentIdArray.length - 1] : ''
|
|
|
}
|
|
|
this.http.post(url, sl,
|
|
|
@@ -1705,11 +1707,11 @@ export default {
|
|
|
},
|
|
|
// 部门参与项目情况表
|
|
|
getDepartmentsInvolved() {
|
|
|
+
|
|
|
let parameter = {
|
|
|
pageIndex: this.page,
|
|
|
pageSize: this.size,
|
|
|
- startDate: this.rangeDatas ? this.rangeDatas[0] : '',
|
|
|
- endDate: this.rangeDatas ? this.rangeDatas[1] : '',
|
|
|
+ month: this.monthPersonnel + '-01',
|
|
|
departmentId: this.departmentIdArray.length > 0 ? this.departmentIdArray[this.departmentIdArray.length - 1] : '',
|
|
|
}
|
|
|
this.listLoading = true
|
|
|
@@ -2288,6 +2290,8 @@ export default {
|
|
|
if(this.ins == 12){
|
|
|
this.groupWorktimeList.right = []
|
|
|
this.getGroupWorktimeList()
|
|
|
+ }else if(this.ins == 15){
|
|
|
+ this.getDepartmentsInvolved()
|
|
|
}else{
|
|
|
if(e == 9){
|
|
|
this.userId = null
|
ggooalice