diff --git a/pages/home/edit-quick-actions.vue b/pages/home/edit-quick-actions.vue index a73af3d..6b8c8df 100644 --- a/pages/home/edit-quick-actions.vue +++ b/pages/home/edit-quick-actions.vue @@ -411,7 +411,7 @@ } .header-title { - font-size: 32rpx; + font-size: 36rpx; font-weight: 600; color: #333; } @@ -423,13 +423,13 @@ display: flex; align-items: center; justify-content: center; - font-size: 24rpx; + font-size: 32rpx; color: #2979ff; padding: 0 8rpx; .edit-common-text { margin-left: 6rpx; - font-size: 24rpx; + font-size: 32rpx; line-height: 1; } @@ -447,19 +447,19 @@ } .left-nav { - width: 132rpx; + width: 160rpx; background: #fff; border-right: 1rpx solid #f0f0f0; padding: 12rpx 8rpx; .nav-item { position: relative; - min-height: 56rpx; + min-height: 60rpx; display: flex; align-items: center; justify-content: center; margin-bottom: 10rpx; - font-size: 22rpx; + font-size: 30rpx; color: #666; background: #f4f5f7; border-radius: 10rpx; @@ -487,8 +487,8 @@ } .parent-nav-item { - font-size: 20rpx; - line-height: 1.3; + font-size: 28rpx; + line-height: 1.4; word-break: break-all; } } @@ -513,11 +513,11 @@ .initial-item { position: relative; - min-width: 26rpx; - height: 26rpx; - line-height: 26rpx; + min-width: 32rpx; + height: 32rpx; + line-height: 32rpx; text-align: center; - font-size: 16rpx; + font-size: 20rpx; color: #666; border-radius: 6rpx; @@ -555,12 +555,12 @@ flex: 1; height: 72rpx; padding-left: 12rpx; - font-size: 26rpx; + font-size: 30rpx; color: #333; } .search-placeholder { - font-size: 26rpx; + font-size: 30rpx; color: #999; } } @@ -570,7 +570,7 @@ .group-section { .group-title { - font-size: 26rpx; + font-size: 30rpx; font-weight: 600; color: #666; padding: 18rpx 4rpx 10rpx; @@ -618,11 +618,11 @@ } .item-name { - font-size: 22rpx; + font-size: 28rpx; color: #333; text-align: left; padding: 0; - line-height: 1.3; + line-height: 1.4; flex: 1; word-break: break-all; } diff --git a/pages/index/index.vue b/pages/index/index.vue index 7afe3ca..25247ba 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -495,8 +495,8 @@ // 4. 如果没有有效的固定菜单,检查用户菜单 if (userMenus && userMenus.length > 0) { console.log('从用户菜单生成快捷入口:', userMenus); - // 首次登录默认带出前12个菜单,并将收货作业、商品查询前置 - const defaultQuickActions = this.prioritizeDefaultQuickActions(latestActions, 12); + // 首次登录默认带出全部菜单,并将商品查询前置 + const defaultQuickActions = this.prioritizeDefaultQuickActions(latestActions); this.quickActions = defaultQuickActions.map(item => this.normalizeAction(item)).filter(Boolean); await this.saveQuickActionsOrder(); } else { @@ -515,49 +515,74 @@ } }, - prioritizeDefaultQuickActions(actions, limit = 12) { + prioritizeDefaultQuickActions(actions) { const source = Array.isArray(actions) ? actions.filter(Boolean) : []; if (!source.length) { return []; } - // 默认显示的菜单列表(按顺序匹配) - const defaultMenuNames = [ - '收货作业', - '商品查询', - '订单拣货', - '散单波次策略', - '团购波次策略', - '散单拣货详情', - '团购拣货详情', - '订单复核', - '随机入库', - '移库作业' - ]; + // 用户权限菜单超过12个时,按固定优先级取前12个 + if (source.length > 12) { + const defaultMenuNames = [ + '收货作业', + '商品查询', + '订单拣货', + '散单波次策略', + '团购波次策略', + '散单拣货详情', + '团购拣货详情', + '订单复核', + '随机入库', + '移库作业' + ]; + const selectedKeys = new Set(); + const prioritized = []; + + defaultMenuNames.forEach((targetName) => { + const matched = source.find((item) => { + const menuName = this.sanitizeText(item?.name || item?.meta?.title); + const key = this.getMenuKey(item); + return key && !selectedKeys.has(key) && menuName === targetName; + }); + + if (matched) { + const key = this.getMenuKey(matched); + selectedKeys.add(key); + prioritized.push(matched); + } + }); + + const remaining = source.filter((item) => { + const key = this.getMenuKey(item); + return key && !selectedKeys.has(key); + }); + + return [...prioritized, ...remaining].slice(0, 12); + } + + // 低于12个时,商品查询置顶,其余全部显示 const selectedKeys = new Set(); const prioritized = []; - defaultMenuNames.forEach((targetName) => { - const matched = source.find((item) => { - const menuName = this.sanitizeText(item?.name || item?.meta?.title); - const key = this.getMenuKey(item); - return key && !selectedKeys.has(key) && menuName === targetName; - }); - - if (matched) { - const key = this.getMenuKey(matched); - selectedKeys.add(key); - prioritized.push(matched); - } + const goodsQuery = source.find((item) => { + const menuName = this.sanitizeText(item?.name || item?.meta?.title); + const key = this.getMenuKey(item); + return key && menuName === '商品查询'; }); + if (goodsQuery) { + const key = this.getMenuKey(goodsQuery); + selectedKeys.add(key); + prioritized.push(goodsQuery); + } + const remaining = source.filter((item) => { const key = this.getMenuKey(item); return key && !selectedKeys.has(key); }); - return [...prioritized, ...remaining].slice(0, limit); + return [...prioritized, ...remaining]; }, // 辅助方法:验证和过滤菜单权限 @@ -1378,7 +1403,7 @@ align-items: center; .edit-btn { - font-size: 24rpx; + font-size: 34rpx; color: #2979ff; padding: 6rpx 12rpx; border-radius: 6rpx; @@ -1523,7 +1548,7 @@ .item-icon-font { font-family: 'uicon-iconfont' !important; - font-size: 52rpx; + font-size: 58rpx; line-height: 1; font-style: normal; font-weight: normal; @@ -1550,12 +1575,12 @@ } .item-name { - font-size: 30rpx; + font-size: 34rpx; font-weight: bold; color: #333; text-align: center; - line-height: 1.3; - padding: 0 5rpx; + line-height: 1.4; + padding: 0 6rpx; } .item-badge { @@ -1627,7 +1652,7 @@ .item-icon-font { font-family: 'uicon-iconfont' !important; - font-size: 52rpx; + font-size: 58rpx; line-height: 1; font-style: normal; font-weight: normal; @@ -1636,11 +1661,11 @@ } .item-name { - font-size: 26rpx; + font-size: 34rpx; font-weight: bold; color: #333; text-align: center; - line-height: 1.3; + line-height: 1.4; padding: 0 6rpx; } } diff --git a/pages/work/order/order-review-comps/ReviewDetail.vue b/pages/work/order/order-review-comps/ReviewDetail.vue index 70930b6..065d1cb 100644 --- a/pages/work/order/order-review-comps/ReviewDetail.vue +++ b/pages/work/order/order-review-comps/ReviewDetail.vue @@ -143,6 +143,41 @@ {{ viewMode === 'grid' ? '列表' : '宫格' }} + + + + + 库内有相同商品 + + + + + + + + + {{ multiMatchFirst.skuName || '--' }} + 条码:{{ multiMatchFirst.barcode || '--' }} + 规格:{{ multiMatchFirst.location || '--' }} + 计划 {{ multiMatchFirst.planQty || 0 }} / 已扫 {{ multiMatchFirst.scannedQty || 0 }} + + + + + 关闭 + + + @@ -212,7 +247,10 @@ import voice from '@/core/utils/voice'; currentGoodsIndex: 0, matchedGoodsId: '', matchedGoodsState: {}, - viewMode: savedMode + viewMode: savedMode, + showMultiMatchPopup: false, + multiMatchFirst: {}, + pendingScanCode: '' }; }, computed: { @@ -312,16 +350,37 @@ import voice from '@/core/utils/voice'; const code = this.normalizeBarcode(scanCode); if (!code) return false; - const matchIndex = this.goodsList.findIndex(item => { + // 多商品匹配弹窗已打开且扫描相同条码时,跳过避免重复提示 + if (this.showMultiMatchPopup && this.pendingScanCode === code) { + return true; + } + + // 查找所有匹配的商品 + const matchIndices = []; + this.goodsList.forEach((item, idx) => { const candidates = this.extractBarcodeCandidates(item); - return candidates.includes(code); + if (candidates.includes(code)) { + matchIndices.push(idx); + } }); - if (matchIndex < 0) { + if (matchIndices.length === 0) { voice.speak('无记录'); return false; } + // 多个商品匹配时,弹出底部抽屉显示第一个商品详情 + if (matchIndices.length > 1) { + const firstIdx = matchIndices[0]; + this.multiMatchFirst = { ...this.goodsList[firstIdx] }; + this.pendingScanCode = code; + this.showMultiMatchPopup = true; + voice.speak('库内有相同商品'); + return true; + } + + // 仅一个商品匹配,直接处理 + const matchIndex = matchIndices[0]; this.currentGoodsIndex = matchIndex; const matchedItem = this.goodsList[matchIndex]; const maxQty = matchedItem?.planQty || 0; @@ -455,6 +514,68 @@ import voice from '@/core/utils/voice'; this.matchedGoodsState = {}; this.matchedGoodsId = ''; this.currentGoodsIndex = 0; + this.showMultiMatchPopup = false; + this.multiMatchFirst = {}; + this.pendingScanCode = ''; + }, + /** + * 多商品匹配时,选择第一个商品进行处理 + */ + handleMultiMatchSelect(index) { + this.showMultiMatchPopup = false; + const code = this.pendingScanCode; + this.pendingScanCode = ''; + if (!code) return; + + // 重新查找匹配项,定位到第一个匹配商品并处理 + const matchIndices = []; + this.goodsList.forEach((item, idx) => { + const candidates = this.extractBarcodeCandidates(item); + if (candidates.includes(code)) { + matchIndices.push(idx); + } + }); + + const targetIdx = matchIndices[index] ?? matchIndices[0]; + if (targetIdx === undefined) return; + + this.currentGoodsIndex = targetIdx; + const matchedItem = this.goodsList[targetIdx]; + const maxQty = matchedItem?.planQty || 0; + const currentScanned = matchedItem?.scannedQty || 0; + + if (currentScanned >= maxQty) { + uni.showToast({ title: '该商品已复核完成', icon: 'none' }); + return; + } + + const addQty = Math.min(this.scanQty || 1, maxQty - currentScanned); + const newScanned = Math.min(currentScanned + addQty, maxQty); + + this.$emit('updateScannedQty', targetIdx, newScanned); + const allDone = this.goodsList.every((item, idx) => { + const qty = idx === targetIdx ? newScanned : (item.scannedQty || 0); + return qty >= (item.planQty || 0); + }); + if (allDone) { + voice.speak('数据一致'); + } + + if (newScanned >= maxQty) { + const matchedId = String(matchedItem?.id || ''); + if (matchedId) { + this.matchedGoodsId = matchedId; + if (typeof this.$set === 'function') { + this.$set(this.matchedGoodsState, matchedId, true); + } else { + this.matchedGoodsState[matchedId] = true; + } + } + } + + if ((this.scanQty || 1) > 1) { + this.$emit('resetScanQty'); + } } } }; @@ -990,4 +1111,116 @@ import voice from '@/core/utils/voice'; font-size: 30rpx; color: #c0c4cc; } + + /* 多商品匹配弹窗 */ + .multi-match-popup { + padding: 48rpx 32rpx calc(40rpx + env(safe-area-inset-bottom)); + background: #ffffff; + border-top-left-radius: 20rpx; + border-top-right-radius: 20rpx; + } + + .multi-match-popup-title { + font-size: 38rpx; + font-weight: 600; + color: #303133; + text-align: center; + margin-bottom: 32rpx; + } + + .multi-match-popup-body { + margin-bottom: 32rpx; + } + + .multi-match-card { + display: flex; + flex-direction: row; + align-items: stretch; + padding: 0; + background: #f8f9fa; + border-radius: 12rpx; + border: 1rpx solid #ebeef5; + overflow: hidden; + } + + .multi-match-card:active { + opacity: 0.7; + } + + .multi-match-thumb { + flex: 1; + min-height: 240rpx; + overflow: hidden; + background: #f2f3f5; + display: flex; + align-items: center; + justify-content: center; + } + + .multi-match-image { + width: 100%; + height: 100%; + } + + .multi-match-image-placeholder { + width: 100%; + height: 100%; + min-height: 240rpx; + display: flex; + align-items: center; + justify-content: center; + background: #f2f3f5; + } + + .multi-match-info { + flex: 1; + min-width: 0; + display: flex; + flex-direction: column; + justify-content: center; + gap: 10rpx; + padding: 24rpx; + } + + .multi-match-name { + font-size: 38rpx; + font-weight: 600; + color: #303133; + line-height: 1.4; + word-break: break-all; + } + + .multi-match-barcode, + .multi-match-spec { + font-size: 32rpx; + color: #909399; + line-height: 1.4; + } + + .multi-match-qty { + font-size: 32rpx; + color: #2979ff; + font-weight: 500; + line-height: 1.3; + } + + .multi-match-popup-footer { + display: flex; + justify-content: center; + } + + .multi-match-footer-btn { + flex: 1; + height: 80rpx; + line-height: 80rpx; + text-align: center; + border-radius: 12rpx; + font-size: 36rpx; + background: #f5f5f5; + color: #909399; + } + + .multi-match-footer-btn:active { + opacity: 0.7; + } diff --git a/pages/work/order/order-review.vue b/pages/work/order/order-review.vue index 955617c..2d3956e 100644 --- a/pages/work/order/order-review.vue +++ b/pages/work/order/order-review.vue @@ -1108,6 +1108,10 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; } // 详情视图模式下,扫描传给 ReviewDetail 组件处理 if (this.showDetailView && this.$refs.reviewDetail) { + // 多商品匹配弹窗已打开时,忽略重复扫描,避免重复提示 + if (this.$refs.reviewDetail.showMultiMatchPopup) { + return; + } this.keyword = scanText; const matched = this.$refs.reviewDetail.handleScanCode(scanText); setTimeout(() => { this.keyword = ''; }, 300); @@ -1153,6 +1157,10 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; uni.showToast({ title: '该订单已复核完成,仅可查看', icon: 'none' }); return; } + // 多商品匹配弹窗已打开时,忽略重复扫描,避免重复提示 + if (this.$refs.reviewDetail.showMultiMatchPopup) { + return; + } const matched = this.$refs.reviewDetail.handleScanCode(text); if (!matched) { uni.showToast({ title: '条码不匹配', icon: 'none' }); @@ -1269,6 +1277,10 @@ import ReviewDetail from './order-review-comps/ReviewDetail.vue'; uni.showToast({ title: '该订单已复核完成,仅可查看', icon: 'none' }); return; } + // 多商品匹配弹窗已打开时,忽略重复扫描,避免重复提示 + if (this.$refs.reviewDetail.showMultiMatchPopup) { + return; + } const matched = this.$refs.reviewDetail.handleScanCode(scanResult); if (!matched) { uni.showToast({ title: '条码不匹配', icon: 'none' }); diff --git a/pages/work/order/picking.vue b/pages/work/order/picking.vue index 6010720..8bed360 100644 --- a/pages/work/order/picking.vue +++ b/pages/work/order/picking.vue @@ -184,6 +184,7 @@