From 2119e9dfc905a63517b887d9414c2a005ce403d7 Mon Sep 17 00:00:00 2001 From: zm2000 <18386612143@163.com> Date: Fri, 9 Oct 2026 18:22:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(inventory-count):=20=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20UI=20=E4=BC=98=E5=8C=96=E4=B8=8E=E5=B7=B2?= =?UTF-8?q?=E7=9B=98/=E5=B7=AE=E5=BC=82=E5=8F=A3=E5=BE=84=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 已盘判定改为「状态=checked 或有作业记录 或实盘>0」,实盘=0 视为未盘 - 差异统一按「实盘-账面」计算,不信任后端 diff_quantity;未盘项不显示差异 - 新增 isCheckedLocation,库位明细与已盘库位数只统计真正已盘的库位,过滤任务占位项 - 商品副标题条形码提前到规格之前 - 空库位登记弹窗键盘适配:弹窗自身随键盘上移,不整页上推;聚焦延时与 @open 再聚焦 - 全模块字号加大、层级重排:任务卡片/宫格/库位明细/商品卡/汇总面板 - 库位明细负边距斑马纹铺满整行;任务卡片移除 stripe - 状态筛选由横向滚动改为等宽分布铺满整行 - 库位宫格 space 视图重排:商品数与状态同行、已盘进度独占一行 - 汇总面板货主字段上移,最近上报靠右,实盘数量黑色 - 收货页样式微调 --- .../CountActionsPopup.vue | 96 ++++-- .../inventoryCount-comps/CountGoodsCard.vue | 20 +- .../inventoryCount-comps/CountListToolbar.vue | 28 +- .../CountLocationDetail.vue | 67 ++-- .../CountLocationGrid.vue | 41 ++- .../inventoryCount-comps/CountRecordCard.vue | 27 +- .../CountSpaceEntryPopup.vue | 82 ++++- .../CountSummaryPanel.vue | 14 +- .../inventoryCount-comps/CountWorkCard.vue | 10 +- .../inventoryCount-comps/countModel.js | 42 ++- src/pages/warehouse/inventoryCount.vue | 1 - src/pages/warehouse/inventoryCountDetail.vue | 310 ++++++++++++++---- src/pages/warehouse/inventoryCountGoods.vue | 173 ++++++++-- .../warehouse/inventoryCountLocation.vue | 237 +++++++++++-- src/pages/warehouse/inventoryCountSpace.vue | 4 +- .../work/storage/receiving/receiving.vue | 20 +- 16 files changed, 909 insertions(+), 263 deletions(-) diff --git a/src/pages/warehouse/inventoryCount-comps/CountActionsPopup.vue b/src/pages/warehouse/inventoryCount-comps/CountActionsPopup.vue index 2439e53..a99d56d 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountActionsPopup.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountActionsPopup.vue @@ -2,14 +2,7 @@ {{ title }} - - - {{ submitting ? '处理中...' : '标记空库位' }} - + {{ submitting ? '提交中...' : '提交审核' }} - - {{ submitting ? '提交中...' : '完成盘点' }} - 关闭 + + {{ submitting ? '处理中...' : '标记空库位' }} + + + {{ submitting ? '提交中...' : '完成盘点' }} + @@ -124,11 +126,6 @@ export default { border: 2rpx solid #cfe1ff; } -.actions-popup-btn--complete { - background: #2979ff; - border: 2rpx solid #2979ff; -} - .actions-popup-btn__text { font-size: 34rpx; font-weight: 500; @@ -143,21 +140,64 @@ export default { color: #2979ff; } -.actions-popup-btn__text--complete { - color: #ffffff; -} - .actions-popup-footer { display: flex; - justify-content: center; + align-items: center; } .actions-popup-close-btn { - padding: 16rpx 48rpx; + flex: 1; + height: 88rpx; + display: flex; + align-items: center; + justify-content: center; font-size: 34rpx; color: #909399; - border: 1rpx solid #dcdfe6; - border-radius: 10rpx; + border: 2rpx solid #dcdfe6; + border-radius: 16rpx; background: #f5f5f5; + + &:active { + opacity: 0.88; + } +} + +.actions-popup-apply-btn { + flex: 1; + height: 88rpx; + display: flex; + align-items: center; + justify-content: center; + font-size: 34rpx; + color: #ffffff; + background: #2979ff; + border: 2rpx solid #2979ff; + border-radius: 16rpx; + /* 老真机不依赖 flex gap,用相邻兄弟 margin 留间隔 */ + margin-left: 20rpx; + + &:active { + opacity: 0.9; + } + + &--disabled { + opacity: 0.6; + pointer-events: none; + } +} + +.actions-popup-apply-btn__text { + font-weight: 500; + line-height: 1; +} + +/* 标记空库位:保留原来的浅红警示底色 */ +.actions-popup-apply-btn--mark-empty { + background: #fff1f0; + border-color: #ffccc7; +} + +.actions-popup-apply-btn__text--mark-empty { + color: #f56c6c; } diff --git a/src/pages/warehouse/inventoryCount-comps/CountGoodsCard.vue b/src/pages/warehouse/inventoryCount-comps/CountGoodsCard.vue index 64076d0..2ab92ae 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountGoodsCard.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountGoodsCard.vue @@ -126,7 +126,7 @@ export default { .goods-card__title { flex: 1; min-width: 0; - font-size: 32rpx; + font-size: 38rpx; font-weight: 600; color: #303133; line-height: 1.3; @@ -138,7 +138,7 @@ export default { .goods-card__flag { flex-shrink: 0; margin-left: 16rpx; - font-size: 26rpx; + font-size: 36rpx; line-height: 1.2; } @@ -152,11 +152,10 @@ export default { .goods-card__subtitle { margin-top: 6rpx; - font-size: 24rpx; - color: #8a9099; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + font-size: 34rpx; + color: #606266; + line-height: 1.4; + word-break: break-all; } .goods-card__metrics { @@ -168,12 +167,13 @@ export default { .goods-card__metric { margin-right: 20rpx; - font-size: 24rpx; - color: #606266; + font-size: 34rpx; + color: #303133; } .goods-card__diff { - font-size: 24rpx; + margin-right: 20rpx; + font-size: 34rpx; font-weight: 600; } diff --git a/src/pages/warehouse/inventoryCount-comps/CountListToolbar.vue b/src/pages/warehouse/inventoryCount-comps/CountListToolbar.vue index 9f10fe5..b98fd79 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountListToolbar.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountListToolbar.vue @@ -21,7 +21,7 @@ - + {{ opt.label }} - + @@ -140,23 +140,23 @@ export default { } } -/* 状态筛选行(横向滚动) */ -.filter-scroll { - width: 100%; - white-space: nowrap; -} - -.filter-group { - display: inline-flex; - flex-wrap: nowrap; +/* 状态筛选行(等宽分布,铺满整行) */ +.filter-row { + margin-top: 16rpx; + display: flex; align-items: center; } +.filter-group { + flex: 1; + display: flex; +} + .filter-group__item { - flex: none; + flex: 1; height: 56rpx; - padding: 0 24rpx; - display: inline-flex; + padding: 0 12rpx; + display: flex; align-items: center; justify-content: center; background: #f5f7fa; diff --git a/src/pages/warehouse/inventoryCount-comps/CountLocationDetail.vue b/src/pages/warehouse/inventoryCount-comps/CountLocationDetail.vue index 89b9d30..4cc6de4 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountLocationDetail.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountLocationDetail.vue @@ -1,6 +1,6 @@