fix(ui): 修复真机加粗失效并统一 PDA 页面字号与布局

- 库存盘点:font-weight 600 统一改为 bold,修复真机无加粗效果
- 库存盘点:移除右上角「...」操作菜单,改为「完成盘点」「空库位」直接按钮
- 库存盘点:顶部标题栏字号统一 36rpx,搜索输入框字号 34rpx,提示字号 28→30rpx
- 拦截登记:顶部导航重构为自定义 header(返回/标题/输入框开关/重置)
- 拦截登记:搜索框改为 u-search 圆角样式并新增「搜索」按钮
- 拦截登记:信息面板标签 32→36rpx、值 32→40rpx,与搜索框间隔调整为 60rpx
- 拦截登记:拦截失败提示优化,区分「非拦截订单」等文案
- 库位查询:标题/搜索/计数半格样式调整,浅色背景深色文字、下划线强调
- 其他:page-nav 右侧宽度改 min-width;首页/个人中心弹窗圆角 24→20rpx;多处标题字号 32→36rpx
This commit is contained in:
zm2000 2026-11-09 17:59:23 +08:00
parent cd5b6a0e63
commit b95ac35d39
25 changed files with 358 additions and 283 deletions

View File

@ -154,7 +154,7 @@
} }
.right { .right {
width: 80rpx; min-width: 80rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;

View File

@ -475,7 +475,7 @@
} }
.header-title { .header-title {
font-size: 32rpx; font-size: 36rpx;
font-weight: bold; font-weight: bold;
color: #333; color: #333;
} }

View File

@ -2381,7 +2381,7 @@
width: 100%; width: 100%;
max-width: 620rpx; max-width: 620rpx;
background: #fff; background: #fff;
border-radius: 24rpx; border-radius: 20rpx;
padding: 40rpx 36rpx 36rpx; padding: 40rpx 36rpx 36rpx;
box-sizing: border-box; box-sizing: border-box;
box-shadow: 0 24rpx 80rpx rgba(0, 0, 0, 0.18); box-shadow: 0 24rpx 80rpx rgba(0, 0, 0, 0.18);

View File

@ -596,7 +596,7 @@
.header-title { .header-title {
flex: 1; flex: 1;
font-size: 32rpx; font-size: 36rpx;
font-weight: bold; font-weight: bold;
color: #333; color: #333;
text-align: center; text-align: center;

View File

@ -584,7 +584,7 @@
width: 100%; width: 100%;
max-width: 620rpx; max-width: 620rpx;
background: #fff; background: #fff;
border-radius: 24rpx; border-radius: 20rpx;
padding: 40rpx 36rpx 36rpx; padding: 40rpx 36rpx 36rpx;
box-sizing: border-box; box-sizing: border-box;
box-shadow: 0 24rpx 80rpx rgba(0, 0, 0, 0.18); box-shadow: 0 24rpx 80rpx rgba(0, 0, 0, 0.18);

View File

@ -86,7 +86,7 @@ export default {
.actions-popup-title { .actions-popup-title {
font-size: 38rpx; font-size: 38rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
text-align: center; text-align: center;
margin-bottom: 36rpx; margin-bottom: 36rpx;

View File

@ -195,7 +195,7 @@ export default {
.picker__title { .picker__title {
font-size: 36rpx; font-size: 36rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
} }
@ -303,7 +303,7 @@ export default {
.picker__footer-btn-text { .picker__footer-btn-text {
font-size: 34rpx; font-size: 34rpx;
font-weight: 600; font-weight: bold;
color: #ffffff; color: #ffffff;
} }
</style> </style>

View File

@ -136,7 +136,7 @@ export default {
flex: 1; flex: 1;
min-width: 0; min-width: 0;
font-size: 38rpx; font-size: 38rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
line-height: 1.3; line-height: 1.3;
overflow: hidden; overflow: hidden;
@ -194,7 +194,7 @@ export default {
.goods-card__diff { .goods-card__diff {
margin-right: 20rpx; margin-right: 20rpx;
font-size: 34rpx; font-size: 34rpx;
font-weight: 600; font-weight: bold;
} }
.goods-card__diff--gain { .goods-card__diff--gain {

View File

@ -107,7 +107,7 @@ export default {
.count-card__name { .count-card__name {
font-size: 38rpx; font-size: 38rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
line-height: 1.4; line-height: 1.4;
word-break: break-all; word-break: break-all;
@ -167,7 +167,7 @@ export default {
.count-card__value { .count-card__value {
margin-top: 8rpx; margin-top: 8rpx;
font-size: 40rpx; font-size: 40rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
line-height: 1.3; line-height: 1.3;
} }
@ -197,7 +197,7 @@ export default {
flex: 1; flex: 1;
min-width: 0; min-width: 0;
font-size: 36rpx; font-size: 36rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
} }
@ -254,6 +254,6 @@ export default {
.count-card__diff-text { .count-card__diff-text {
font-size: 28rpx; font-size: 28rpx;
font-weight: 600; font-weight: bold;
} }
</style> </style>

View File

@ -218,6 +218,6 @@ export default {
.filter-group__item--active .filter-group__item-text { .filter-group__item--active .filter-group__item-text {
color: #ffffff; color: #ffffff;
font-weight: 600; font-weight: bold;
} }
</style> </style>

View File

@ -192,7 +192,7 @@ export default {
.loc-detail__title { .loc-detail__title {
font-size: 40rpx; font-size: 40rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
line-height: 1.3; line-height: 1.3;
word-break: break-all; word-break: break-all;
@ -275,7 +275,7 @@ export default {
.loc-detail__section-title { .loc-detail__section-title {
font-size: 34rpx; font-size: 34rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
} }
@ -420,19 +420,19 @@ export default {
/* 该库位账面有货:加粗深色,方便一眼找到账面库位 */ /* 该库位账面有货:加粗深色,方便一眼找到账面库位 */
.loc-detail__row-amount--stock { .loc-detail__row-amount--stock {
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
} }
.loc-detail__row-diff { .loc-detail__row-diff {
font-size: 36rpx; font-size: 36rpx;
font-weight: 600; font-weight: bold;
} }
/* 另一种账面口径提示(静态看当前库存 / 普通看基准快照) */ /* 另一种账面口径提示(静态看当前库存 / 普通看基准快照) */
.loc-detail__row-hint { .loc-detail__row-hint {
margin-right: 20rpx; margin-right: 20rpx;
font-size: 26rpx; font-size: 30rpx;
color: #b8811a; color: #b8811a;
} }

View File

@ -119,13 +119,13 @@ export default {
} }
.loc-grid__head-title { .loc-grid__head-title {
font-size: 26rpx; font-size: 32rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
} }
.loc-grid__head-hint { .loc-grid__head-hint {
font-size: 24rpx; font-size: 30rpx;
color: #c0c4cc; color: #c0c4cc;
} }
@ -169,11 +169,9 @@ export default {
justify-content: center; justify-content: center;
} }
/* 库位名独占一行(超长省略) */ /* 库位名独占一行(超长换行完整显示) */
.loc-grid__code--stack { .loc-grid__code--stack {
overflow: hidden; word-break: break-all;
text-overflow: ellipsis;
white-space: nowrap;
} }
/* 商品数 + 状态同一行(商品数居左、状态/未盘居右) */ /* 商品数 + 状态同一行(商品数居左、状态/未盘居右) */
@ -187,7 +185,7 @@ export default {
/* 已盘/未盘进度独占一行(居左) */ /* 已盘/未盘进度独占一行(居左) */
.loc-grid__progress { .loc-grid__progress {
margin-top: 6rpx; margin-top: 6rpx;
font-size: 28rpx; font-size: 30rpx;
line-height: 1; line-height: 1;
text-align: left; text-align: left;
color: #606266; color: #606266;
@ -217,14 +215,14 @@ export default {
.loc-grid__code { .loc-grid__code {
font-size: 36rpx; font-size: 36rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
line-height: 1.2; line-height: 1.2;
word-break: break-all; word-break: break-all;
} }
.loc-grid__sub { .loc-grid__sub {
font-size: 28rpx; font-size: 30rpx;
line-height: 1.1; line-height: 1.1;
color: #606266; color: #606266;
} }
@ -244,7 +242,7 @@ export default {
} }
.loc-grid__count { .loc-grid__count {
font-size: 28rpx; font-size: 30rpx;
line-height: 1; line-height: 1;
color: #909399; color: #909399;
} }

View File

@ -378,7 +378,7 @@ export default {
.record-add__title { .record-add__title {
flex-shrink: 0; flex-shrink: 0;
font-size: 38rpx; font-size: 38rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
} }
@ -402,6 +402,10 @@ export default {
::v-deep .u-search__content { ::v-deep .u-search__content {
padding-right: 140rpx; padding-right: 140rpx;
} }
::v-deep .u-search__content__input {
font-size: 34rpx;
}
} }
.record-add__search-actions { .record-add__search-actions {
@ -611,7 +615,7 @@ export default {
} }
.record-add__qty .record-add__label { .record-add__qty .record-add__label {
font-size: 42rpx; font-size: 40rpx;
width: auto; width: auto;
margin-right: 20rpx; margin-right: 20rpx;
} }

View File

@ -66,7 +66,7 @@ export default {
flex: 1; flex: 1;
min-width: 0; min-width: 0;
font-size: 36rpx; font-size: 36rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
line-height: 1.4; line-height: 1.4;
/* 超长自动换行显示多行 */ /* 超长自动换行显示多行 */
@ -165,7 +165,7 @@ export default {
.record-card__status { .record-card__status {
font-size: 36rpx; font-size: 36rpx;
font-weight: 600; font-weight: bold;
color: #2979ff; color: #2979ff;
line-height: 1.6; line-height: 1.6;
} }

View File

@ -63,6 +63,10 @@ export default {
::v-deep .u-search__content { ::v-deep .u-search__content {
padding-right: 200rpx; padding-right: 200rpx;
} }
::v-deep .u-search__content__input {
font-size: 34rpx;
}
} }
.search-actions { .search-actions {

View File

@ -319,7 +319,7 @@ export default {
.space-entry__title { .space-entry__title {
flex-shrink: 0; flex-shrink: 0;
font-size: 38rpx; font-size: 38rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
} }
@ -343,6 +343,10 @@ export default {
::v-deep .u-search__content { ::v-deep .u-search__content {
padding-right: 140rpx; padding-right: 140rpx;
} }
::v-deep .u-search__content__input {
font-size: 34rpx;
}
} }
.space-entry__search-actions { .space-entry__search-actions {
@ -429,7 +433,7 @@ export default {
.space-item__subtitle { .space-item__subtitle {
margin-top: 4rpx; margin-top: 4rpx;
font-size: 26rpx; font-size: 30rpx;
color: #909399; color: #909399;
} }

View File

@ -117,7 +117,7 @@ export default {
.summary-panel__group { .summary-panel__group {
margin: 24rpx 0 6rpx; margin: 24rpx 0 6rpx;
font-size: 32rpx; font-size: 32rpx;
font-weight: 600; font-weight: bold;
color: #2979ff; color: #2979ff;
&:first-child { &:first-child {
@ -153,22 +153,22 @@ export default {
} }
.summary-panel__value--strong { .summary-panel__value--strong {
font-weight: 600; font-weight: bold;
color: #2979ff; color: #2979ff;
} }
.summary-panel__value--success { .summary-panel__value--success {
font-weight: 600; font-weight: bold;
color: #18a058; color: #18a058;
} }
.summary-panel__value--warning { .summary-panel__value--warning {
font-weight: 600; font-weight: bold;
color: #ff9800; color: #ff9800;
} }
.summary-panel__value--danger { .summary-panel__value--danger {
font-weight: 600; font-weight: bold;
color: #e64340; color: #e64340;
} }

View File

@ -163,7 +163,7 @@ export default {
border: 2rpx solid #ebedf2; border: 2rpx solid #ebedf2;
border-radius: 20rpx; border-radius: 20rpx;
padding: 20rpx 28rpx; padding: 20rpx 28rpx;
margin-bottom: 20rpx; margin: 0 12rpx 20rpx;
box-shadow: 0 6rpx 20rpx rgba(31, 45, 61, 0.06); box-shadow: 0 6rpx 20rpx rgba(31, 45, 61, 0.06);
transition: border-color 0.3s ease, background-color 0.3s ease; transition: border-color 0.3s ease, background-color 0.3s ease;
} }
@ -189,7 +189,7 @@ export default {
.work-card__title { .work-card__title {
font-size: 38rpx; font-size: 38rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
line-height: 1.4; line-height: 1.4;
word-break: break-all; word-break: break-all;
@ -261,14 +261,14 @@ export default {
} }
.work-card__label { .work-card__label {
font-size: 28rpx; font-size: 30rpx;
color: #8a9099; color: #8a9099;
} }
.work-card__value { .work-card__value {
margin-top: 8rpx; margin-top: 8rpx;
font-size: 40rpx; font-size: 40rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
line-height: 1.3; line-height: 1.3;
} }
@ -278,7 +278,7 @@ export default {
padding: 6rpx 14rpx; padding: 6rpx 14rpx;
border-radius: 8rpx; border-radius: 8rpx;
font-size: 26rpx; font-size: 26rpx;
font-weight: 600; font-weight: bold;
} }
.work-card__diff--gain { .work-card__diff--gain {
@ -300,7 +300,7 @@ export default {
.work-card__book-hint { .work-card__book-hint {
width: 100%; width: 100%;
margin-top: 6rpx; margin-top: 6rpx;
font-size: 26rpx; font-size: 30rpx;
color: #b8811a; color: #b8811a;
} }
@ -345,7 +345,7 @@ export default {
flex: 1; flex: 1;
min-width: 0; min-width: 0;
font-size: 36rpx; font-size: 36rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
} }
@ -421,12 +421,13 @@ export default {
.work-child__hint { .work-child__hint {
margin-top: 4rpx; margin-top: 4rpx;
margin-left: 16rpx; margin-left: 16rpx;
font-size: 26rpx; font-size: 30rpx;
color: #b8811a; color: #b8811a;
} }
/* 拣货未完成提示:红色(与账面口径提示区分) */ /* 拣货未完成提示:红色(与账面口径提示区分) */
.work-child__hint--picking { .work-child__hint--picking {
font-size: 30rpx;
color: #e64340; color: #e64340;
} }

View File

@ -260,6 +260,11 @@ export default {
overflow: hidden; overflow: hidden;
} }
/* 顶部标题栏字号 */
::v-deep .nav-title .title {
font-size: 36rpx;
}
/* 列表区 */ /* 列表区 */
.detail-scroll { .detail-scroll {
flex: 1; flex: 1;

View File

@ -4,12 +4,12 @@
<page-nav :title="canEdit ? '盘点操作' : '盘点详情'"> <page-nav :title="canEdit ? '盘点操作' : '盘点详情'">
<template #right> <template #right>
<view <view
v-if="hasActions" v-if="canFinish"
class="nav-more-btn" class="nav-finish-btn"
:class="{ 'nav-more-btn--disabled': submitting }" :class="{ 'nav-finish-btn--disabled': submitting }"
@click="openActionsPopup" @click="handleFinish"
> >
<u-icon name="more-dot-fill" size="40rpx" color="#303133"></u-icon> <text class="nav-finish-btn__text">{{ submitting ? '提交中...' : '完成盘点' }}</text>
</view> </view>
</template> </template>
</page-nav> </page-nav>
@ -129,26 +129,13 @@
@confirm="handleRecordAddConfirm" @confirm="handleRecordAddConfirm"
/> />
<!-- 右上角「...」操作菜单(参考 picking.vue) -->
<count-actions-popup
:show="showActionsPopup"
:can-finish="canFinish"
:can-cancel="canCancel"
:can-submit="canSubmit"
:submitting="submitting"
@close="showActionsPopup = false"
@finish="handleFinish"
@cancel="handleCancel"
@submit="handleSubmit"
/>
<!-- 完成盘点确认弹窗(自定义样式) --> <!-- 完成盘点确认弹窗(自定义样式) -->
<u-popup <u-popup
:show="showFinishConfirm" :show="showFinishConfirm"
mode="center" mode="center"
:closeable="true" :closeable="true"
:closeOnClickOverlay="false" :closeOnClickOverlay="false"
border-radius="20" round="20"
@close="cancelFinish" @close="cancelFinish"
> >
<view class="finish-confirm-popup"> <view class="finish-confirm-popup">
@ -175,7 +162,7 @@
mode="center" mode="center"
:closeable="true" :closeable="true"
:closeOnClickOverlay="false" :closeOnClickOverlay="false"
border-radius="20" round="20"
@close="cancelMarkEmpty" @close="cancelMarkEmpty"
> >
<view class="mark-empty-confirm-popup"> <view class="mark-empty-confirm-popup">
@ -202,7 +189,7 @@
mode="center" mode="center"
:closeable="true" :closeable="true"
:closeOnClickOverlay="false" :closeOnClickOverlay="false"
border-radius="20" round="20"
@close="cancelAllLocations" @close="cancelAllLocations"
> >
<view class="all-locations-confirm-popup"> <view class="all-locations-confirm-popup">
@ -232,7 +219,6 @@ import CountGoodsCard from './inventoryCount-comps/CountGoodsCard.vue';
import CountLocationGrid from './inventoryCount-comps/CountLocationGrid.vue'; import CountLocationGrid from './inventoryCount-comps/CountLocationGrid.vue';
import CountDetailPicker from './inventoryCount-comps/CountDetailPicker.vue'; import CountDetailPicker from './inventoryCount-comps/CountDetailPicker.vue';
import CountRecordAddPopup from './inventoryCount-comps/CountRecordAddPopup.vue'; import CountRecordAddPopup from './inventoryCount-comps/CountRecordAddPopup.vue';
import CountActionsPopup from './inventoryCount-comps/CountActionsPopup.vue';
import { import {
normalizeScanResult, normalizeScanResult,
extractObjectPayload, extractObjectPayload,
@ -255,8 +241,7 @@ export default {
CountGoodsCard, CountGoodsCard,
CountLocationGrid, CountLocationGrid,
CountDetailPicker, CountDetailPicker,
CountRecordAddPopup, CountRecordAddPopup
CountActionsPopup
}, },
data() { data() {
return { return {
@ -271,7 +256,6 @@ export default {
loading: false, loading: false,
refreshing: false, refreshing: false,
submitting: false, submitting: false,
showActionsPopup: false,
showFinishConfirm: false, showFinishConfirm: false,
showMarkEmptyConfirm: false, showMarkEmptyConfirm: false,
markEmptyTarget: null, markEmptyTarget: null,
@ -302,17 +286,6 @@ export default {
canFinish() { canFinish() {
return this.status === 'approved' || this.status === 'checking'; return this.status === 'approved' || this.status === 'checking';
}, },
canCancel() {
return this.status === 'created' || this.status === 'submitted' || this.status === 'rejected';
},
// created/rejected → 可提交审核
canSubmit() {
return this.status === 'created' || this.status === 'rejected';
},
// 是否有可执行的操作(只读状态不展示菜单入口)
hasActions() {
return this.canFinish || this.canCancel || this.canSubmit;
},
// 作业列表行级「标记空库位」确认文案 // 作业列表行级「标记空库位」确认文案
markEmptyText() { markEmptyText() {
const row = this.markEmptyTarget; const row = this.markEmptyTarget;
@ -376,7 +349,7 @@ export default {
}, },
// 切换按钮文案 = 点击后会切到的模式(明确指引,不歧义) // 切换按钮文案 = 点击后会切到的模式(明确指引,不歧义)
workModeText() { workModeText() {
return this.workMode === 'goods' ? '切换为:库位模式' : '切换为:商品模式'; return this.workMode === 'goods' ? '库位模式' : '商品模式';
}, },
// Tab 列表(参考收货) // Tab 列表(参考收货)
tabs() { tabs() {
@ -930,10 +903,6 @@ export default {
this.loading = false; this.loading = false;
} }
}, },
openActionsPopup() {
if (!this.hasActions || this.submitting) return;
this.showActionsPopup = true;
},
/** 语音播报(复用全局 $tools.speakText,受 voice.enabled 开关控制) */ /** 语音播报(复用全局 $tools.speakText,受 voice.enabled 开关控制) */
speakMessage(message, options = {}) { speakMessage(message, options = {}) {
const text = String(message || '').trim(); const text = String(message || '').trim();
@ -950,8 +919,7 @@ export default {
} }
}, },
handleFinish() { handleFinish() {
this.showActionsPopup = false; if (this.submitting || !this.taskId || !this.canFinish) return;
if (this.submitting || !this.taskId) return;
this.showFinishConfirm = true; this.showFinishConfirm = true;
}, },
cancelFinish() { cancelFinish() {
@ -993,51 +961,6 @@ export default {
this.submitting = false; this.submitting = false;
} }
}, },
handleCancel() {
this.showActionsPopup = false;
if (this.submitting || !this.taskId) return;
uni.showModal({
title: '取消盘点任务',
content: '确定取消该盘点任务?取消后不可恢复。',
confirmText: '确定取消',
cancelText: '再想想',
success: async (res) => {
if (!res.confirm) return;
await this.doStatusAction('check.cancel', '已取消');
}
});
},
handleSubmit() {
this.showActionsPopup = false;
if (this.submitting || !this.taskId) return;
uni.showModal({
title: '提交审核',
content: '确认提交该盘点任务进行审核?提交后待审核,期间不可修改明细。',
confirmText: '提交',
cancelText: '再想想',
success: async (res) => {
if (!res.confirm) return;
await this.doStatusAction('check.submit', '已提交审核');
}
});
},
async doStatusAction(api, successText) {
this.submitting = true;
try {
const response = await this.$http(api, { id: Number(this.taskId) });
if (response?.flag === 'failure') {
uni.showToast({ title: response.message || '操作失败', icon: 'none' });
return;
}
uni.showToast({ title: successText, icon: 'success' });
setTimeout(() => uni.navigateBack({ delta: 1, fail: () => {} }), 600);
} catch (error) {
console.error(`[inventoryCountDetail] ${api} 失败:`, error);
uni.showToast({ title: '操作失败', icon: 'none' });
} finally {
this.submitting = false;
}
}
} }
} }
</script> </script>
@ -1055,6 +978,11 @@ export default {
overflow: hidden; overflow: hidden;
} }
/* 顶部标题栏字号 */
::v-deep .nav-title .title {
font-size: 36rpx;
}
/* Tab 切换(参考收货);右侧为商品任务的作业视图切换 */ /* Tab 切换(参考收货);右侧为商品任务的作业视图切换 */
.tabs-container { .tabs-container {
flex-shrink: 0; flex-shrink: 0;
@ -1079,11 +1007,11 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
height: 56rpx; height: 52rpx;
margin: 0 20rpx; margin: 0 16rpx;
padding: 0 20rpx; padding: 0 18rpx;
box-sizing: border-box; box-sizing: border-box;
border-radius: 999rpx; border-radius: 8rpx;
background: #eef4ff; background: #eef4ff;
border: 1rpx solid #cfe1ff; border: 1rpx solid #cfe1ff;
@ -1093,7 +1021,7 @@ export default {
} }
.tabs-container__switch-text { .tabs-container__switch-text {
font-size: 30rpx; font-size: 34rpx;
line-height: 1; line-height: 1;
color: #2979ff; color: #2979ff;
white-space: nowrap; white-space: nowrap;
@ -1149,13 +1077,13 @@ export default {
} }
.goods-list__head-title { .goods-list__head-title {
font-size: 26rpx; font-size: 32rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
} }
.goods-list__head-hint { .goods-list__head-hint {
font-size: 24rpx; font-size: 30rpx;
color: #c0c4cc; color: #c0c4cc;
} }
@ -1201,7 +1129,7 @@ export default {
.detail-footer__btn-text { .detail-footer__btn-text {
font-size: 36rpx; font-size: 36rpx;
font-weight: 600; font-weight: bold;
color: #ffffff; color: #ffffff;
} }
@ -1210,16 +1138,27 @@ export default {
height: 20rpx; height: 20rpx;
} }
/* 右上角「...」菜单入口 */ /* 右上角「完成盘点」按钮入口 */
.nav-more-btn { .nav-finish-btn {
width: 64rpx;
height: 64rpx; height: 64rpx;
padding: 0 20rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-shrink: 0;
background: #2979ff;
border-radius: 8rpx;
} }
.nav-more-btn--disabled { .nav-finish-btn__text {
font-size: 36rpx;
font-weight: 500;
color: #ffffff;
line-height: 1;
white-space: nowrap;
}
.nav-finish-btn--disabled {
opacity: 0.45; opacity: 0.45;
pointer-events: none; pointer-events: none;
} }
@ -1235,7 +1174,7 @@ export default {
.finish-confirm-popup__title { .finish-confirm-popup__title {
font-size: 42rpx; font-size: 42rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
text-align: center; text-align: center;
margin-bottom: 32rpx; margin-bottom: 32rpx;
@ -1301,7 +1240,7 @@ export default {
.mark-empty-confirm-popup__title { .mark-empty-confirm-popup__title {
font-size: 42rpx; font-size: 42rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
text-align: center; text-align: center;
margin-bottom: 32rpx; margin-bottom: 32rpx;
@ -1367,7 +1306,7 @@ export default {
.all-locations-confirm-popup__title { .all-locations-confirm-popup__title {
font-size: 42rpx; font-size: 42rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
text-align: center; text-align: center;
margin-bottom: 32rpx; margin-bottom: 32rpx;

View File

@ -98,7 +98,7 @@
mode="center" mode="center"
:closeable="true" :closeable="true"
:closeOnClickOverlay="false" :closeOnClickOverlay="false"
border-radius="20" round="20"
@close="cancelDeleteRecord" @close="cancelDeleteRecord"
> >
<view class="delete-confirm-popup"> <view class="delete-confirm-popup">
@ -715,6 +715,11 @@ export default {
overflow: hidden; overflow: hidden;
} }
/* 顶部标题栏字号 */
::v-deep .nav-title .title {
font-size: 36rpx;
}
/* 数量录入条(紧接 CountSearchPanel,同一白底 + 分隔线视觉) */ /* 数量录入条(紧接 CountSearchPanel,同一白底 + 分隔线视觉) */
.inv-goods-scroll { .inv-goods-scroll {
flex: 1; flex: 1;
@ -773,7 +778,7 @@ export default {
flex: 1; flex: 1;
min-width: 0; min-width: 0;
font-size: 38rpx; font-size: 38rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
line-height: 1.3; line-height: 1.3;
overflow: hidden; overflow: hidden;
@ -825,7 +830,7 @@ export default {
.inv-goods-card__diff { .inv-goods-card__diff {
margin-right: 20rpx; margin-right: 20rpx;
font-size: 34rpx; font-size: 34rpx;
font-weight: 600; font-weight: bold;
} }
.inv-goods-card__diff--gain { .inv-goods-card__diff--gain {
@ -839,7 +844,7 @@ export default {
/* 另一种账面口径提示(静态看当前库存 / 普通看基准快照) */ /* 另一种账面口径提示(静态看当前库存 / 普通看基准快照) */
.inv-goods-card__hint { .inv-goods-card__hint {
margin-right: 20rpx; margin-right: 20rpx;
font-size: 28rpx; font-size: 30rpx;
color: #b8811a; color: #b8811a;
} }
@ -849,7 +854,7 @@ export default {
background: #fff8e6; background: #fff8e6;
border: 2rpx solid #ffe1a8; border: 2rpx solid #ffe1a8;
border-radius: 16rpx; border-radius: 16rpx;
font-size: 28rpx; font-size: 30rpx;
color: #b8811a; color: #b8811a;
text-align: center; text-align: center;
} }
@ -869,7 +874,7 @@ export default {
.delete-confirm-popup__title { .delete-confirm-popup__title {
font-size: 42rpx; font-size: 42rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
text-align: center; text-align: center;
margin-bottom: 32rpx; margin-bottom: 32rpx;

View File

@ -3,8 +3,8 @@
<view class="normar_container"> <view class="normar_container">
<page-nav :title="navTitle"> <page-nav :title="navTitle">
<template #right> <template #right>
<view v-if="editable" class="nav-more-btn" :class="{ 'nav-more-btn--disabled': submitting }" @click="showActionsPopup = true"> <view v-if="editable" class="nav-mark-empty-btn" :class="{ 'nav-mark-empty-btn--disabled': submitting }" @click="handleMarkEmpty">
<u-icon name="more-dot-fill" size="40rpx" color="#303133"></u-icon> <text class="nav-mark-empty-btn__text">空库位</text>
</view> </view>
</template> </template>
</page-nav> </page-nav>
@ -56,16 +56,6 @@
</scroll-view> </scroll-view>
</view> </view>
<!-- 右上角「...」菜单(标记空库位收在这里) -->
<count-actions-popup
:show="showActionsPopup"
title="库位操作"
:can-mark-empty="editable"
:submitting="submitting"
@close="showActionsPopup = false"
@mark-empty="handleMenuMarkEmpty"
/>
<!-- 添加商品记录(stock.check.report) --> <!-- 添加商品记录(stock.check.report) -->
<count-record-add-popup <count-record-add-popup
ref="recordAddPopup" ref="recordAddPopup"
@ -85,7 +75,7 @@
mode="center" mode="center"
:closeable="true" :closeable="true"
:closeOnClickOverlay="false" :closeOnClickOverlay="false"
border-radius="20" round="20"
@close="cancelMarkEmpty" @close="cancelMarkEmpty"
> >
<view class="mark-empty-confirm-popup"> <view class="mark-empty-confirm-popup">
@ -112,7 +102,7 @@
mode="center" mode="center"
:closeable="true" :closeable="true"
:closeOnClickOverlay="false" :closeOnClickOverlay="false"
border-radius="20" round="20"
@close="cancelDeleteRecord" @close="cancelDeleteRecord"
> >
<view class="delete-confirm-popup"> <view class="delete-confirm-popup">
@ -139,7 +129,6 @@
import CountSearchPanel from './inventoryCount-comps/CountSearchPanel.vue'; import CountSearchPanel from './inventoryCount-comps/CountSearchPanel.vue';
import CountLocationDetail from './inventoryCount-comps/CountLocationDetail.vue'; import CountLocationDetail from './inventoryCount-comps/CountLocationDetail.vue';
import CountRecordAddPopup from './inventoryCount-comps/CountRecordAddPopup.vue'; import CountRecordAddPopup from './inventoryCount-comps/CountRecordAddPopup.vue';
import CountActionsPopup from './inventoryCount-comps/CountActionsPopup.vue';
import { import {
normalizeScanResult, normalizeScanResult,
extractObjectPayload, extractObjectPayload,
@ -159,8 +148,7 @@ export default {
components: { components: {
CountSearchPanel, CountSearchPanel,
CountLocationDetail, CountLocationDetail,
CountRecordAddPopup, CountRecordAddPopup
CountActionsPopup
}, },
data() { data() {
return { return {
@ -174,7 +162,6 @@ export default {
refreshing: false, refreshing: false,
scanKeyword: '', scanKeyword: '',
showRecordAdd: false, showRecordAdd: false,
showActionsPopup: false,
showMarkEmptyConfirm: false, showMarkEmptyConfirm: false,
showDeleteRecordConfirm: false, showDeleteRecordConfirm: false,
deleteRecordTarget: null, deleteRecordTarget: null,
@ -307,11 +294,6 @@ export default {
this.showRecordAdd = false; this.showRecordAdd = false;
this.pendingBarcode = ''; this.pendingBarcode = '';
}, },
// 右上角菜单:标记空库位(先关菜单再确认)
handleMenuMarkEmpty() {
this.showActionsPopup = false;
this.handleMarkEmpty();
},
handleMarkEmpty() { handleMarkEmpty() {
if (!this.detailId) { if (!this.detailId) {
uni.showToast({ title: '缺少盘点明细ID', icon: 'none' }); uni.showToast({ title: '缺少盘点明细ID', icon: 'none' });
@ -547,6 +529,11 @@ export default {
overflow: hidden; overflow: hidden;
} }
/* 顶部标题栏字号 */
::v-deep .nav-title .title {
font-size: 36rpx;
}
.inv-loc-scroll { .inv-loc-scroll {
flex: 1; flex: 1;
min-height: 0; min-height: 0;
@ -605,16 +592,27 @@ export default {
height: 20rpx; height: 20rpx;
} }
/* 右上角「...」菜单入口 */ /* 右上角「空库位」按钮(参考完成盘点按钮样式,红色背景) */
.nav-more-btn { .nav-mark-empty-btn {
width: 64rpx;
height: 64rpx; height: 64rpx;
padding: 0 20rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
flex-shrink: 0;
background: #f56c6c;
border-radius: 8rpx;
} }
.nav-more-btn--disabled { .nav-mark-empty-btn__text {
font-size: 36rpx;
font-weight: 500;
color: #ffffff;
line-height: 1;
white-space: nowrap;
}
.nav-mark-empty-btn--disabled {
opacity: 0.45; opacity: 0.45;
pointer-events: none; pointer-events: none;
} }
@ -630,7 +628,7 @@ export default {
.mark-empty-confirm-popup__title { .mark-empty-confirm-popup__title {
font-size: 42rpx; font-size: 42rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
text-align: center; text-align: center;
margin-bottom: 32rpx; margin-bottom: 32rpx;
@ -696,7 +694,7 @@ export default {
.delete-confirm-popup__title { .delete-confirm-popup__title {
font-size: 42rpx; font-size: 42rpx;
font-weight: 600; font-weight: bold;
color: #303133; color: #303133;
text-align: center; text-align: center;
margin-bottom: 32rpx; margin-bottom: 32rpx;

View File

@ -434,6 +434,11 @@ export default {
overflow: hidden; overflow: hidden;
} }
/* 顶部标题栏字号 */
::v-deep .nav-title .title {
font-size: 36rpx;
}
.inv-space-scroll { .inv-space-scroll {
flex: 1; flex: 1;
min-height: 0; min-height: 0;
@ -483,7 +488,7 @@ export default {
background: #fff8e6; background: #fff8e6;
border: 2rpx solid #ffe1a8; border: 2rpx solid #ffe1a8;
border-radius: 16rpx; border-radius: 16rpx;
font-size: 28rpx; font-size: 30rpx;
color: #b8811a; color: #b8811a;
text-align: center; text-align: center;
} }

View File

@ -587,7 +587,7 @@ export default {
} }
.header__title { .header__title {
font-size: 32rpx; font-size: 36rpx;
font-weight: bold; font-weight: bold;
color: #333; color: #333;
} }
@ -628,6 +628,10 @@ export default {
padding-right: 200rpx; padding-right: 200rpx;
} }
::v-deep .u-search__content__input {
font-size: 34rpx;
}
::v-deep .u-search__content__close { ::v-deep .u-search__content__close {
margin-right: 12rpx; margin-right: 12rpx;
} }
@ -671,7 +675,7 @@ export default {
flex-shrink: 0; flex-shrink: 0;
&__text { &__text {
font-size: 30rpx; font-size: 34rpx;
font-weight: 500; font-weight: 500;
color: #2979ff; color: #2979ff;
line-height: 1; line-height: 1;
@ -708,20 +712,21 @@ export default {
.line__value--space { .line__value--space {
font-size: 50rpx; font-size: 50rpx;
font-weight: 600; font-weight: bold;
color: #ffffff; color: #303133;
} }
/* 库位名称显示 */ /* 库位名称显示 */
.line--space { .line--space {
margin: 12rpx 12rpx 0; margin: 12rpx 12rpx 0;
background: #07c160; background: #ffffff;
border-radius: 16rpx; border-radius: 16rpx;
box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04); box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04);
} }
.line--space .line__label { .line--space .line__label {
color: #ffffff; font-size: 34rpx;
color: #303133;
} }
/* 商品列表 */ /* 商品列表 */
@ -828,19 +833,41 @@ export default {
} }
.line--count__half--left { .line--count__half--left {
background: #f56c6c; background: #fef0f0;
} }
.line--count__half--right { .line--count__half--right {
background: #2979ff; background: #eef4ff;
} }
.line--count__half .line__label, .line--count__half--left .line__label {
.line--count__half .line__value { color: #e74c3c;
color: #ffffff; font-weight: bold;
}
.line--count__half--left .line__value {
color: #e74c3c;
font-weight: bold;
}
.line--count__half--right .line__label {
color: #2979ff;
font-weight: bold;
}
.line--count__half--right .line__value {
color: #2979ff;
font-weight: bold;
text-decoration: underline;
text-decoration-color: rgba(41, 121, 255, 0.45);
}
.line--count__half .line__label {
font-size: 36rpx;
} }
.line--count__half .line__value { .line--count__half .line__value {
font-size: 40rpx;
text-align: right; text-align: right;
} }

View File

@ -1,36 +1,41 @@
<template> <template>
<view class="block-registration-page"> <view class="block-registration-page">
<view class="normar_container"> <view class="normar_container">
<page-nav title="拦截登记"> <!-- 顶部标题栏(参考分拣缺货补货) -->
<template #left> <view class="status-bar"></view>
<view class="page-header">
<view class="back-btn" @click="handleBack">
<u-icon name="arrow-left" size="18" color="#333"></u-icon>
</view>
<text class="header-title">拦截登记</text>
<view class="header-side header-side--right">
<view <view
class="nav-manual-input" class="header-side__btn"
:class="{ 'nav-manual-input--inactive': !showScanInput }" :class="{ 'header-side__btn--active': showScanInput }"
@click="toggleScanInput" @click="toggleScanInput"
> >
<text class="nav-manual-input-text">{{ showScanInput ? '关闭手动输入' : '手动输入' }}</text> <text class="header-side__btn-text">输入框</text>
</view> </view>
</template> <view class="header-btn-reset" @click="handleReset">重置</view>
<template #right> </view>
<view class="nav-reset" @click="handleReset"> </view>
<text class="nav-reset-text">重置</text>
</view>
</template>
</page-nav>
<!-- 扫码输入区 --> <!-- 搜索框(参考分拣缺货补货) -->
<view class="scan-section" v-show="showScanInput"> <view class="search-bar" v-show="showScanInput">
<view class="scan-input-wrap"> <view class="search-bar__input-wrap">
<u-input <u-search
v-model="scanInput" v-model="scanInput"
placeholder="扫描/输入快递单号" placeholder="扫描/输入快递单号"
border="surround" bg-color="#f5f5f5"
:customStyle="{ flex: 1 }" shape="round"
:focus="scanFocused" :show-action="false"
@confirm="handleScanConfirm" @search="handleSearchAction"
></u-input> @clear="handleSearchAction"
<view class="scan-camera-btn" @click="handleCameraScan"> ></u-search>
<u-icon name="camera" size="22" color="#2979ff"></u-icon> <view class="search-bar__actions">
<view class="search-bar__btn" @click="handleSearchAction">
<text class="search-bar__btn__text">搜索</text>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -125,6 +130,11 @@ import voice from '@/core/utils/voice';
} }
}); });
}, },
handleSearchAction() {
const code = String(this.scanInput || '').trim();
if (!code) return;
this.fetchInterceptScan(code);
},
speakVoice(text) { speakVoice(text) {
voice.speak(text, { minInterval: 800 }); voice.speak(text, { minInterval: 800 });
}, },
@ -150,7 +160,10 @@ import voice from '@/core/utils/voice';
uni.showToast({ title: '拦截登记成功', icon: 'success' }); uni.showToast({ title: '拦截登记成功', icon: 'success' });
this.speakVoice('拦截成功'); this.speakVoice('拦截成功');
} else { } else {
uni.showToast({ title: res.msg || '拦截登记失败', icon: 'none' }); const rawMsg = String((res && (res.message || res.msg)) || '').trim();
const failMsg = rawMsg.replace(/^接口错误[::]?\s*/, '').trim();
const title = failMsg.includes('非拦截订单') ? '非拦截订单' : (failMsg || '拦截登记失败');
uni.showToast({ title, icon: 'none' });
this.speakVoice('非拦截订单'); this.speakVoice('非拦截订单');
} }
} catch (e) { } catch (e) {
@ -179,91 +192,163 @@ import voice from '@/core/utils/voice';
<style lang="scss" scoped> <style lang="scss" scoped>
.block-registration-page { .block-registration-page {
height: 100vh;
display: flex;
flex-direction: column;
background: #f5f7fa;
overflow: hidden;
.normar_container { .normar_container {
min-height: 100vh; height: 100%;
background-color: #f5f5f5; display: flex;
flex-direction: column;
overflow: hidden;
background-color: #f5f7fa;
} }
/* ===== 左侧手动输入按钮 ===== */ /* ===== 顶部标题栏(参考分拣缺货补货) ===== */
::v-deep .nav-title .left { .status-bar {
min-width: auto; height: var(--status-bar-height);
gap: 0; background: #ffffff;
} }
::v-deep .nav-title .title { .page-header {
padding-left: 40rpx; position: relative;
height: 88rpx;
padding: 0 24rpx;
display: flex;
align-items: center;
background: #ffffff;
box-sizing: border-box;
flex-shrink: 0;
} }
::v-deep .nav-title .right { .back-btn {
width: auto; flex-shrink: 0;
min-width: 80rpx; width: 56rpx;
} height: 56rpx;
.nav-manual-input {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 210rpx; }
height: 52rpx;
background: #fa8c16; .header-side {
flex-shrink: 0;
display: flex;
align-items: center;
}
.header-side .header-side__btn + .header-btn-reset {
margin-left: 16rpx;
}
.header-side__btn {
display: flex;
align-items: center;
padding: 12rpx 28rpx;
border-radius: 8rpx; border-radius: 8rpx;
background: #2979ff;
}
&--inactive { .header-side__btn--active {
background: #2979ff; background: #fa8c16;
}
.header-side__btn-text {
font-size: 36rpx;
color: #ffffff;
line-height: 1;
}
.header-side--right {
justify-content: flex-end;
}
.header-title {
flex: 1;
font-size: 36rpx;
font-weight: bold;
color: #333;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.header-btn-reset {
padding: 14rpx 28rpx;
background: #2979ff;
color: #ffffff;
font-size: 36rpx;
border-radius: 8rpx;
line-height: 1;
}
/* ===== 搜索框(参考分拣缺货补货) ===== */
.search-bar {
padding: 20rpx;
background: #ffffff;
border-bottom: 1rpx solid #f2f2f2;
flex-shrink: 0;
}
.search-bar__input-wrap {
position: relative;
::v-deep .u-search {
width: 100%;
} }
.nav-manual-input-text { ::v-deep .u-search__content {
font-size: 32rpx; padding-right: 110rpx;
color: #ffffff; }
white-space: nowrap;
::v-deep .u-search__content__input {
font-size: 34rpx;
}
::v-deep .u-search__content__close {
margin-right: 12rpx;
} }
} }
/* ===== 重置按钮 ===== */ .search-bar__actions {
.nav-reset { position: absolute;
padding: 8rpx 0; right: 24rpx;
top: 50%;
.nav-reset-text { transform: translateY(-50%);
font-size: 32rpx; height: 68rpx;
color: #fff; display: flex;
background-color: #2979ff; align-items: center;
padding: 8rpx 24rpx;
border-radius: 8rpx;
white-space: nowrap;
}
} }
/* ===== 扫码输入区 ===== */ .search-bar__btn {
.scan-section { height: 68rpx;
padding: 20rpx 24rpx; padding: 0 8rpx;
background: #fff; display: flex;
margin-bottom: 16rpx; align-items: center;
justify-content: center;
flex-shrink: 0;
.scan-input-wrap { &__text {
display: flex; font-size: 34rpx;
align-items: center; font-weight: 500;
gap: 16rpx; color: #2979ff;
line-height: 1;
}
.scan-camera-btn { &:active {
width: 72rpx; opacity: 0.88;
height: 72rpx;
display: flex;
align-items: center;
justify-content: center;
background: #f0f7ff;
border-radius: 8rpx;
flex-shrink: 0;
}
} }
} }
/* ===== 信息展示列表 ===== */ /* ===== 信息展示列表 ===== */
.info-list { .info-list {
background: #fff; background: #fff;
margin: 0 24rpx 16rpx; margin: 60rpx 24rpx 16rpx;
&--no-scan { &--no-scan {
margin-top: 20rpx; margin-top: 60rpx;
} }
border-radius: 12rpx; border-radius: 12rpx;
overflow: hidden; overflow: hidden;
@ -284,7 +369,7 @@ import voice from '@/core/utils/voice';
} }
.info-label { .info-label {
font-size: 32rpx; font-size: 36rpx;
color: #000; color: #000;
width: 160rpx; width: 160rpx;
flex-shrink: 0; flex-shrink: 0;
@ -292,7 +377,7 @@ import voice from '@/core/utils/voice';
} }
.info-value { .info-value {
font-size: 32rpx; font-size: 40rpx;
color: #000; color: #000;
flex: 1; flex: 1;
text-align: center; text-align: center;