|
@@ -21,7 +21,7 @@
|
|
<!-- <el-radio-button :label="部门"></el-radio-button> -->
|
|
<!-- <el-radio-button :label="部门"></el-radio-button> -->
|
|
<el-radio-button :label="$t('ren-yuan')"></el-radio-button>
|
|
<el-radio-button :label="$t('ren-yuan')"></el-radio-button>
|
|
<el-radio-button :label="$t('lable.department')"></el-radio-button>
|
|
<el-radio-button :label="$t('lable.department')"></el-radio-button>
|
|
- <el-radio-button :label="'日期'"></el-radio-button>
|
|
|
|
|
|
+ <el-radio-button :label="$t('weekDay.date')"></el-radio-button>
|
|
<!-- <el-radio-button :label="namess" v-if="jichu.customDegreeActive == 1"></el-radio-button> -->
|
|
<!-- <el-radio-button :label="namess" v-if="jichu.customDegreeActive == 1"></el-radio-button> -->
|
|
</el-radio-group>
|
|
</el-radio-group>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -226,7 +226,7 @@
|
|
//获取人员成本统计列表
|
|
//获取人员成本统计列表
|
|
getUserCostList() {
|
|
getUserCostList() {
|
|
this.listLoading = true;
|
|
this.listLoading = true;
|
|
- let url = this.radio == this.$t('ren-yuan') ? '/department/getUserCustomDataStatistic' :this.radio == '日期'?'/report/getCustomDataWithDate': '/department/getDeptCustomDataStatistic'
|
|
|
|
|
|
+ let url = this.radio == this.$t('ren-yuan') ? '/department/getUserCustomDataStatistic' :this.radio == $t('weekDay.date')?'/report/getCustomDataWithDate': '/department/getDeptCustomDataStatistic'
|
|
this.http.post(url, {
|
|
this.http.post(url, {
|
|
startDate:this.user.timeType.fixMonthcost==0?this.dateRange[0]:this.dateRange,
|
|
startDate:this.user.timeType.fixMonthcost==0?this.dateRange[0]:this.dateRange,
|
|
endDate: this.user.timeType.fixMonthcost==0?this.dateRange[1]:this.dateRange
|
|
endDate: this.user.timeType.fixMonthcost==0?this.dateRange[1]:this.dateRange
|
|
@@ -473,7 +473,7 @@
|
|
url = '/project/getCustomDataSum';
|
|
url = '/project/getCustomDataSum';
|
|
// } else if (this.radio=='部门') {
|
|
// } else if (this.radio=='部门') {
|
|
// url = '/department/getDeptCustomDataStatistic';
|
|
// url = '/department/getDeptCustomDataStatistic';
|
|
- } else if (this.radio==this.$t('ren-yuan') || this.radio == this.$t('lable.department')||this.radio == '日期') {
|
|
|
|
|
|
+ } else if (this.radio==this.$t('ren-yuan') || this.radio == this.$t('lable.department')||this.radio == $t('weekDay.date')) {
|
|
this.getUserCostList();
|
|
this.getUserCostList();
|
|
return;
|
|
return;
|
|
} else if (this.radio == this.namess) {
|
|
} else if (this.radio == this.namess) {
|
|
@@ -520,7 +520,7 @@
|
|
totalHours += parseFloat(list[i].costTime);
|
|
totalHours += parseFloat(list[i].costTime);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- } else if(this.radio == this.$t('ren-yuan') || this.radio=='日期') {
|
|
|
|
|
|
+ } else if(this.radio == this.$t('ren-yuan') || this.radio==$t('weekDay.date')) {
|
|
list = res.data
|
|
list = res.data
|
|
var totalMoneyCost = 0;
|
|
var totalMoneyCost = 0;
|
|
for(var i in list) {
|
|
for(var i in list) {
|
|
@@ -548,7 +548,7 @@
|
|
if(totalMoneyCost) {
|
|
if(totalMoneyCost) {
|
|
this.zhishin = totalMoneyCost.toFixed(2)
|
|
this.zhishin = totalMoneyCost.toFixed(2)
|
|
}
|
|
}
|
|
- if(this.radio == this.$t('other.project') || this.radio == this.$t('ren-yuan') || this.radio==this.$t('lable.department')|| this.radio=='日期') {
|
|
|
|
|
|
+ if(this.radio == this.$t('other.project') || this.radio == this.$t('ren-yuan') || this.radio==this.$t('lable.department')|| this.radio==$t('weekDay.date')) {
|
|
var option = {
|
|
var option = {
|
|
title: {
|
|
title: {
|
|
text: _this.user.timeType.customDataName+_this.$t('zong-ji')+':' + totalHours,
|
|
text: _this.user.timeType.customDataName+_this.$t('zong-ji')+':' + totalHours,
|