diff --git a/pages/packing/packMode.vue b/pages/packing/packMode.vue index 1a5774b..041915a 100644 --- a/pages/packing/packMode.vue +++ b/pages/packing/packMode.vue @@ -90,13 +90,19 @@ {{ packageMaterialName || '--' }} - - 商品种类 - {{ orderItemsKind }} + + 拣货 + {{ orderPickerName }} - - 商品总数 - {{ orderItemsTotal }} + + + 商品种类 + {{ orderItemsKind }} + + + 商品总数 + {{ orderItemsTotal }} + @@ -187,16 +193,28 @@ - 在线操作员列表(一个打包台支持多人,仅展示与下线) + + + ✓ + + 在线操作员列表(支持勾选多人批量下线) + {{ workbenchMembers.length }}人 - + - + + + ✓ + {{ m.user_name || '--' }} 下线 + + + 已选 {{ offlineSelectedIds.length }} 人 + 批量下线 @@ -318,7 +336,7 @@ 下线操作员 - 确认将「{{ offlineMember && offlineMember.user_name ? offlineMember.user_name : '--' }}」下线?下线后需重新扫码绑定。 + 确认将「{{ offlineNamesText }}」下线?下线后需重新扫码绑定。 取消 @@ -423,9 +441,10 @@ export default { cancelVerifyPopupOpen: false, // 退出工作台弹窗 exitPopupOpen: false, - // 下线操作员二次确认弹窗 + // 下线操作员二次确认弹窗(支持单人 / 多人批量下线) offlinePopupOpen: false, - offlineMember: null, // 待下线成员 { id, user_name } + offlineMembers: [], // 待下线成员 [{ id, user_name }] + offlineSelectedIds: [], // 批量下线勾选的成员行 id // 今日打包统计(workbench.getWorkbenchCount) todayWaveCount: 0, // 团购波次 todayGroupOrderCount: 0, // 团购订单 @@ -576,6 +595,12 @@ export default { if (Array.isArray(r?.items)) return r.items.length; return 0; }, + // 拣货人(order.picker_name,兜底 pickerName) + orderPickerName() { + const r = this.orderQueryResult; + const raw = (r?.order && (r.order.picker_name ?? r.order.pickerName)) ?? r?.picker_name ?? r?.pickerName; + return String(raw || '').trim() || '--'; + }, // 团购订单商品明细(查询结果 items) groupItems() { const r = this.orderQueryResult; @@ -621,6 +646,18 @@ export default { if (!this.boundOperators.length) return '扫描/输入工牌绑定操作员'; if (this.groupVerifyingActive && !this.orderBlocked) return '扫描商品条码核实'; return '扫描/输入运单号查询'; + }, + // 批量下线:是否已全选所有在线成员 + allMembersSelected() { + const list = Array.isArray(this.workbenchMembers) ? this.workbenchMembers : []; + return !!list.length && this.offlineSelectedIds.length === list.length; + }, + // 下线确认弹窗展示的成员姓名(多人用「、」连接) + offlineNamesText() { + const names = (Array.isArray(this.offlineMembers) ? this.offlineMembers : []) + .map(m => String((m && m.user_name) || '').trim()) + .filter(Boolean); + return names.length ? names.join('、') : '--'; } }, onLoad(options) { @@ -1158,14 +1195,19 @@ export default { urls: images }); }, - // 商品明细条码(barcodes 数组取首项 barcode,或字符串直接返回) + // 商品明细条码(barcodes 数组全部取出用「、」连接,或字符串直接返回) orderItemBarcode(item) { if (!item) return ''; const codes = item.barcodes ?? item.barcode; if (Array.isArray(codes)) { - const first = codes.find(c => c); - if (first && typeof first === 'object') return String(first.barcode || first.code || ''); - return String(first || ''); + const list = codes + .map(c => { + if (!c) return ''; + if (typeof c === 'object') return String(c.barcode || c.code || '').trim(); + return String(c).trim(); + }) + .filter(Boolean); + return list.join('、'); } if (codes && typeof codes === 'object') return String(codes.barcode || codes.code || ''); return String(codes || ''); @@ -1702,7 +1744,7 @@ export default { this.applyWorkbenchMembers(wmList); uni.removeStorageSync('workbenchOperator'); // 清理旧版单操作员缓存 uni.showToast({ title: '操作员绑定成功', icon: 'success' }); - this.speakText('绑定成功'); + this.speakText(`${name} 绑定成功`); // 绑定后静默重拉工作台信息,成员列表以服务端为准 this.fetchWorkbenchInfo({ silent: true }); return { ok: true, member }; @@ -1718,22 +1760,69 @@ export default { handleOfflineMember(member) { const id = String(member && member.id || '').trim(); if (!id) return; - this.offlineMember = member; + this.offlineMembers = [member]; + this.offlinePopupOpen = true; + }, + // 切换批量下线勾选状态 + toggleOfflineSelect(member) { + const id = String(member && member.id || '').trim(); + if (!id) return; + const set = new Set(this.offlineSelectedIds); + if (set.has(id)) { + set.delete(id); + } else { + set.add(id); + } + this.offlineSelectedIds = Array.from(set); + }, + // 是否已勾选该成员(批量下线) + isMemberSelected(member) { + const id = String(member && member.id || '').trim(); + return !!id && this.offlineSelectedIds.indexOf(id) !== -1; + }, + // 全选 / 取消全选 + toggleSelectAllOffline() { + const list = Array.isArray(this.workbenchMembers) ? this.workbenchMembers : []; + if (this.allMembersSelected) { + this.offlineSelectedIds = []; + } else { + this.offlineSelectedIds = list + .map(m => String(m && m.id || '').trim()) + .filter(Boolean); + } + }, + // 批量下线:勾选成员一次打开确认弹窗 + handleBatchOffline() { + const ids = this.offlineSelectedIds; + if (!ids.length) { + uni.showToast({ title: '请先勾选要下线的操作员', icon: 'none' }); + return; + } + const idSet = new Set(ids); + const members = (Array.isArray(this.workbenchMembers) ? this.workbenchMembers : []) + .filter(m => idSet.has(String(m && m.id || ''))); + if (!members.length) return; + this.offlineMembers = members; this.offlinePopupOpen = true; }, // 关闭下线操作员二次确认弹窗 handleCloseOfflinePopup() { this.offlinePopupOpen = false; - this.offlineMember = null; + this.offlineMembers = []; }, - // 确认下线:移除该成员行 + // 确认下线:移除勾选 / 单个成员行(支持多人一次性下线) async confirmOfflineMember() { - const member = this.offlineMember; - const id = String(member && member.id || '').trim(); + const members = Array.isArray(this.offlineMembers) ? this.offlineMembers : []; + const ids = members + .map(m => String(m && m.id || '').trim()) + .filter(Boolean); this.offlinePopupOpen = false; - this.offlineMember = null; - if (!id) return; - await this.doRemoveOperators([id]); + this.offlineMembers = []; + // 清理已下线的勾选状态(批量下线后重新计算) + const removedSet = new Set(ids); + this.offlineSelectedIds = this.offlineSelectedIds.filter(id => !removedSet.has(id)); + if (!ids.length) return; + await this.doRemoveOperators(ids); }, // 执行移除成员请求(silent=true 时为退出工作台前的静默解绑:不弹 loading/toast/语音) // 支持一次移除多个操作员(ids 传数组);全员下线(移除后无成员)时先 finishPack 再 clearPackState() 清空订单数据 @@ -1770,6 +1859,10 @@ export default { } // 从本地列表移除已移除的成员行(同步 workbenchMembers 与 boundOperators) const removedSet = new Set(idList); + const removedNames = (Array.isArray(this.workbenchMembers) ? this.workbenchMembers : []) + .filter(m => removedSet.has(String(m && m.id || ''))) + .map(m => String((m && m.user_name) || '').trim()) + .filter(Boolean); const wmList = (Array.isArray(this.workbenchMembers) ? this.workbenchMembers : []) .filter(m => !removedSet.has(String(m && m.id || ''))); if (wmList.length) { @@ -1793,7 +1886,10 @@ export default { } if (!silent) { uni.showToast({ title: opts.toastText || '操作员已移除', icon: 'success' }); - this.speakText('移除成功'); + const removedNameText = removedNames.length ? removedNames.join('、') : ''; + this.speakText(removedNameText ? `${removedNameText} 移除成功` : '移除成功'); + // 移除成功后关闭操作员弹窗 + this.handleCloseUserDrawer(); // 下线后静默重拉工作台信息,成员列表以服务端为准(退出流程 silent 不重拉) this.fetchWorkbenchInfo({ silent: true }); } @@ -2452,11 +2548,29 @@ export default { .order-summary__stat-row { justify-content: space-between; + flex-wrap: wrap; } .order-summary__stat { display: flex; align-items: center; + flex-shrink: 0; + min-width: 0; +} + +.order-summary__stat-group { + display: flex; + align-items: center; + flex-shrink: 0; +} + +.order-summary__stat-group .order-summary__stat + .order-summary__stat { + margin-left: 24rpx; +} + +.order-summary__stat--picker { + flex: 0 1 auto; + max-width: 100%; } .order-summary__stat-label { @@ -2465,6 +2579,21 @@ export default { margin-right: 8rpx; } +.order-summary__stat-label--picker { + flex-shrink: 0; + margin-right: 20rpx; +} + +.order-summary__picker { + flex: 1; + min-width: 0; + font-size: 34rpx; + font-weight: bold; + color: #303133; + word-break: break-all; + line-height: 1.4; +} + /* 禁止打包:运单/波次行红底 */ .order-summary__row--blocked { background: #e64340; @@ -2713,7 +2842,7 @@ export default { /* ===== 操作员弹窗 ===== */ .user-drawer { - width: 560rpx; + width: 680rpx; box-sizing: border-box; background: #ffffff; border-radius: 16rpx; @@ -2731,7 +2860,7 @@ export default { .user-drawer__title { display: block; - font-size: 42rpx; + font-size: 56rpx; font-weight: 600; color: #303133; text-align: center; @@ -2757,13 +2886,23 @@ export default { display: flex; align-items: center; justify-content: space-between; - gap: 16rpx; margin-bottom: 16rpx; } +.member-select-all { + flex: 1; + min-width: 0; + display: flex; + align-items: center; +} + +.member-select-all .member-checkbox { + margin-right: 12rpx; +} + .member-section__title { flex: 1; - font-size: 24rpx; + font-size: 34rpx; color: #909399; line-height: 1.4; word-break: break-all; @@ -2771,7 +2910,8 @@ export default { .member-section__count { flex-shrink: 0; - font-size: 26rpx; + margin-left: 16rpx; + font-size: 36rpx; font-weight: 600; color: #2979ff; } @@ -2779,8 +2919,9 @@ export default { .member-list { display: flex; flex-direction: column; - max-height: 300rpx; + max-height: 320rpx; overflow-y: auto; + -webkit-overflow-scrolling: touch; } .member-item { @@ -2800,14 +2941,64 @@ export default { .member-item__info { flex: 1; min-width: 0; + display: flex; + align-items: center; } .member-item__name { - font-size: 34rpx; + margin-left: 16rpx; + font-size: 46rpx; color: #303133; word-break: break-all; } +.member-checkbox { + flex-shrink: 0; + width: 40rpx; + height: 40rpx; + border-radius: 8rpx; + border: 2rpx solid #c0c4cc; + background: #ffffff; + display: flex; + align-items: center; + justify-content: center; + box-sizing: border-box; +} + +.member-checkbox--checked { + background: #2979ff; + border-color: #2979ff; +} + +.member-checkbox__icon { + font-size: 36rpx; + color: #ffffff; + line-height: 1; +} + +.member-batch-bar { + display: flex; + align-items: center; + justify-content: space-between; + margin-top: 16rpx; + padding: 12rpx 20rpx; + background: #ecf5ff; + border-radius: 12rpx; +} + +.member-batch-bar__text { + font-size: 36rpx; + color: #2979ff; +} + +.member-batch-bar__btn { + padding: 8rpx 24rpx; + border-radius: 8rpx; + background: #2979ff; + color: #ffffff; + font-size: 36rpx; +} + .member-item__offline { flex-shrink: 0; margin-left: 16rpx; @@ -2815,7 +3006,7 @@ export default { border-radius: 8rpx; background: #fef0f0; color: #f56c6c; - font-size: 28rpx; + font-size: 36rpx; } .scan-section { @@ -2828,7 +3019,6 @@ export default { .scan-row { display: flex; align-items: center; - gap: 8rpx; background: #ffffff; border: 2rpx solid #e4e7ed; border-radius: 12rpx; @@ -2838,14 +3028,15 @@ export default { .scan-input { flex: 1; - height: 88rpx; - font-size: 36rpx; + height: 96rpx; + font-size: 44rpx; color: #303133; } .camera-btn { width: 76rpx; height: 76rpx; + margin-left: 8rpx; display: flex; align-items: center; justify-content: center; @@ -2859,7 +3050,7 @@ export default { } .scan-tip__text { - font-size: 24rpx; + font-size: 34rpx; color: #909399; } @@ -2884,7 +3075,7 @@ export default { } .query-state__error-text { - font-size: 36rpx; + font-size: 44rpx; color: #f56c6c; text-align: center; line-height: 1.5;