|
|
@@ -55,8 +55,8 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item label="时间" prop="date">
|
|
|
- <el-date-picker value-format='yyyy-MM-dd' v-model="queryParams.date" type="monthrange" range-separator="至"
|
|
|
+ <el-form-item label="时间" prop="monthDate">
|
|
|
+ <el-date-picker value-format='yyyy-MM-dd' v-model="queryParams.monthDate" type="monthrange" range-separator="至"
|
|
|
align="right" start-placeholder="开始月份" end-placeholder="结束月份">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
@@ -124,8 +124,9 @@ export default {
|
|
|
queryParams: {
|
|
|
orgId: null,
|
|
|
planId: "",
|
|
|
- date: [new Date(),new Date()],
|
|
|
- isWebSelect: 1,
|
|
|
+ date: new Date(),
|
|
|
+ monthDate: [new Date(),new Date()],
|
|
|
+ sourceType: 1,
|
|
|
},
|
|
|
// 显示搜索条件
|
|
|
showSearch: true,
|
|
|
@@ -160,9 +161,9 @@ export default {
|
|
|
let titleBase="教育培训情况表";
|
|
|
if (!this.queryParams){
|
|
|
titleBase+= "("+dayjs(new Date()).format("YYYY-MM")+"至"+ dayjs(new Date()).format("YYYY-MM") +")";
|
|
|
- }else if(this.queryParams.date)
|
|
|
+ }else if(this.queryParams.monthDate)
|
|
|
{
|
|
|
- titleBase+= "("+dayjs(this.queryParams.date[0]).format("YYYY-MM")+"至"+ dayjs(this.queryParams.date[1]).format("YYYY-MM") +")";
|
|
|
+ titleBase+= "("+dayjs(this.queryParams.monthDate[0]).format("YYYY-MM")+"至"+ dayjs(this.queryParams.monthDate[1]).format("YYYY-MM") +")";
|
|
|
}
|
|
|
return titleBase;
|
|
|
},
|
|
|
@@ -225,7 +226,7 @@ export default {
|
|
|
//获取列表
|
|
|
getList() {
|
|
|
//this.title = this.getReportTitle();
|
|
|
- if (!this.queryParams || !this.queryParams.date){
|
|
|
+ if (!this.queryParams || !this.queryParams.monthDate){
|
|
|
Message.error("请选择时间范围");
|
|
|
return;
|
|
|
}
|
|
|
@@ -258,21 +259,22 @@ export default {
|
|
|
this.queryParams = {
|
|
|
orgId: this.orgId,
|
|
|
planId: this.options[0].id,
|
|
|
- date: [new Date(),new Date()],
|
|
|
+ date: new Date(),
|
|
|
+ monthDate: [new Date(),new Date()],
|
|
|
};
|
|
|
this.title = this.getReportTitle();
|
|
|
},
|
|
|
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
- if (!this.queryParams || !this.queryParams.date){
|
|
|
+ if (!this.queryParams || !this.queryParams.monthDate){
|
|
|
Message.error("请选择时间范围");
|
|
|
return;
|
|
|
}
|
|
|
let param = {
|
|
|
...this.queryParams,
|
|
|
}
|
|
|
- //param.date = dayjs(param.date).format("YYYY-MM-DD HH:mm:s")
|
|
|
+ param.date = dayjs(param.date).format("YYYY-MM-DD HH:mm:s")
|
|
|
this.download(
|
|
|
"core/eduTask/exportReport",
|
|
|
param,
|