|
@@ -290,10 +290,10 @@
|
|
</el-radio-group>
|
|
</el-radio-group>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="起始日期">
|
|
<el-form-item label="起始日期">
|
|
- <el-date-picker type="date" placeholder="请选择起始日期" v-model="parameter.startDate"></el-date-picker>
|
|
|
|
|
|
+ <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="请选择起始日期" v-model="parameter.startDate"></el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="截止日期">
|
|
<el-form-item label="截止日期">
|
|
- <el-date-picker type="date" placeholder="请选择截止日期" v-model="parameter.endDate" ></el-date-picker>
|
|
|
|
|
|
+ <el-date-picker value-format="yyyy-MM-dd" type="date" placeholder="请选择截止日期" v-model="parameter.endDate" ></el-date-picker>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<!--仓库名称-->
|
|
<!--仓库名称-->
|
|
<el-form-item label="仓库名称" span="1" prop="warehouseName" >
|
|
<el-form-item label="仓库名称" span="1" prop="warehouseName" >
|
|
@@ -426,10 +426,11 @@ export default {
|
|
this.isShowPrintType = true
|
|
this.isShowPrintType = true
|
|
},
|
|
},
|
|
async submitClick(){
|
|
async submitClick(){
|
|
- // if(this.headerText = "导出入库记录"){
|
|
|
|
|
|
+ debugger
|
|
|
|
+ if(this.headerText = "导出入库记录"){
|
|
const {
|
|
const {
|
|
data
|
|
data
|
|
- } = await postExport(this.parameter, {}, {
|
|
|
|
|
|
+ } = await postExport({startDate:this.parameter.startDate,endDate:this.parameter.endDate,warehouseName:this.parameter.warehouseName}, {}, {
|
|
responseType: 'blob'
|
|
responseType: 'blob'
|
|
}).toPromise()
|
|
}).toPromise()
|
|
downloadFile({
|
|
downloadFile({
|
|
@@ -439,10 +440,10 @@ export default {
|
|
}导出记录`,
|
|
}导出记录`,
|
|
type: 'xls',
|
|
type: 'xls',
|
|
})
|
|
})
|
|
- // }else if(this.headerText = "打印记录"){
|
|
|
|
- // window.open('../../../../../static/warehousePrint.html')
|
|
|
|
- // console.log(this.parameter)
|
|
|
|
- // }
|
|
|
|
|
|
+ }else if(this.headerText = "打印记录"){
|
|
|
|
+ window.open('../../../../../static/warehousePrint.html')
|
|
|
|
+ console.log(this.parameter)
|
|
|
|
+ }
|
|
},
|
|
},
|
|
//清仓
|
|
//清仓
|
|
clearance(row) {
|
|
clearance(row) {
|