|
@@ -88,7 +88,7 @@
|
88
|
</el-table-column>
|
88
|
</el-table-column>
|
89
|
</el-table>
|
89
|
</el-table>
|
90
|
<div class="table-pagination">
|
90
|
<div class="table-pagination">
|
91
|
- <el-pagination layout="total, prev, pager, next, jumper" :total="total1" @current-change="handlePageChange2"
|
|
|
|
|
91
|
+ <el-pagination layout="total, prev, pager, next, jumper" :total="total2" @current-change="handlePageChange2"
|
92
|
:current-page.sync="pageNum2" :page-size.sync="pageSize2">
|
92
|
:current-page.sync="pageNum2" :page-size.sync="pageSize2">
|
93
|
</el-pagination>
|
93
|
</el-pagination>
|
94
|
</div>
|
94
|
</div>
|
|
@@ -187,7 +187,7 @@ export default {
|
187
|
],
|
187
|
],
|
188
|
tableData1: [],
|
188
|
tableData1: [],
|
189
|
total1: 0,
|
189
|
total1: 0,
|
190
|
- pageSize1: 10,
|
|
|
|
|
190
|
+ pageSize1: 15,
|
191
|
pageNum1: 1,
|
191
|
pageNum1: 1,
|
192
|
formInline1: {
|
192
|
formInline1: {
|
193
|
goods_name: '',
|
193
|
goods_name: '',
|
|
@@ -341,7 +341,7 @@ export default {
|
341
|
delete params.time
|
341
|
delete params.time
|
342
|
api_z.queryProductOrderParkingByPage({curPage: pageNum1, pageSize: pageSize1, ...params}).then(res => {
|
342
|
api_z.queryProductOrderParkingByPage({curPage: pageNum1, pageSize: pageSize1, ...params}).then(res => {
|
343
|
let arr = res.data.data.goods_list.filter(item => !item.goods_name.includes('错峰卡'))
|
343
|
let arr = res.data.data.goods_list.filter(item => !item.goods_name.includes('错峰卡'))
|
344
|
- this.tableData1 = arr.map(item => ({...item, release_status: item.release_status === '1' ? '上架' : '下架', good_range: `${moment(item.goods_start_time).format('YYYY-MM-DD')}~${moment(item.goods_end_time).format('YYYY-MM-DD')}`})) || []
|
|
|
|
|
344
|
+ this.tableData1 = arr.map(item => ({...item, release_status: item.release_status === 1 ? '上架' : '下架', good_range: `${moment(item.goods_start_time).format('YYYY-MM-DD')}~${moment(item.goods_end_time).format('YYYY-MM-DD')}`})) || []
|
345
|
this.total1 = arr.length
|
345
|
this.total1 = arr.length
|
346
|
this.loading1 = false
|
346
|
this.loading1 = false
|
347
|
})
|
347
|
})
|
|
@@ -361,10 +361,10 @@ export default {
|
361
|
params.goods_end_time = this.formInline2.time[1].substring(0, 10) + " 23:59:59";
|
361
|
params.goods_end_time = this.formInline2.time[1].substring(0, 10) + " 23:59:59";
|
362
|
}
|
362
|
}
|
363
|
delete params.time
|
363
|
delete params.time
|
364
|
- api_z.queryProductOrderUnpeakByPage({curPage: pageNum2, size: pageSize2, ...params}).then(res => {
|
|
|
|
|
364
|
+ api_z.queryProductOrderParkingByPage({curPage: pageNum2, size: pageSize2, ...params}).then(res => {
|
365
|
let arr = res.data.data.goods_list.filter(item => item.goods_name.includes('错峰卡'))
|
365
|
let arr = res.data.data.goods_list.filter(item => item.goods_name.includes('错峰卡'))
|
366
|
- this.tableData2 = arr.map(item => ({...item, release_status: item.release_status === '1' ? '上架' : '下架', good_range: `${moment(item.goods_start_time).format('YYYY-MM-DD')}~${moment(item.goods_end_time).format('YYYY-MM-DD')}`})) || []
|
|
|
367
|
- this.total2 = data.length
|
|
|
|
|
366
|
+ this.tableData2 = arr.map(item => ({...item, release_status: item.release_status === 1 ? '上架' : '下架', good_range: `${moment(item.goods_start_time).format('YYYY-MM-DD')}~${moment(item.goods_end_time).format('YYYY-MM-DD')}`})) || []
|
|
|
367
|
+ this.total2 = arr.length
|
368
|
this.loading2 = false
|
368
|
this.loading2 = false
|
369
|
})
|
369
|
})
|
370
|
},
|
370
|
},
|