|
|
@@ -221,9 +221,13 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="截止日期">
|
|
|
- <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="请选择截止日期" v-model="parameter.endDate">
|
|
|
+ <el-date-picker value-format="timestamp" type="date" placeholder="请选择截止日期" v-model="parameter.endDate">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
+ <!-- <el-form-item label="截止日期1">
|
|
|
+ <el-date-picker value-format="timestamp" type="date" placeholder="请选择截止日期" v-model="parameter.endDate1">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item> -->
|
|
|
<!--仓库名称-->
|
|
|
<el-form-item label="仓库名称" span="1" prop="warehouseName">
|
|
|
<el-select v-model="parameter.warehouseName" placeholder="请选择仓库名称" filterable clearable>
|
|
|
@@ -354,7 +358,9 @@
|
|
|
var strDate = date.getDate()
|
|
|
var pastdate = new Date(date.getTime() - 24 * 60 * 60 * 1000)
|
|
|
this.parameter.startDate = pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + pastdate.getDate()
|
|
|
- this.parameter.endDate = '' + year + '-' + month + '-' + strDate
|
|
|
+ // this.parameter.endDate = '' + year + '-' + month + '-' + strDate
|
|
|
+ this.parameter.endDate = Date.now()
|
|
|
+ // this.parameter.endDate1 = Date.now()
|
|
|
this.$forceUpdate();
|
|
|
this.isShowPrintType = true
|
|
|
},
|
|
|
@@ -364,7 +370,6 @@
|
|
|
this.isShowPrintType = false
|
|
|
},
|
|
|
async submitClick() {
|
|
|
-
|
|
|
if (!this.parameter.radio && this.headerText == '打印记录') {
|
|
|
this.$message.error('请选择打印的类型')
|
|
|
return
|
|
|
@@ -377,7 +382,7 @@
|
|
|
this.$message.error('请选择打印的截止日期')
|
|
|
return
|
|
|
}
|
|
|
- if (new Date(this.parameter.endDate).getTime() < new Date(this.parameter.startDate).getTime()) {
|
|
|
+ if (this.parameter.endDate < new Date(this.parameter.startDate).getTime()) {
|
|
|
this.$message.error('截止日期输入错误')
|
|
|
return
|
|
|
}
|
|
|
@@ -388,7 +393,10 @@
|
|
|
if(this.parameter.warehouseName == '全部仓库'){
|
|
|
this.parameter.warehouseName = ''
|
|
|
}
|
|
|
+ let enddate = new Date(this.parameter.endDate).toLocaleString()//将截止时间的时间戳转为时间
|
|
|
+ this.parameter.endDate = enddate.split(" ")[0].replace("/" ,"-").replace("/","-")
|
|
|
this.parameter.warehouseName = this.parameter.warehouseName.replace('（临）','')
|
|
|
+ this.isShowPrintType = false
|
|
|
if (this.headerText == '导出记录') {
|
|
|
if (this.parameter.radio == 3) {
|
|
|
const {
|
zhongtianhaoyuan