|
|
@@ -5,7 +5,7 @@
|
|
|
<template slot="left">
|
|
|
<div style='width:50%;margin-right:10px;'>
|
|
|
<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
|
|
|
- start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
|
|
|
+ start-placeholder="开始日期" value-format='yyyy-MM-dd' end-placeholder="结束日期" @change='datechange' :picker-options="pickerOptions">
|
|
|
</el-date-picker>
|
|
|
|
|
|
</div>
|
|
|
@@ -56,7 +56,7 @@
|
|
|
</ws-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-table class="wenzi" :data="item.goodssourcelist" style="width: 100%" height="calc(100% - 110px)">
|
|
|
+ <el-table class="wenzi" :data="item.goodssourcelist" style="width: 100%" >
|
|
|
<el-table-column width="40">
|
|
|
<template scope="scope">
|
|
|
<img v-if="!scope.row.select" style='width:15px;vertical-align: text-top;' @click='radiochange(index,scope.row)' src="../../../public/img/wxz.png" alt="">
|
|
|
@@ -105,7 +105,7 @@
|
|
|
</el-table>
|
|
|
</div>
|
|
|
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
|
|
|
- :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
|
|
|
+ :page-size="pageSize" layout="total, prev, pager, next" :total="deptBudgetTotal"></el-pagination>
|
|
|
<el-dialog
|
|
|
:title="title"
|
|
|
:visible.sync="aduitshow"
|
|
|
@@ -267,6 +267,8 @@
|
|
|
aduitList:[],
|
|
|
flag:'',
|
|
|
currectflag:'',
|
|
|
+ startDate:'',
|
|
|
+ endDate:'',
|
|
|
warehouseName: '',
|
|
|
deptBudgetTotal: 0,
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
|
@@ -287,12 +289,16 @@
|
|
|
// this.showType = this.isShow
|
|
|
// },
|
|
|
activated() {
|
|
|
-
|
|
|
- this.getList()
|
|
|
this.value2=this.getNowTime()
|
|
|
+ this.getList()
|
|
|
this.showType = this.isShow
|
|
|
},
|
|
|
methods: {
|
|
|
+ datechange(e){
|
|
|
+ this.value2=e
|
|
|
+ this.getList()
|
|
|
+ console.log(e)
|
|
|
+ },
|
|
|
indexMethod(index) {
|
|
|
return index * 2;
|
|
|
},
|
|
|
@@ -306,16 +312,16 @@
|
|
|
|
|
|
},
|
|
|
getNowTime() {
|
|
|
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24*30 )
|
|
|
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 )
|
|
|
.toISOString()
|
|
|
.replace('T', ' ')
|
|
|
- .split('.')[0] //默认开始时间30天前
|
|
|
+ .split('.')[0] //默认开始时间1天前
|
|
|
const end = new Date(new Date().getTime())
|
|
|
.toISOString()
|
|
|
.replace('T', ' ')
|
|
|
.split('.')[0]//默认结束时间今天
|
|
|
- console.log([start, end])
|
|
|
- return [start, end]
|
|
|
+ // console.log([start.split(' '), end])
|
|
|
+ return [start.split(' ')[0], end.split(' ')[0]]
|
|
|
},
|
|
|
selectinOutType(){
|
|
|
this.getList()
|
|
|
@@ -559,10 +565,14 @@
|
|
|
return newArr;
|
|
|
},
|
|
|
getList() {
|
|
|
+ this.startDate=this.value2[0]
|
|
|
+ this.endDate=this.value2[1]
|
|
|
getwarehousingorder({
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
|
currentPage: this.currentPage,
|
|
|
- pageSize: this.pageSize,
|
|
|
+ pageSize: 9999,
|
|
|
+ startDate:this.startDate,
|
|
|
+ endDate:this.endDate,
|
|
|
searchType: this.searchType,
|
|
|
searchKeyWord: this.searchKeyWord,
|
|
|
inOutType:this.inOutType,
|
