|
|
@@ -17,12 +17,13 @@
|
|
|
|
|
|
<vxe-table border="inner" auto-resize resizable height="400px" :loading="loading" ref="projectTable"
|
|
|
show-header-overflow show-overflow highlight-hover-row :menu-config="{}" :print-config="{}"
|
|
|
- :sort-config="{ remote: true }" :data="dataList" :row-config="{ isCurrent: true }"
|
|
|
+ :sort-config="sortConfig" :data="dataList" :row-config="{ isCurrent: true }"
|
|
|
:radio-config="{ trigger: 'row' }">
|
|
|
<vxe-column type="seq" width="60" title="序号"></vxe-column>
|
|
|
- <vxe-column type="radio" width="60px"></vxe-column>
|
|
|
+ <!-- <vxe-column type="radio" width="60px"></vxe-column> -->
|
|
|
<vxe-column min-width="230" align="center" title="商品名称" field="tradeName"></vxe-column>
|
|
|
- <vxe-column min-width="230" align="center" title="库存量" field="tradeNumber"></vxe-column>
|
|
|
+ <vxe-column min-width="230" align="center" title="库存量" field="tradeNumber" sort-type="number"
|
|
|
+ sortable></vxe-column>
|
|
|
|
|
|
</vxe-table>
|
|
|
<vxe-pager background :current-page="tablePage.currentPage" :page-size="tablePage.pageSize"
|
|
|
@@ -48,7 +49,14 @@ import WareHouseService from '@/api/psi/WareHouseService'
|
|
|
import Template from '../../../assets/icons/template.vue'
|
|
|
export default {
|
|
|
data() {
|
|
|
+ const sortConfig = {
|
|
|
+ defaultSort: {
|
|
|
+ field: 'tradeNumber',
|
|
|
+ order: 'asc'
|
|
|
+ }
|
|
|
+ }
|
|
|
return {
|
|
|
+ sortConfig,
|
|
|
title: '',
|
|
|
method: '',
|
|
|
visible: false,
|
|
|
@@ -100,7 +108,7 @@ export default {
|
|
|
this.loading = true
|
|
|
// this.searchForm.createId = this.$store.state.user.id
|
|
|
// this.searchForm.status = '5'
|
|
|
- this.searchForm.wareHouseType = this.typeTest
|
|
|
+ // this.searchForm.wareHouseType = this.typeTest
|
|
|
// this.collectService.wareHouseList({
|
|
|
// 'current': this.tablePage.currentPage,
|
|
|
// 'size': this.tablePage.pageSize,
|
|
|
@@ -111,7 +119,7 @@ export default {
|
|
|
// this.tablePage.total = data.total
|
|
|
// this.loading = false
|
|
|
// })
|
|
|
- this.wareHouseService.getByProduceDateAndNameGroup({
|
|
|
+ this.wareHouseService.wareHouseSummaryList({
|
|
|
'current': this.tablePage.currentPage,
|
|
|
'size': this.tablePage.pageSize,
|
|
|
'orders': this.tablePage.orders,
|
huangguoce