|
|
@@ -8,7 +8,7 @@
|
|
|
<el-radio-button label="1" v-if="permissions.countHours">{{ $t('accordingtoworkinghours') }}</el-radio-button>
|
|
|
</el-radio-group></div>
|
|
|
</el-col>
|
|
|
- <el-col :span="14" style="display: flex;flex-wrap: wrap;">
|
|
|
+ <el-col :span="14" style="display: flex;flex-wrap: wrap;justify-content: flex-end;">
|
|
|
<el-date-picker v-show="user.timeType.fixMonthcost==0" size="small"
|
|
|
v-model="dateRange" :editable="false"
|
|
|
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
|
|
|
@@ -37,6 +37,13 @@
|
|
|
<el-radio-button :label="namess" v-if="jichu.customDegreeActive == 1"></el-radio-button>
|
|
|
<el-radio-button v-for="item in theCustomList" :key="item.id" :label="item.name"></el-radio-button>
|
|
|
</el-radio-group>
|
|
|
+
|
|
|
+ <el-select v-if="radio == $t('other.project') " v-model="proJuctId" :placeholder="$t('defaultText.pleaseSelectSnItem')" clearable filterable size="small" @change="getEchart" style="margin-left:10px">
|
|
|
+ <el-option v-for="(item) in projectList" :key="item.id" :label="item.projectName + (item.projectCode ? item.projectCode : '')" :value="item.id">
|
|
|
+ <span style="float: left;color: #8492a6;">{{ item.projectCode }}</span>
|
|
|
+ <span style="float: right;font-size: 13px;margin-left: 20px">{{ item.projectName }}</span>
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
<!--
|
|
|
<el-select v-model="customName" filterable placeholder="请选择" style="margin-top: 10px;width: 350px" v-if="theCustomListFlg" @change="jieliu()">
|
|
|
<el-option v-for="item in customList" :key="item.id" :label="item.name" :value="item.name"></el-option>
|
|
|
@@ -238,7 +245,8 @@
|
|
|
customName: '',
|
|
|
customList: [],
|
|
|
departmentList: [],
|
|
|
- radioLoading: false
|
|
|
+ radioLoading: false,
|
|
|
+ proJuctId:'',
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -838,6 +846,7 @@
|
|
|
var url = '';
|
|
|
if (this.radio==this.$t('other.project')) {
|
|
|
url = this.port.project.listCost;
|
|
|
+ param.projectId=this.proJuctId
|
|
|
}else if(this.radio == this.$t('zhu-xiang-mu')){
|
|
|
url = '/project/getTimeCostByMainProject'
|
|
|
// param.userId = this.user.id
|
yurk