Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yanyizhou
2021-11-08 14:28:41 +08:00
27 changed files with 1609 additions and 896 deletions
+2 -2
View File
@@ -326,8 +326,8 @@
:pageSize="pageConfig.oldStandPageSize"
:total="pageConfig.count4"
autoSize
@pageChange="page => handlePageChange('oldItems', page)"
@pageSizeChange="pageSize => handlePageSizeChange('oldItems', pageSize)"></pagination>
@pageChange="page => handlePageChange('oldStand', page)"
@pageSizeChange="pageSize => handlePageSizeChange('oldStand', pageSize)"></pagination>
</div>
</div>
<!-- </el-tab-pane>-->