diff --git a/src/api/order.ts b/src/api/order.ts index 973e661..11505f3 100644 --- a/src/api/order.ts +++ b/src/api/order.ts @@ -61,3 +61,11 @@ export function fetchOrderList(params: OrderListParams = {}, options?: RequestOp ...params, }, options) } + +/** 查询单个订单详情(订单头、商品明细、运单信息) */ +export function fetchOrderDetail(id: string | number, options?: RequestOptions) { + return request('order.detail', { + ...workerPayload, + id, + }, options) +} diff --git a/src/pages/order/index.vue b/src/pages/order/index.vue index c1d63a6..7795fd8 100644 --- a/src/pages/order/index.vue +++ b/src/pages/order/index.vue @@ -48,9 +48,10 @@ - + - + + 序号 待处理订单号 @@ -60,8 +61,14 @@ v-else v-for="(item, index) in displayCurrentWaveOrders" :key="`${item.pendingOrderNo}-${index}`" - class="table-row" + :class="[ + 'table-row', + index % 2 === 1 ? 'table-row--alt' : '', + selectedPendingOrderKey === getPendingOrderKey(item) ? 'table-row--selected' : '', + ]" + @click="handlePendingOrderClick(item)" > + {{ (orderPagination.page - 1) * orderPagination.pageSize + index + 1 }} {{ item.pendingOrderNo }} @@ -80,7 +87,7 @@ - + 序号 订单号 波次号 @@ -88,7 +95,12 @@ 暂无匹配数据 - + {{ index + 1 }} {{ item.orderNo }} {{ item.waveNo }} @@ -120,9 +132,9 @@ - - - + + + 蓝号 数量 扫描记 @@ -134,7 +146,12 @@ 暂无匹配数据 - + {{ order.blueNo }} {{ order.quantity }} {{ order.scanMark }} @@ -155,7 +172,7 @@ @@ -405,7 +478,11 @@ export default { .left-reviewed-list { margin-top: 14rpx; - max-height: 520rpx; + max-height: 1100rpx; +} + +.left-reviewed-list--current-wave { + max-height: 1100rpx; } .settings-panel { @@ -521,6 +598,10 @@ export default { width: 100%; } +.table-scroll--detail { + max-height: 520rpx; +} + .pagination-bar { margin-top: 16rpx; display: flex; @@ -563,6 +644,18 @@ export default { min-width: 620rpx; } +.table-wrap--detail .table-cell { + align-self: stretch; + display: flex; + align-items: center; + border-right: 1rpx solid #eef2f8; + box-sizing: border-box; +} + +.table-wrap--detail .table-cell:last-child { + border-right: none; +} + .table-header, .table-row { display: flex; @@ -576,6 +669,12 @@ export default { background-color: #f6f8fc; } +.table-header--sticky { + position: sticky; + top: 0; + z-index: 2; +} + .table-body { border: 1rpx solid #e6ebf5; } @@ -589,6 +688,15 @@ export default { border-top: none; } +.table-row--alt { + background-color: #fafafa; +} + +.table-row--selected { + background-color: #eaf3ff; + border-left: 6rpx solid #2f7de1; +} + .table-cell { padding: 0 12rpx; font-size: 24rpx; @@ -625,7 +733,7 @@ export default { } .cell-spec { - width: 110rpx; + width: 240rpx; } .cell-index { @@ -642,7 +750,8 @@ export default { } .cell-pending-order { - width: 100%; + flex: 1; + min-width: 0; } .empty { @@ -651,4 +760,34 @@ export default { font-size: 26rpx; padding: 24rpx 0; } + +@media screen and (max-width: 1024px) { + .page { + min-width: 760px; + } + + .page-main { + padding: 8rpx 20rpx 18rpx; + } + + .container { + padding: 20rpx; + } + + .content-panel { + gap: 14rpx; + } + + .panel-left { + width: 620rpx; + } + + .search-bar { + margin-bottom: 18rpx; + } + + .table-scroll--detail { + max-height: 460rpx; + } +} diff --git a/src/pages/returns/index.vue b/src/pages/returns/index.vue index c646564..e1a4fa9 100644 --- a/src/pages/returns/index.vue +++ b/src/pages/returns/index.vue @@ -2,20 +2,23 @@ - + + + 退件 + 退件模块页面(待对接业务接口) + + @@ -31,4 +34,30 @@ export default { padding: 8rpx 32rpx 32rpx; box-sizing: border-box; } + +.dynamic-view--returns { + width: 100%; +} + +.module-card { + background-color: #fff; + border-radius: 16rpx; + padding: 32rpx; + box-sizing: border-box; +} + +.module-card-title { + display: block; + font-size: 32rpx; + color: #333; + font-weight: 600; + margin-bottom: 12rpx; +} + +.module-card-desc { + display: block; + font-size: 26rpx; + color: #888; + line-height: 1.5; +} diff --git a/src/pages/weighing/index.vue b/src/pages/weighing/index.vue index a220370..8846906 100644 --- a/src/pages/weighing/index.vue +++ b/src/pages/weighing/index.vue @@ -2,20 +2,23 @@ - + + + 称重 + 称重模块页面(待对接业务接口) + + @@ -31,4 +34,30 @@ export default { padding: 8rpx 32rpx 32rpx; box-sizing: border-box; } + +.dynamic-view--catch-weight { + width: 100%; +} + +.module-card { + background-color: #fff; + border-radius: 16rpx; + padding: 32rpx; + box-sizing: border-box; +} + +.module-card-title { + display: block; + font-size: 32rpx; + color: #333; + font-weight: 600; + margin-bottom: 12rpx; +} + +.module-card-desc { + display: block; + font-size: 26rpx; + color: #888; + line-height: 1.5; +} diff --git a/src/router/menuRoutes.js b/src/router/menuRoutes.js index 4b2ca1c..bb926fc 100644 --- a/src/router/menuRoutes.js +++ b/src/router/menuRoutes.js @@ -1,6 +1,6 @@ -import OrderView from '@/views/order/index.vue' -import CatchWeightView from '@/views/catch-weight/index.vue' -import ReturnsView from '@/views/returns/index.vue' +import OrderPage from '@/pages/order/index.vue' +import CatchWeightPage from '@/pages/weighing/index.vue' +import ReturnsPage from '@/pages/returns/index.vue' /** 将 user.info 中 menus[].path 规范为以 / 开头的路径 */ export function normalizeMenuPath(path) { @@ -13,12 +13,12 @@ export function normalizeMenuPath(path) { /** * 后端动态菜单 path -> 本地页面组件 - * 新增菜单时在此注册对应 views 组件 + * 新增菜单时在此注册对应页面组件 */ const menuRouteMap = { - '/order': OrderView, - '/catchWeight': CatchWeightView, - '/returns': ReturnsView, + '/order': OrderPage, + '/catchWeight': CatchWeightPage, + '/returns': ReturnsPage, } /** 根据菜单 path 解析要渲染的页面组件 */ diff --git a/src/views/catch-weight/index.vue b/src/views/catch-weight/index.vue deleted file mode 100644 index 3ab9c82..0000000 --- a/src/views/catch-weight/index.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - - - diff --git a/src/views/order/index.vue b/src/views/order/index.vue deleted file mode 100644 index 1842cc7..0000000 --- a/src/views/order/index.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - - diff --git a/src/views/returns/index.vue b/src/views/returns/index.vue deleted file mode 100644 index a88acf2..0000000 --- a/src/views/returns/index.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - - -