|
|
@@ -222,11 +222,11 @@
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="起始日期">
|
|
|
- <el-date-picker type="datetime" @change="startDataChange" placeholder="请选择起始日期" v-model="parameter.PrintStartDate" default-time="00:00:00"></el-date-picker>
|
|
|
+ <el-date-picker type="datetime" @change="startDataChange" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择起始日期" v-model="parameter.printStartDate" default-time="00:00:00"></el-date-picker>
|
|
|
<!-- <el-date-picker v-model="value3" type="datetime" placeholder="选择日期时间" default-time="12:00:00"></el-date-picker> -->
|
|
|
</el-form-item>
|
|
|
<el-form-item label="截止日期">
|
|
|
- <el-date-picker type="datetime" @change="endDataChange" placeholder="请选择截止日期" v-model="parameter.printEndDate" default-time="00:00:00">
|
|
|
+ <el-date-picker type="datetime" @change="endDataChange" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择截止日期" v-model="parameter.printEndDate" default-time="00:00:00">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="截止日期1">
|
|
|
@@ -264,7 +264,7 @@
|
|
|
<div class="print-type-checkbox">
|
|
|
<el-form ref="form" label-width="110px">
|
|
|
<el-form-item label="起始日期">
|
|
|
- <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="请选择起始日期" v-model="parameter.startDate">
|
|
|
+ <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="请选择起始日期" v-model="parameter.startDate">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="截止日期">
|
|
|
@@ -338,6 +338,7 @@
|
|
|
return {
|
|
|
rules:{},
|
|
|
options:[],
|
|
|
+ StartDate:'',
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
|
deptBudgetList:{},
|
|
|
dateTime:'',
|
|
|
@@ -367,6 +368,7 @@
|
|
|
startDate:'',
|
|
|
endDate:'',
|
|
|
},
|
|
|
+ EndDate:'',
|
|
|
isShowPrintType: false, //打印
|
|
|
headerText: '',
|
|
|
typeList:[],
|
|
|
@@ -423,26 +425,28 @@
|
|
|
}
|
|
|
|
|
|
},
|
|
|
- //导出、打印
|
|
|
+ //导出、打印EndDate
|
|
|
outData(index) {
|
|
|
if (index == 1) {
|
|
|
this.headerText = '导出记录'
|
|
|
} else if (index == 2) {
|
|
|
this.headerText = '打印记录'
|
|
|
- // let date = new Date()
|
|
|
- // var year = date.getFullYear();
|
|
|
- // var month = date.getMonth() + 1;
|
|
|
- // var strDate = date.getDate()
|
|
|
- // if(strDate<10){
|
|
|
- // strDate = "0"+strDate
|
|
|
- // }
|
|
|
- // var pastdate = new Date(date.getTime() - 24 * 60 * 60 * 1000)
|
|
|
- // this.parameter.PrintStartDate = pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + (pastdate.getDate()>10?pastdate.getDate():'0'+pastdate.getDate())
|
|
|
- // this.parameter.printEndDate = '' + year + '-' + month + '-' + strDate
|
|
|
+ let date = new Date()
|
|
|
+ var year = date.getFullYear();
|
|
|
+ var month = date.getMonth() + 1;
|
|
|
+ var strDate = date.getDate()
|
|
|
+ if(strDate<10){
|
|
|
+ strDate = "0"+strDate
|
|
|
+ }
|
|
|
+ debugger
|
|
|
+ var pastdate = new Date(date.getTime() - 24 * 60 * 60 * 1000)
|
|
|
+ this.StartDate =pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + (pastdate.getDate()>10?pastdate.getDate():'0'+pastdate.getDate())+' 00:00:00'
|
|
|
+ // this.StartDate = new Date(pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + (pastdate.getDate()>10?pastdate.getDate():'0'+pastdate.getDate())+' 00:00:00')
|
|
|
+ this.$set(this.parameter,'printStartDate',this.StartDate)
|
|
|
+ // parameter.printStartDate
|
|
|
+ this.EndDate = '' + year + '-' + month + '-' + strDate+' 00:00:00'
|
|
|
+ this.$set(this.parameter,'printEndDate',this.EndDate)
|
|
|
}
|
|
|
-
|
|
|
- // this.parameter.endDate = Date.now()
|
|
|
- // this.parameter.endDate1 = Date.now()
|
|
|
this.$forceUpdate();
|
|
|
this.isShowPrintType = true
|
|
|
|
|
|
@@ -458,6 +462,7 @@
|
|
|
this.$message.error('请选择打印的类型')
|
|
|
return
|
|
|
}
|
|
|
+ debugger
|
|
|
if (!this.parameter.printStartDate) {
|
|
|
this.$message.error('请选择打印的起始日期')
|
|
|
return
|
zhongtianhaoyuan