Authored by 陈峰

Merge branch 'feature/pageSize' into 'master'

Feature/page size



See merge request !96
... ... @@ -11,6 +11,7 @@ export default function() {
useFilter: false,
isExporting: false,
showOutStock: false,
showBackTop: false,
deliverRows: [],
filters: {
orderNo: {
... ...
... ... @@ -51,7 +51,7 @@
<Table border :columns="table.cols" :data="table.list"
:row-class-name="rowClassName" @on-selection-change="selectChange"></Table>
<Page :total="page.total" :current="page.current"
@on-change="pageChange" :page-size="20" show-total></Page>
@on-change="pageChange" :page-size="100" show-total></Page>
</layout-list>
<allot-deliver
... ... @@ -62,6 +62,9 @@
ref="stockOutModal"
@upload-success="uploadSuccess">
</modal-stock-out>
<div v-show="showBackTop" class="back-top" @click="backTop">
<Icon type="chevron-up" class="icon"></Icon>
</div>
</div>
</template>
... ... @@ -86,13 +89,25 @@
this.useFilter = true;
}
this.productList(this.params());
},
mounted() {
const decide = _.throttle(e => {
const show = e.target.scrollTop > 500;
if (this.showBackTop !== show) {
this.showBackTop = show;
}
}, 100);
document.querySelector('.layout-content').addEventListener('scroll', decide);
},
components: {AllotDeliver},
methods: {
params() {
let params = {
pageNo: 1,
pageSize: 20,
pageSize: 100,
statusList: [1]
};
... ... @@ -191,7 +206,7 @@
filterSearch() {
this.useFilter = true;
const params = this.params();
this.productList(params);
this.page.current = 1;
},
... ... @@ -206,7 +221,7 @@
},
pageChange(page) {
let params = this.params();
params.pageNo = page;
this.productList(params);
this.page.current = page;
... ... @@ -305,7 +320,7 @@
lackNumChange(data) {
const i = data.index;
const v = data.value;
this.table.list[i].inputLackNum = +v;
},
showUploadModal(index) {
... ... @@ -345,6 +360,9 @@
const href = `/Api/erp/allotExportList?${temp.join('&')}`;
window.open(href, '_blank');
},
backTop() {
document.querySelector('.layout-content').scrollTop = 0;
}
}
};
... ... @@ -361,4 +379,21 @@
font-weight: bold;
}
}
.back-top {
position: fixed;
z-index: 5;
padding: 8px 12px;
right: 30px;
bottom: 90px;
border-radius: 2px;
background-color: rgba(0, 0, 0, 0.6);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
transition: all 0.2s ease-in-out;
.icon {
color: #fff;
font-size: 24px;
}
}
</style>
... ...
{
"name": "yoho-shop-manage",
"version": "1.0.35",
"version": "1.0.36",
"description": "",
"main": "app.js",
"scripts": {
... ...