|
@@ -9,7 +9,6 @@
|
|
</el-radio-group></div>
|
|
</el-radio-group></div>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="14" style="display: flex;flex-wrap: wrap;">
|
|
<el-col :span="14" style="display: flex;flex-wrap: wrap;">
|
|
- <div style="width:100%;display:flex">
|
|
|
|
<el-date-picker v-show="user.timeType.fixMonthcost==0"
|
|
<el-date-picker v-show="user.timeType.fixMonthcost==0"
|
|
v-model="dateRange" :editable="false"
|
|
v-model="dateRange" :editable="false"
|
|
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
|
|
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
|
|
@@ -35,12 +34,10 @@
|
|
<el-radio-button label="人员"></el-radio-button>
|
|
<el-radio-button label="人员"></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>
|
|
- </div>
|
|
|
|
- <div style="width:100%;display:flex">
|
|
|
|
|
|
+
|
|
<el-select v-model="personnelValue" filterable clearable placeholder="请选择人员" style="margin-top: 10px;width: 350px" v-if="radio == '人员'" @change="personnel()">
|
|
<el-select v-model="personnelValue" filterable clearable placeholder="请选择人员" style="margin-top: 10px;width: 350px" v-if="radio == '人员'" @change="personnel()">
|
|
<el-option v-for="item in hasReportUserList" :key="item.id" :label="item.name" :value="item.name"></el-option>
|
|
<el-option v-for="item in hasReportUserList" :key="item.id" :label="item.name" :value="item.name"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
- </div>
|
|
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="4">
|
|
<el-col :span="4">
|
|
<el-button @click="showExportDialog">报表导出</el-button>
|
|
<el-button @click="showExportDialog">报表导出</el-button>
|
|
@@ -72,7 +69,6 @@
|
|
<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>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
-
|
|
|
|
<el-form-item prop="projectId" :label="user.timeType.fixMonthcost==0?'日期范围':'选择月份'">
|
|
<el-form-item prop="projectId" :label="user.timeType.fixMonthcost==0?'日期范围':'选择月份'">
|
|
<el-date-picker v-show="user.timeType.fixMonthcost==0"
|
|
<el-date-picker v-show="user.timeType.fixMonthcost==0"
|
|
v-model="exportParam.dateRange" :editable="false"
|
|
v-model="exportParam.dateRange" :editable="false"
|
|
@@ -101,6 +97,19 @@
|
|
</span>
|
|
</span>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <el-form-item prop="type" label="选择样式" v-if="radio == '项目' || radio == '部门'">
|
|
|
|
+ <el-select v-model="exportParam.type" placeholder="选择样式" style="width:350px;" >
|
|
|
|
+ <el-option label="项目在行上" value="0"></el-option>
|
|
|
|
+ <el-option label="项目在列上" value="1"></el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ <div class="prompt">
|
|
|
|
+ <el-popover placement="top" width="700" trigger="hover">
|
|
|
|
+ <img v-if="exportParam.type == 0" src="../../assets/image/hangs.png" alt="" width="100%">
|
|
|
|
+ <img v-if="exportParam.type == 1" src="../../assets/image/lies.png" alt="" width="100%">
|
|
|
|
+ <i class="el-icon-question" slot="reference" />
|
|
|
|
+ </el-popover>
|
|
|
|
+ </div>
|
|
|
|
+ </el-form-item>
|
|
<el-form-item v-if="radio == '项目' || radio == '部门'">
|
|
<el-form-item v-if="radio == '项目' || radio == '部门'">
|
|
<el-checkbox v-model="exportParam.projectSum" >含单个项目数据汇总</el-checkbox>
|
|
<el-checkbox v-model="exportParam.projectSum" >含单个项目数据汇总</el-checkbox>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -124,7 +133,7 @@
|
|
parentDeptId:null,
|
|
parentDeptId:null,
|
|
hasReportUserList:[],
|
|
hasReportUserList:[],
|
|
projectList:[],
|
|
projectList:[],
|
|
- exportParam:{projectId:null,dateRange:[],userId: null},
|
|
|
|
|
|
+ exportParam:{projectId:null,dateRange:[],userId: null,type: '0'},
|
|
exportDialog:false,
|
|
exportDialog:false,
|
|
dateRange:[],
|
|
dateRange:[],
|
|
user: JSON.parse(sessionStorage.getItem("user")),
|
|
user: JSON.parse(sessionStorage.getItem("user")),
|
|
@@ -258,6 +267,7 @@
|
|
param.projectSum = this.exportParam.projectSum;
|
|
param.projectSum = this.exportParam.projectSum;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ param.type = this.exportParam.type
|
|
this.http.post(url, param,
|
|
this.http.post(url, param,
|
|
res => {
|
|
res => {
|
|
this.listLoading = false;
|
|
this.listLoading = false;
|
|
@@ -966,6 +976,11 @@
|
|
.ryuans {
|
|
.ryuans {
|
|
top: -50px;
|
|
top: -50px;
|
|
}
|
|
}
|
|
|
|
+ .prompt {
|
|
|
|
+ position: absolute;
|
|
|
|
+ right: 10px;
|
|
|
|
+ top: 0;
|
|
|
|
+ }
|
|
</style>
|
|
</style>
|
|
|
|
|
|
<style lang="scss">
|
|
<style lang="scss">
|