diff --git a/src/router/index.js b/src/router/index.js index 6f749c4..5449bad 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -40,31 +40,31 @@ export const constantRoutes = [{ path: '/404', component: () => import('@/views/404'), hidden: true - }, - { - path: '/stocks', - component: () => import('@/views/stocks/index'), - hidden: true - }, - { - path: '/outbounds', - component: () => import('@/views/outbounds/index'), - hidden: true - }, - // { - // path: '/inventorys', - // component: () => import('@/views/inventorys/index'), - // hidden: true - // }, - // { - // path: '/inventorys/stocks', - // component: () => import('@/views/inventorys/stocks'), - // hidden: true - // }, - // { - // path: '/inventorys/outbounds', - // component: () => import('@/views/inventorys/outbounds'), - // hidden: true + }, + { + path: '/stocks', + component: () => import('@/views/stocks/index'), + hidden: true + }, + { + path: '/outbounds', + component: () => import('@/views/outbounds/index'), + hidden: true + }, + // { + // path: '/inventorys', + // component: () => import('@/views/inventorys/index'), + // hidden: true + // }, + // { + // path: '/inventorys/stocks', + // component: () => import('@/views/inventorys/stocks'), + // hidden: true + // }, + // { + // path: '/inventorys/outbounds', + // component: () => import('@/views/inventorys/outbounds'), + // hidden: true // }, { path: '/info', @@ -102,8 +102,6 @@ export const constantRoutes = [{ * the routes that need to be dynamically loaded based on user roles */ export const asyncRoutes = [ - - // 404 page must be placed at the end !!! { path: '*', @@ -128,4 +126,4 @@ export function resetRouter() { router.matcher = newRouter.matcher // reset router } -export default router +export default router diff --git a/src/views/inventorys/stocktaking.vue b/src/views/inventorys/stocktaking.vue new file mode 100644 index 0000000..946f237 --- /dev/null +++ b/src/views/inventorys/stocktaking.vue @@ -0,0 +1,891 @@ + + + + + diff --git a/src/views/maintenance/maintenance_records.vue b/src/views/maintenance/maintenance_records.vue index 0878680..499cb2b 100644 --- a/src/views/maintenance/maintenance_records.vue +++ b/src/views/maintenance/maintenance_records.vue @@ -744,7 +744,7 @@ export default { display: flex; flex-direction: column; min-height: 0; - height: calc(100vh - 200px); + height: calc(100vh - 280px); } .el-table { @@ -752,6 +752,7 @@ export default { overflow: hidden; width: 100%; height: 100%; + margin-bottom: 10px; } .el-table__body-wrapper { @@ -765,7 +766,7 @@ export default { .el-table td { font-size: 14px; - padding: 8px 0; + padding: 12px 0; } .el-table th { @@ -773,7 +774,7 @@ export default { color: #333; font-weight: bold; font-size: 15px; - padding: 8px 0; + padding: 12px 0; } .status-badge { @@ -992,7 +993,50 @@ export default { .pagination-container { display: flex; justify-content: flex-end; - margin-top: 20px; + margin-top: 15px; + padding-top: 15px; + border-top: 1px solid #f0f0f0; + height: 50px; +} + +.el-pagination { + padding: 0; + font-weight: normal; + height: 32px; + line-height: 32px; + .el-pagination__sizes { + margin-right: 16px; + } + .el-pagination__jump { + margin-left: 16px; + } + .el-pagination__total { + margin-right: 16px; + } + .btn-prev, + .btn-next { + background: #fff; + border: 1px solid #dcdfe6; + height: 32px; + line-height: 32px; + &:hover { + color: #409eff; + } + } + .el-pager li { + background: #fff; + border: 1px solid #dcdfe6; + height: 32px; + line-height: 32px; + &:hover { + color: #409eff; + } + &.active { + background-color: #409eff; + color: #fff; + border-color: #409eff; + } + } } @media (max-width: 900px) {