diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index e067b126..843330c3 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -255,8 +255,13 @@ export const JeecgListMixin = { handleTableChange(pagination, filters, sorter) { //分页、排序、筛选变化时触发 if (Object.keys(sorter).length > 0) { - this.isorter.column = sorter.field; - this.isorter.order = "ascend" == sorter.order ? "asc" : "desc" + if(sorter.order) { + this.isorter.column = sorter.field + this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc' + } else { + this.isorter.column = 'createTime' + this.isorter.order = 'desc' + } } if(pagination && pagination.current) { this.ipagination = pagination; diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue index 4982732d..987d531f 100644 --- a/jshERP-web/src/views/report/MaterialStock.vue +++ b/jshERP-web/src/views/report/MaterialStock.vue @@ -15,7 +15,7 @@ showSearch style="width: 100%" placeholder="请选择仓库" v-model="depotSelected"> - + {{ depot.depotName }} @@ -167,6 +167,7 @@ categoryTree:[], currentStock: '', currentStockPrice: '', + currentWeight: '', // 表头 columns: [ {