diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 8ae452a..07b129c 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,6 +2,7 @@ "version" : "1.0", "configurations" : [ { + "customPlaygroundType" : "device", "playground" : "standard", "type" : "uni-app:app-android" } diff --git a/src/App.vue b/src/App.vue index 60a6604..44b2f27 100644 --- a/src/App.vue +++ b/src/App.vue @@ -21,4 +21,13 @@ uni-picker .uni-picker-container .uni-picker-custom, width: 260rpx !important; box-shadow: 0 0 20px 5px rgba(0, 0, 0, 0.1) !important; } + +/* H5/Electron 下 picker 下拉选项居左显示(覆盖库默认居中 text-align:center) */ +uni-picker .uni-picker-container.uni-selector-select .uni-picker-select .uni-picker-item, +.uni-picker-container.uni-selector-select .uni-picker-select .uni-picker-item, +uni-picker .uni-picker-container .uni-picker-view-content .uni-picker-item, +.uni-picker-container .uni-picker-view-content .uni-picker-item { + text-align: left; + padding-left: 20rpx; +} diff --git a/src/api/order.ts b/src/api/order.ts index b0da543..95ff5d2 100644 --- a/src/api/order.ts +++ b/src/api/order.ts @@ -122,3 +122,30 @@ export function scanReviewTask( options ) } + +type PrintListParams = { + page?: number + pageSize?: number + where?: Record +} + +/** + * 打印台列表(print.getList) + * 查询当前仓库下的打印台列表,支持分页与 where 条件筛选。 + * 支持字段:id(等值)、name、computer_id、custom_barcode; + * where 推荐使用 { operator, value, type } 标准结构。 + * 响应:data 包含 list 与 pagination。 + */ +export function fetchPrintList( + params: PrintListParams = {}, + options?: RequestOptions +) { + return request( + 'print.getList', + { + ...workerPayload, + ...params, + }, + options + ) +} diff --git a/src/pages/order/index.vue b/src/pages/order/index.vue index 0971909..29361cd 100644 --- a/src/pages/order/index.vue +++ b/src/pages/order/index.vue @@ -20,10 +20,12 @@ class="search-input" v-model="keyword" :placeholder="searchPlaceholder" - :focus="false" + :focus="searchFocus" :adjust-position="false" confirm-type="search" @confirm="handleConfirm" + @focus="handleSearchFocus" + @blur="handleSearchBlur" /> @@ -42,6 +44,7 @@ {{ formatWaveIndex(item) }} {{ getScanOrderNo(item) }} {{ getWavePrintStatus(item) }} + 拦截 @@ -83,7 +86,7 @@ - + @@ -206,12 +209,32 @@ + + + @@ -767,6 +1380,15 @@ export default { background-color: #f8f8f8; } +.scan-hidden-input { + position: absolute; + width: 1px; + height: 1px; + opacity: 0; + left: -9999px; + top: -9999px; +} + .page-main { flex: 1; min-height: 0; @@ -777,6 +1399,18 @@ export default { flex-direction: column; } +/* 订单复核页:锁定高度链,仅列表区内部滚动,页面不整体滚动 */ +.page-main.order-review-one { + overflow: hidden; +} + +.page-main.order-review-one > .container { + height: 100%; + min-height: 0; + flex: 1 1 0; + overflow: hidden; +} + .order-review-one { width: 100%; } @@ -833,12 +1467,14 @@ export default { .left-reviewed-list--current-wave { margin-top: 0; flex: 1; + min-height: 0; max-height: none; } .left-reviewed-list--current-wave-body { width: 100%; min-height: 0; + height: 100%; } .search-bar { @@ -925,6 +1561,12 @@ export default { max-height: none; } +.table-scroll--detail-body { + flex: 1; + min-height: 0; + height: 100%; +} + .table-wrap { min-width: 980rpx; } @@ -939,6 +1581,7 @@ export default { min-height: 0; display: flex; flex-direction: column; + overflow: hidden; } .table-wrap--current-wave-sticky .table-header { @@ -1217,14 +1860,16 @@ export default { width: 90rpx; } -/* 散单行:复核状态、波次序号、运单号三列间隔完全贴合 */ +/* 散单行:复核状态、波次序号、运单号三列间隔 8rpx */ .scan-row .cell-review-status { padding-right: 0; + margin-right: 8rpx; } .scan-row .cell-wave-index { padding-left: 0; padding-right: 0; + margin-right: 8rpx; } .scan-row .cell-wave-no { @@ -1260,6 +1905,32 @@ export default { color: #34c759; } +/* 左侧列表:拦截按钮(intercept_status=requested 时显示) */ +.cell-intercept { + flex-shrink: 0; + height: 40rpx; + line-height: 40rpx; + padding: 0 16rpx; + margin: 0 12rpx 0 4rpx; + font-size: 24rpx; + color: #fff; + background-color: #e64340; + border-radius: 8rpx; + cursor: pointer; + user-select: none; +} + +.cell-intercept:active { + background-color: #c9302c; +} + +/* 左侧订单/波次列表:整行内容完整显示不省略;需换行时优先对运单号/波次号列换行 */ +.table-wrap--current-wave .table-cell:not(.cell-wave-no) { + white-space: nowrap; + overflow: visible; + text-overflow: clip; +} + .wave-group-header { cursor: pointer; background-color: #f6f8fc; @@ -1321,6 +1992,12 @@ export default { color: #fff; } +.tool-btn--intercept { + background-color: #e64340; + border-color: #e64340; + color: #fff; +} + .tool-select { display: flex; align-items: center;