From b95ac35d39be608397e7d314a959f7c39d9eacec Mon Sep 17 00:00:00 2001 From: zm2000 <18386612143@163.com> Date: Mon, 9 Nov 2026 17:59:23 +0800 Subject: [PATCH] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E5=A4=8D=E7=9C=9F=E6=9C=BA?= =?UTF-8?q?=E5=8A=A0=E7=B2=97=E5=A4=B1=E6=95=88=E5=B9=B6=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=20PDA=20=E9=A1=B5=E9=9D=A2=E5=AD=97=E5=8F=B7=E4=B8=8E=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 库存盘点:font-weight 600 统一改为 bold,修复真机无加粗效果 - 库存盘点:移除右上角「...」操作菜单,改为「完成盘点」「空库位」直接按钮 - 库存盘点:顶部标题栏字号统一 36rpx,搜索输入框字号 34rpx,提示字号 28→30rpx - 拦截登记:顶部导航重构为自定义 header(返回/标题/输入框开关/重置) - 拦截登记:搜索框改为 u-search 圆角样式并新增「搜索」按钮 - 拦截登记:信息面板标签 32→36rpx、值 32→40rpx,与搜索框间隔调整为 60rpx - 拦截登记:拦截失败提示优化,区分「非拦截订单」等文案 - 库位查询:标题/搜索/计数半格样式调整,浅色背景深色文字、下划线强调 - 其他:page-nav 右侧宽度改 min-width;首页/个人中心弹窗圆角 24→20rpx;多处标题字号 32→36rpx --- src/components/page-nav/page-nav.vue | 2 +- src/pages/home/edit-quick-actions.vue | 2 +- src/pages/index/index.vue | 2 +- src/pages/replenishment/replenishShorts.vue | 2 +- src/pages/user/index.vue | 2 +- .../CountActionsPopup.vue | 2 +- .../CountDetailPicker.vue | 4 +- .../inventoryCount-comps/CountGoodsCard.vue | 4 +- .../inventoryCount-comps/CountItemCard.vue | 8 +- .../inventoryCount-comps/CountListToolbar.vue | 2 +- .../CountLocationDetail.vue | 10 +- .../CountLocationGrid.vue | 20 +- .../CountRecordAddPopup.vue | 8 +- .../inventoryCount-comps/CountRecordCard.vue | 4 +- .../inventoryCount-comps/CountSearchPanel.vue | 4 + .../CountSpaceEntryPopup.vue | 8 +- .../CountSummaryPanel.vue | 10 +- .../inventoryCount-comps/CountWorkCard.vue | 17 +- src/pages/warehouse/inventoryCount.vue | 5 + src/pages/warehouse/inventoryCountDetail.vue | 147 +++-------- src/pages/warehouse/inventoryCountGoods.vue | 17 +- .../warehouse/inventoryCountLocation.vue | 56 ++-- src/pages/warehouse/inventoryCountSpace.vue | 7 +- src/pages/warehouse/locationInquiry.vue | 49 +++- src/pages/work/order/interceptionLog.vue | 249 ++++++++++++------ 25 files changed, 358 insertions(+), 283 deletions(-) diff --git a/src/components/page-nav/page-nav.vue b/src/components/page-nav/page-nav.vue index 6ce2119..6714df2 100644 --- a/src/components/page-nav/page-nav.vue +++ b/src/components/page-nav/page-nav.vue @@ -154,7 +154,7 @@ } .right { - width: 80rpx; + min-width: 80rpx; display: flex; align-items: center; justify-content: flex-end; diff --git a/src/pages/home/edit-quick-actions.vue b/src/pages/home/edit-quick-actions.vue index 35b43db..a1bb0d2 100644 --- a/src/pages/home/edit-quick-actions.vue +++ b/src/pages/home/edit-quick-actions.vue @@ -475,7 +475,7 @@ } .header-title { - font-size: 32rpx; + font-size: 36rpx; font-weight: bold; color: #333; } diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 21f5f96..2b9cd3c 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -2381,7 +2381,7 @@ width: 100%; max-width: 620rpx; background: #fff; - border-radius: 24rpx; + border-radius: 20rpx; padding: 40rpx 36rpx 36rpx; box-sizing: border-box; box-shadow: 0 24rpx 80rpx rgba(0, 0, 0, 0.18); diff --git a/src/pages/replenishment/replenishShorts.vue b/src/pages/replenishment/replenishShorts.vue index 84fa039..a6782bf 100644 --- a/src/pages/replenishment/replenishShorts.vue +++ b/src/pages/replenishment/replenishShorts.vue @@ -596,7 +596,7 @@ .header-title { flex: 1; - font-size: 32rpx; + font-size: 36rpx; font-weight: bold; color: #333; text-align: center; diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue index 8e06519..3b8d4fb 100644 --- a/src/pages/user/index.vue +++ b/src/pages/user/index.vue @@ -584,7 +584,7 @@ width: 100%; max-width: 620rpx; background: #fff; - border-radius: 24rpx; + border-radius: 20rpx; padding: 40rpx 36rpx 36rpx; box-sizing: border-box; box-shadow: 0 24rpx 80rpx rgba(0, 0, 0, 0.18); diff --git a/src/pages/warehouse/inventoryCount-comps/CountActionsPopup.vue b/src/pages/warehouse/inventoryCount-comps/CountActionsPopup.vue index 6093659..2ee8935 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountActionsPopup.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountActionsPopup.vue @@ -86,7 +86,7 @@ export default { .actions-popup-title { font-size: 38rpx; - font-weight: 600; + font-weight: bold; color: #303133; text-align: center; margin-bottom: 36rpx; diff --git a/src/pages/warehouse/inventoryCount-comps/CountDetailPicker.vue b/src/pages/warehouse/inventoryCount-comps/CountDetailPicker.vue index 4f5bd8c..e49bf88 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountDetailPicker.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountDetailPicker.vue @@ -195,7 +195,7 @@ export default { .picker__title { font-size: 36rpx; - font-weight: 600; + font-weight: bold; color: #303133; } @@ -303,7 +303,7 @@ export default { .picker__footer-btn-text { font-size: 34rpx; - font-weight: 600; + font-weight: bold; color: #ffffff; } diff --git a/src/pages/warehouse/inventoryCount-comps/CountGoodsCard.vue b/src/pages/warehouse/inventoryCount-comps/CountGoodsCard.vue index 5b460aa..40e486f 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountGoodsCard.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountGoodsCard.vue @@ -136,7 +136,7 @@ export default { flex: 1; min-width: 0; font-size: 38rpx; - font-weight: 600; + font-weight: bold; color: #303133; line-height: 1.3; overflow: hidden; @@ -194,7 +194,7 @@ export default { .goods-card__diff { margin-right: 20rpx; font-size: 34rpx; - font-weight: 600; + font-weight: bold; } .goods-card__diff--gain { diff --git a/src/pages/warehouse/inventoryCount-comps/CountItemCard.vue b/src/pages/warehouse/inventoryCount-comps/CountItemCard.vue index da29552..764e5c9 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountItemCard.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountItemCard.vue @@ -107,7 +107,7 @@ export default { .count-card__name { font-size: 38rpx; - font-weight: 600; + font-weight: bold; color: #303133; line-height: 1.4; word-break: break-all; @@ -167,7 +167,7 @@ export default { .count-card__value { margin-top: 8rpx; font-size: 40rpx; - font-weight: 600; + font-weight: bold; color: #303133; line-height: 1.3; } @@ -197,7 +197,7 @@ export default { flex: 1; min-width: 0; font-size: 36rpx; - font-weight: 600; + font-weight: bold; color: #303133; } @@ -254,6 +254,6 @@ export default { .count-card__diff-text { font-size: 28rpx; - font-weight: 600; + font-weight: bold; } diff --git a/src/pages/warehouse/inventoryCount-comps/CountListToolbar.vue b/src/pages/warehouse/inventoryCount-comps/CountListToolbar.vue index 9bc5960..c560110 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountListToolbar.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountListToolbar.vue @@ -218,6 +218,6 @@ export default { .filter-group__item--active .filter-group__item-text { color: #ffffff; - font-weight: 600; + font-weight: bold; } diff --git a/src/pages/warehouse/inventoryCount-comps/CountLocationDetail.vue b/src/pages/warehouse/inventoryCount-comps/CountLocationDetail.vue index 3d0fe72..909c7de 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountLocationDetail.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountLocationDetail.vue @@ -192,7 +192,7 @@ export default { .loc-detail__title { font-size: 40rpx; - font-weight: 600; + font-weight: bold; color: #303133; line-height: 1.3; word-break: break-all; @@ -275,7 +275,7 @@ export default { .loc-detail__section-title { font-size: 34rpx; - font-weight: 600; + font-weight: bold; color: #303133; } @@ -420,19 +420,19 @@ export default { /* 该库位账面有货:加粗深色,方便一眼找到账面库位 */ .loc-detail__row-amount--stock { - font-weight: 600; + font-weight: bold; color: #303133; } .loc-detail__row-diff { font-size: 36rpx; - font-weight: 600; + font-weight: bold; } /* 另一种账面口径提示(静态看当前库存 / 普通看基准快照) */ .loc-detail__row-hint { margin-right: 20rpx; - font-size: 26rpx; + font-size: 30rpx; color: #b8811a; } diff --git a/src/pages/warehouse/inventoryCount-comps/CountLocationGrid.vue b/src/pages/warehouse/inventoryCount-comps/CountLocationGrid.vue index de1d067..0b860ef 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountLocationGrid.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountLocationGrid.vue @@ -119,13 +119,13 @@ export default { } .loc-grid__head-title { - font-size: 26rpx; - font-weight: 600; + font-size: 32rpx; + font-weight: bold; color: #303133; } .loc-grid__head-hint { - font-size: 24rpx; + font-size: 30rpx; color: #c0c4cc; } @@ -169,11 +169,9 @@ export default { justify-content: center; } -/* 库位名独占一行(超长省略) */ +/* 库位名独占一行(超长换行完整显示) */ .loc-grid__code--stack { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + word-break: break-all; } /* 商品数 + 状态同一行(商品数居左、状态/未盘居右) */ @@ -187,7 +185,7 @@ export default { /* 已盘/未盘进度独占一行(居左) */ .loc-grid__progress { margin-top: 6rpx; - font-size: 28rpx; + font-size: 30rpx; line-height: 1; text-align: left; color: #606266; @@ -217,14 +215,14 @@ export default { .loc-grid__code { font-size: 36rpx; - font-weight: 600; + font-weight: bold; color: #303133; line-height: 1.2; word-break: break-all; } .loc-grid__sub { - font-size: 28rpx; + font-size: 30rpx; line-height: 1.1; color: #606266; } @@ -244,7 +242,7 @@ export default { } .loc-grid__count { - font-size: 28rpx; + font-size: 30rpx; line-height: 1; color: #909399; } diff --git a/src/pages/warehouse/inventoryCount-comps/CountRecordAddPopup.vue b/src/pages/warehouse/inventoryCount-comps/CountRecordAddPopup.vue index ae461fc..a2cba58 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountRecordAddPopup.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountRecordAddPopup.vue @@ -378,7 +378,7 @@ export default { .record-add__title { flex-shrink: 0; font-size: 38rpx; - font-weight: 600; + font-weight: bold; color: #303133; } @@ -402,6 +402,10 @@ export default { ::v-deep .u-search__content { padding-right: 140rpx; } + + ::v-deep .u-search__content__input { + font-size: 34rpx; + } } .record-add__search-actions { @@ -611,7 +615,7 @@ export default { } .record-add__qty .record-add__label { - font-size: 42rpx; + font-size: 40rpx; width: auto; margin-right: 20rpx; } diff --git a/src/pages/warehouse/inventoryCount-comps/CountRecordCard.vue b/src/pages/warehouse/inventoryCount-comps/CountRecordCard.vue index 78fa70b..c3aec5b 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountRecordCard.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountRecordCard.vue @@ -66,7 +66,7 @@ export default { flex: 1; min-width: 0; font-size: 36rpx; - font-weight: 600; + font-weight: bold; color: #303133; line-height: 1.4; /* 超长自动换行显示多行 */ @@ -165,7 +165,7 @@ export default { .record-card__status { font-size: 36rpx; - font-weight: 600; + font-weight: bold; color: #2979ff; line-height: 1.6; } diff --git a/src/pages/warehouse/inventoryCount-comps/CountSearchPanel.vue b/src/pages/warehouse/inventoryCount-comps/CountSearchPanel.vue index 7ebd9c5..e770fb8 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountSearchPanel.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountSearchPanel.vue @@ -63,6 +63,10 @@ export default { ::v-deep .u-search__content { padding-right: 200rpx; } + + ::v-deep .u-search__content__input { + font-size: 34rpx; + } } .search-actions { diff --git a/src/pages/warehouse/inventoryCount-comps/CountSpaceEntryPopup.vue b/src/pages/warehouse/inventoryCount-comps/CountSpaceEntryPopup.vue index 96eacfe..e8f3216 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountSpaceEntryPopup.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountSpaceEntryPopup.vue @@ -319,7 +319,7 @@ export default { .space-entry__title { flex-shrink: 0; font-size: 38rpx; - font-weight: 600; + font-weight: bold; color: #303133; } @@ -343,6 +343,10 @@ export default { ::v-deep .u-search__content { padding-right: 140rpx; } + + ::v-deep .u-search__content__input { + font-size: 34rpx; + } } .space-entry__search-actions { @@ -429,7 +433,7 @@ export default { .space-item__subtitle { margin-top: 4rpx; - font-size: 26rpx; + font-size: 30rpx; color: #909399; } diff --git a/src/pages/warehouse/inventoryCount-comps/CountSummaryPanel.vue b/src/pages/warehouse/inventoryCount-comps/CountSummaryPanel.vue index e6cd957..d17fd71 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountSummaryPanel.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountSummaryPanel.vue @@ -117,7 +117,7 @@ export default { .summary-panel__group { margin: 24rpx 0 6rpx; font-size: 32rpx; - font-weight: 600; + font-weight: bold; color: #2979ff; &:first-child { @@ -153,22 +153,22 @@ export default { } .summary-panel__value--strong { - font-weight: 600; + font-weight: bold; color: #2979ff; } .summary-panel__value--success { - font-weight: 600; + font-weight: bold; color: #18a058; } .summary-panel__value--warning { - font-weight: 600; + font-weight: bold; color: #ff9800; } .summary-panel__value--danger { - font-weight: 600; + font-weight: bold; color: #e64340; } diff --git a/src/pages/warehouse/inventoryCount-comps/CountWorkCard.vue b/src/pages/warehouse/inventoryCount-comps/CountWorkCard.vue index e8511be..e95f133 100644 --- a/src/pages/warehouse/inventoryCount-comps/CountWorkCard.vue +++ b/src/pages/warehouse/inventoryCount-comps/CountWorkCard.vue @@ -163,7 +163,7 @@ export default { border: 2rpx solid #ebedf2; border-radius: 20rpx; padding: 20rpx 28rpx; - margin-bottom: 20rpx; + margin: 0 12rpx 20rpx; box-shadow: 0 6rpx 20rpx rgba(31, 45, 61, 0.06); transition: border-color 0.3s ease, background-color 0.3s ease; } @@ -189,7 +189,7 @@ export default { .work-card__title { font-size: 38rpx; - font-weight: 600; + font-weight: bold; color: #303133; line-height: 1.4; word-break: break-all; @@ -261,14 +261,14 @@ export default { } .work-card__label { - font-size: 28rpx; + font-size: 30rpx; color: #8a9099; } .work-card__value { margin-top: 8rpx; font-size: 40rpx; - font-weight: 600; + font-weight: bold; color: #303133; line-height: 1.3; } @@ -278,7 +278,7 @@ export default { padding: 6rpx 14rpx; border-radius: 8rpx; font-size: 26rpx; - font-weight: 600; + font-weight: bold; } .work-card__diff--gain { @@ -300,7 +300,7 @@ export default { .work-card__book-hint { width: 100%; margin-top: 6rpx; - font-size: 26rpx; + font-size: 30rpx; color: #b8811a; } @@ -345,7 +345,7 @@ export default { flex: 1; min-width: 0; font-size: 36rpx; - font-weight: 600; + font-weight: bold; color: #303133; } @@ -421,12 +421,13 @@ export default { .work-child__hint { margin-top: 4rpx; margin-left: 16rpx; - font-size: 26rpx; + font-size: 30rpx; color: #b8811a; } /* 拣货未完成提示:红色(与账面口径提示区分) */ .work-child__hint--picking { + font-size: 30rpx; color: #e64340; } diff --git a/src/pages/warehouse/inventoryCount.vue b/src/pages/warehouse/inventoryCount.vue index 5892afd..9f6ca31 100644 --- a/src/pages/warehouse/inventoryCount.vue +++ b/src/pages/warehouse/inventoryCount.vue @@ -260,6 +260,11 @@ export default { overflow: hidden; } +/* 顶部标题栏字号 */ +::v-deep .nav-title .title { + font-size: 36rpx; +} + /* 列表区 */ .detail-scroll { flex: 1; diff --git a/src/pages/warehouse/inventoryCountDetail.vue b/src/pages/warehouse/inventoryCountDetail.vue index 63404f9..0674a93 100644 --- a/src/pages/warehouse/inventoryCountDetail.vue +++ b/src/pages/warehouse/inventoryCountDetail.vue @@ -4,12 +4,12 @@ @@ -129,26 +129,13 @@ @confirm="handleRecordAddConfirm" /> - - - @@ -175,7 +162,7 @@ mode="center" :closeable="true" :closeOnClickOverlay="false" - border-radius="20" + round="20" @close="cancelMarkEmpty" > @@ -202,7 +189,7 @@ mode="center" :closeable="true" :closeOnClickOverlay="false" - border-radius="20" + round="20" @close="cancelAllLocations" > @@ -232,7 +219,6 @@ import CountGoodsCard from './inventoryCount-comps/CountGoodsCard.vue'; import CountLocationGrid from './inventoryCount-comps/CountLocationGrid.vue'; import CountDetailPicker from './inventoryCount-comps/CountDetailPicker.vue'; import CountRecordAddPopup from './inventoryCount-comps/CountRecordAddPopup.vue'; -import CountActionsPopup from './inventoryCount-comps/CountActionsPopup.vue'; import { normalizeScanResult, extractObjectPayload, @@ -255,8 +241,7 @@ export default { CountGoodsCard, CountLocationGrid, CountDetailPicker, - CountRecordAddPopup, - CountActionsPopup + CountRecordAddPopup }, data() { return { @@ -271,7 +256,6 @@ export default { loading: false, refreshing: false, submitting: false, - showActionsPopup: false, showFinishConfirm: false, showMarkEmptyConfirm: false, markEmptyTarget: null, @@ -302,17 +286,6 @@ export default { canFinish() { 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() { const row = this.markEmptyTarget; @@ -376,7 +349,7 @@ export default { }, // 切换按钮文案 = 点击后会切到的模式(明确指引,不歧义) workModeText() { - return this.workMode === 'goods' ? '切换为:库位模式' : '切换为:商品模式'; + return this.workMode === 'goods' ? '库位模式' : '商品模式'; }, // Tab 列表(参考收货) tabs() { @@ -930,10 +903,6 @@ export default { this.loading = false; } }, - openActionsPopup() { - if (!this.hasActions || this.submitting) return; - this.showActionsPopup = true; - }, /** 语音播报(复用全局 $tools.speakText,受 voice.enabled 开关控制) */ speakMessage(message, options = {}) { const text = String(message || '').trim(); @@ -950,8 +919,7 @@ export default { } }, handleFinish() { - this.showActionsPopup = false; - if (this.submitting || !this.taskId) return; + if (this.submitting || !this.taskId || !this.canFinish) return; this.showFinishConfirm = true; }, cancelFinish() { @@ -993,51 +961,6 @@ export default { 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; - } - } } } @@ -1055,6 +978,11 @@ export default { overflow: hidden; } +/* 顶部标题栏字号 */ +::v-deep .nav-title .title { + font-size: 36rpx; +} + /* Tab 切换(参考收货);右侧为商品任务的作业视图切换 */ .tabs-container { flex-shrink: 0; @@ -1079,11 +1007,11 @@ export default { display: flex; align-items: center; justify-content: center; - height: 56rpx; - margin: 0 20rpx; - padding: 0 20rpx; + height: 52rpx; + margin: 0 16rpx; + padding: 0 18rpx; box-sizing: border-box; - border-radius: 999rpx; + border-radius: 8rpx; background: #eef4ff; border: 1rpx solid #cfe1ff; @@ -1093,7 +1021,7 @@ export default { } .tabs-container__switch-text { - font-size: 30rpx; + font-size: 34rpx; line-height: 1; color: #2979ff; white-space: nowrap; @@ -1149,13 +1077,13 @@ export default { } .goods-list__head-title { - font-size: 26rpx; - font-weight: 600; + font-size: 32rpx; + font-weight: bold; color: #303133; } .goods-list__head-hint { - font-size: 24rpx; + font-size: 30rpx; color: #c0c4cc; } @@ -1201,7 +1129,7 @@ export default { .detail-footer__btn-text { font-size: 36rpx; - font-weight: 600; + font-weight: bold; color: #ffffff; } @@ -1210,16 +1138,27 @@ export default { height: 20rpx; } -/* 右上角「...」菜单入口 */ -.nav-more-btn { - width: 64rpx; +/* 右上角「完成盘点」按钮入口 */ +.nav-finish-btn { height: 64rpx; + padding: 0 20rpx; display: flex; align-items: 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; pointer-events: none; } @@ -1235,7 +1174,7 @@ export default { .finish-confirm-popup__title { font-size: 42rpx; - font-weight: 600; + font-weight: bold; color: #303133; text-align: center; margin-bottom: 32rpx; @@ -1301,7 +1240,7 @@ export default { .mark-empty-confirm-popup__title { font-size: 42rpx; - font-weight: 600; + font-weight: bold; color: #303133; text-align: center; margin-bottom: 32rpx; @@ -1367,7 +1306,7 @@ export default { .all-locations-confirm-popup__title { font-size: 42rpx; - font-weight: 600; + font-weight: bold; color: #303133; text-align: center; margin-bottom: 32rpx; diff --git a/src/pages/warehouse/inventoryCountGoods.vue b/src/pages/warehouse/inventoryCountGoods.vue index 03d2681..1a8e231 100644 --- a/src/pages/warehouse/inventoryCountGoods.vue +++ b/src/pages/warehouse/inventoryCountGoods.vue @@ -98,7 +98,7 @@ mode="center" :closeable="true" :closeOnClickOverlay="false" - border-radius="20" + round="20" @close="cancelDeleteRecord" > @@ -715,6 +715,11 @@ export default { overflow: hidden; } +/* 顶部标题栏字号 */ +::v-deep .nav-title .title { + font-size: 36rpx; +} + /* 数量录入条(紧接 CountSearchPanel,同一白底 + 分隔线视觉) */ .inv-goods-scroll { flex: 1; @@ -773,7 +778,7 @@ export default { flex: 1; min-width: 0; font-size: 38rpx; - font-weight: 600; + font-weight: bold; color: #303133; line-height: 1.3; overflow: hidden; @@ -825,7 +830,7 @@ export default { .inv-goods-card__diff { margin-right: 20rpx; font-size: 34rpx; - font-weight: 600; + font-weight: bold; } .inv-goods-card__diff--gain { @@ -839,7 +844,7 @@ export default { /* 另一种账面口径提示(静态看当前库存 / 普通看基准快照) */ .inv-goods-card__hint { margin-right: 20rpx; - font-size: 28rpx; + font-size: 30rpx; color: #b8811a; } @@ -849,7 +854,7 @@ export default { background: #fff8e6; border: 2rpx solid #ffe1a8; border-radius: 16rpx; - font-size: 28rpx; + font-size: 30rpx; color: #b8811a; text-align: center; } @@ -869,7 +874,7 @@ export default { .delete-confirm-popup__title { font-size: 42rpx; - font-weight: 600; + font-weight: bold; color: #303133; text-align: center; margin-bottom: 32rpx; diff --git a/src/pages/warehouse/inventoryCountLocation.vue b/src/pages/warehouse/inventoryCountLocation.vue index c2ef6e9..3017f2b 100644 --- a/src/pages/warehouse/inventoryCountLocation.vue +++ b/src/pages/warehouse/inventoryCountLocation.vue @@ -3,8 +3,8 @@ @@ -56,16 +56,6 @@ - - - @@ -112,7 +102,7 @@ mode="center" :closeable="true" :closeOnClickOverlay="false" - border-radius="20" + round="20" @close="cancelDeleteRecord" > @@ -139,7 +129,6 @@ import CountSearchPanel from './inventoryCount-comps/CountSearchPanel.vue'; import CountLocationDetail from './inventoryCount-comps/CountLocationDetail.vue'; import CountRecordAddPopup from './inventoryCount-comps/CountRecordAddPopup.vue'; -import CountActionsPopup from './inventoryCount-comps/CountActionsPopup.vue'; import { normalizeScanResult, extractObjectPayload, @@ -159,8 +148,7 @@ export default { components: { CountSearchPanel, CountLocationDetail, - CountRecordAddPopup, - CountActionsPopup + CountRecordAddPopup }, data() { return { @@ -174,7 +162,6 @@ export default { refreshing: false, scanKeyword: '', showRecordAdd: false, - showActionsPopup: false, showMarkEmptyConfirm: false, showDeleteRecordConfirm: false, deleteRecordTarget: null, @@ -307,11 +294,6 @@ export default { this.showRecordAdd = false; this.pendingBarcode = ''; }, - // 右上角菜单:标记空库位(先关菜单再确认) - handleMenuMarkEmpty() { - this.showActionsPopup = false; - this.handleMarkEmpty(); - }, handleMarkEmpty() { if (!this.detailId) { uni.showToast({ title: '缺少盘点明细ID', icon: 'none' }); @@ -547,6 +529,11 @@ export default { overflow: hidden; } +/* 顶部标题栏字号 */ +::v-deep .nav-title .title { + font-size: 36rpx; +} + .inv-loc-scroll { flex: 1; min-height: 0; @@ -605,16 +592,27 @@ export default { height: 20rpx; } -/* 右上角「...」菜单入口 */ -.nav-more-btn { - width: 64rpx; +/* 右上角「空库位」按钮(参考完成盘点按钮样式,红色背景) */ +.nav-mark-empty-btn { height: 64rpx; + padding: 0 20rpx; display: flex; align-items: 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; pointer-events: none; } @@ -630,7 +628,7 @@ export default { .mark-empty-confirm-popup__title { font-size: 42rpx; - font-weight: 600; + font-weight: bold; color: #303133; text-align: center; margin-bottom: 32rpx; @@ -696,7 +694,7 @@ export default { .delete-confirm-popup__title { font-size: 42rpx; - font-weight: 600; + font-weight: bold; color: #303133; text-align: center; margin-bottom: 32rpx; diff --git a/src/pages/warehouse/inventoryCountSpace.vue b/src/pages/warehouse/inventoryCountSpace.vue index f017bd9..0937f1c 100644 --- a/src/pages/warehouse/inventoryCountSpace.vue +++ b/src/pages/warehouse/inventoryCountSpace.vue @@ -434,6 +434,11 @@ export default { overflow: hidden; } +/* 顶部标题栏字号 */ +::v-deep .nav-title .title { + font-size: 36rpx; +} + .inv-space-scroll { flex: 1; min-height: 0; @@ -483,7 +488,7 @@ export default { background: #fff8e6; border: 2rpx solid #ffe1a8; border-radius: 16rpx; - font-size: 28rpx; + font-size: 30rpx; color: #b8811a; text-align: center; } diff --git a/src/pages/warehouse/locationInquiry.vue b/src/pages/warehouse/locationInquiry.vue index 4ed36a9..7dbfec3 100644 --- a/src/pages/warehouse/locationInquiry.vue +++ b/src/pages/warehouse/locationInquiry.vue @@ -587,7 +587,7 @@ export default { } .header__title { - font-size: 32rpx; + font-size: 36rpx; font-weight: bold; color: #333; } @@ -628,6 +628,10 @@ export default { padding-right: 200rpx; } + ::v-deep .u-search__content__input { + font-size: 34rpx; + } + ::v-deep .u-search__content__close { margin-right: 12rpx; } @@ -671,7 +675,7 @@ export default { flex-shrink: 0; &__text { - font-size: 30rpx; + font-size: 34rpx; font-weight: 500; color: #2979ff; line-height: 1; @@ -708,20 +712,21 @@ export default { .line__value--space { font-size: 50rpx; - font-weight: 600; - color: #ffffff; + font-weight: bold; + color: #303133; } /* 库位名称显示 */ .line--space { margin: 12rpx 12rpx 0; - background: #07c160; + background: #ffffff; border-radius: 16rpx; box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04); } .line--space .line__label { - color: #ffffff; + font-size: 34rpx; + color: #303133; } /* 商品列表 */ @@ -828,19 +833,41 @@ export default { } .line--count__half--left { - background: #f56c6c; + background: #fef0f0; } .line--count__half--right { - background: #2979ff; + background: #eef4ff; } -.line--count__half .line__label, -.line--count__half .line__value { - color: #ffffff; +.line--count__half--left .line__label { + color: #e74c3c; + 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 { + font-size: 40rpx; text-align: right; } diff --git a/src/pages/work/order/interceptionLog.vue b/src/pages/work/order/interceptionLog.vue index 29b7cac..a475d8a 100644 --- a/src/pages/work/order/interceptionLog.vue +++ b/src/pages/work/order/interceptionLog.vue @@ -1,36 +1,41 @@