diff --git a/pages/packing/packMode.vue b/pages/packing/packMode.vue index 4c580be..488f7f6 100644 --- a/pages/packing/packMode.vue +++ b/pages/packing/packMode.vue @@ -19,8 +19,7 @@ - - 已绑定 · {{ workbenchName || '工作台' }} + {{ workbenchName || '工作台' }} diff --git a/pages/work/order/groupon-picking-detail.vue b/pages/work/order/groupon-picking-detail.vue index 1942ccc..cfcbc48 100644 --- a/pages/work/order/groupon-picking-detail.vue +++ b/pages/work/order/groupon-picking-detail.vue @@ -7,6 +7,27 @@ + + + + + + + 搜索 + + + + + + @@ -16,8 +37,18 @@ - 波次号:{{ item.waveNo || '--' }} - 总订单数:{{ item.totalOrderCount }}{{ item.logisticsName || '--' }} + {{ item.waveNo || '--' }} + {{ item.storeName || '--' }} + + + 创建: + {{ item.creator || '--' }} + + + 总订单数: + {{ item.totalOrderCount }} + + 库位: @@ -31,7 +62,8 @@ {{ item.status === '已复核' ? '已复核' : '未复核' }} {{ item.pendingCount }} - {{ getStatusText(item.status) }} + {{ item.pickAssignmentStatus || '--' }} + {{ item.printAssignmentStatus || '--' }} @@ -71,33 +103,29 @@ 打印设置 打印台 - - {{ printStationName || '--' }} - - - - - {{ station.name }} - + + 打印 - - 打印 - + + + 打印 + + 打印消息 @@ -115,13 +143,14 @@ return { title: '团购拣货详情', onlyMine: false, + keyword: '', currentUserId: '', grabCount: 0, pageSize: 20, currentPage: 1, paginationTotal: 0, showPrintPopup: false, - showPrintStationDropdown: false, + printStationInputKeyword: '', printStationName: '--', printStationId: '', printStationList: [], @@ -140,15 +169,53 @@ return this.orderList; } return this.orderList.filter(item => item.isMine); + }, + currentUserName() { + const user = this.$store?.getters?.user || {}; + const userInfo = this.$store?.getters?.userInfo || {}; + const candidates = [ + user?.employees_name, + user?.employee_name, + user?.real_name, + user?.name, + user?.username, + userInfo?.employees_name, + userInfo?.employee_name, + userInfo?.real_name, + userInfo?.name + ]; + for (let i = 0; i < candidates.length; i += 1) { + const value = String(candidates[i] || '').trim(); + if (value) { + return value; + } + } + return ''; } }, onLoad(options) { + this.safeDispatchBroadcast('setCallbacks', { + onResult: this.handleBroadcastResult + }); + this.safeDispatchBroadcast('start'); this.currentUserId = String(this.$store?.getters?.user?.id || this.$store?.getters?.user?.user_id || '').trim(); const hasGrabCountParam = options && Object.prototype.hasOwnProperty.call(options, 'grabCount'); const parsedGrabCount = Number(options?.grabCount || 0); this.grabCount = hasGrabCountParam ? Math.max(0, parsedGrabCount) : 6; this.loadBatchWaveNoList(); }, + onShow() { + this.safeDispatchBroadcast('setCallbacks', { + onResult: this.handleBroadcastResult + }); + this.safeDispatchBroadcast('resume'); + }, + onHide() { + this.safeDispatchBroadcast('pause'); + }, + onUnload() { + this.safeDispatchBroadcast('stop'); + }, methods: { normalizeReviewAssignmentStatus(status) { const rawValue = status ?? ''; @@ -182,15 +249,20 @@ return normalized || '未复核'; }, buildBatchListParams(page = this.currentPage) { + const where = { + wave_type: 1 + }; + const keyword = this.normalizeKeyword(this.keyword); + if (keyword) { + where.wave_no = keyword; + } return { pagination: { page: Number(page || 1), pageSize: Number(this.pageSize || 20) }, only_todo: 1, - where: { - wave_type: 1 - } + where }; }, extractPagination(payload, response) { @@ -239,13 +311,15 @@ const rowId = source.wave_id ?? source.waveId ?? source.id ?? waveNo; const waveId = source.wave_id ?? source.waveId ?? source.id ?? ''; const pickerName = String(source.picker_name || source.pickerName || source.user_name || source.userName || '--').trim() || '--'; - const totalOrderCount = Number(source.total_order_count ?? source.totalOrderCount ?? source.order_count ?? source.orderCount ?? source.total_count ?? source.totalCount ?? source.order_num ?? source.orderNum ?? 0); + const totalOrderCount = Number(source.total_orders ?? source.totalOrders ?? source.total_order_count ?? source.totalOrderCount ?? source.order_count ?? source.orderCount ?? source.total_count ?? source.totalCount ?? source.order_num ?? source.orderNum ?? 0); const pendingCount = Number(source.unreviewed_order_count ?? source.unreviewedOrderCount ?? source.pending_count ?? source.pendingCount ?? source.unreviewed_count ?? source.unreviewedCount ?? 0); const reviewAssignmentStatus = this.normalizeReviewAssignmentStatus(source.review_assignment_status ?? source.reviewAssignmentStatus ?? source.status); - const assigneeId = String((source.picker_id ?? source.pickerId ?? source.user_id ?? source.userId) || '').trim(); - const logisticsName = String(source.logistics_name || '').trim(); const storageAssignmentStatus = String(source.storage_assignment_status || '').trim(); const expressAssignmentStatus = String(source.express_assignment_status || '').trim(); + const storeName = String(source.store_name || source.storeName || '').trim(); + const pickAssignmentStatus = String(source.pick_assignment_status || source.pickAssignmentStatus || '').trim(); + const printAssignmentStatus = String(source.print_assignment_status || source.printAssignmentStatus || '').trim(); + const creator = String(source.creator || source.creator_name || source.creatorName || '').trim(); return { id: String(rowId || ''), waveId: typeof waveId === 'number' ? waveId : String(waveId || '').trim(), @@ -254,10 +328,13 @@ totalOrderCount: Number.isFinite(totalOrderCount) ? totalOrderCount : 0, pendingCount: Number.isFinite(pendingCount) ? pendingCount : 0, status: reviewAssignmentStatus, - isMine: !!this.currentUserId && !!assigneeId && assigneeId === this.currentUserId, - logisticsName, + isMine: !!this.currentUserName && !!creator && creator === this.currentUserName, storageAssignmentStatus, - expressAssignmentStatus + expressAssignmentStatus, + storeName, + pickAssignmentStatus, + printAssignmentStatus, + creator }; }) .filter(item => !!item.waveNo) @@ -346,6 +423,109 @@ .map(group => (group && typeof group === 'object' ? group : null)) .filter(group => !!group); }, + /** + * 提取 getWavePlatformPrintData 返回的 locked_wave_groups(打印锁占用的分组) + * 已打印面单的数据会出现在 locked_wave_groups,而 waveGroups 为空 + * @param {object} payload + */ + extractLockedWaveGroups(payload) { + const groups = Array.isArray(payload?.locked_wave_groups) ? payload.locked_wave_groups : []; + return groups + .map(group => (group && typeof group === 'object' ? group : null)) + .filter(group => !!group); + }, + /** + * 判断锁定订单是否为拦截订单(无需解锁,禁止打印) + * 当 locked_orders 的 order_id 与 intercepted_orders 的 order_id 一致(拦截集合覆盖全部锁定集合)时返回 true + * @param {object} payload getWavePlatformPrintData 返回的数据 + * @returns {boolean} + */ + isInterceptedPrintBlock(payload) { + const lockedOrders = Array.isArray(payload?.locked_orders) ? payload.locked_orders : []; + const interceptedOrders = Array.isArray(payload?.intercepted_orders) ? payload.intercepted_orders : []; + const lockedIds = new Set( + lockedOrders.map(order => order?.order_id ?? order?.orderId ?? '').filter(id => id !== '' && id != null) + ); + const interceptedIds = new Set( + interceptedOrders.map(order => order?.order_id ?? order?.orderId ?? '').filter(id => id !== '' && id != null) + ); + if (!lockedIds.size || !interceptedIds.size) { + return false; + } + // 拦截集合覆盖全部锁定集合 → 锁定订单均为拦截订单,不支持打印 + for (const id of lockedIds) { + if (!interceptedIds.has(id)) { + return false; + } + } + return true; + }, + /** + * 将 locked_wave_groups 转换为 unlockWavePlatformPrintDataByGroup 所需的 groups 分组条件 + * 每个(波次 + 平台 + 系统快递编码)组合为一个分组 + * @param {Array} lockedWaveGroups 打印锁占用的波次平台分组 + */ + buildUnlockGroups(lockedWaveGroups) { + const groups = []; + (Array.isArray(lockedWaveGroups) ? lockedWaveGroups : []).forEach(waveGroup => { + const waveId = waveGroup?.wave_id ?? waveGroup?.waveId ?? waveGroup?.id ?? ''; + const platforms = Array.isArray(waveGroup?.platforms) ? waveGroup.platforms : []; + if (platforms.length) { + platforms.forEach(platform => { + groups.push({ + wave_id: waveId, + platform: platform?.platform ?? platform?.platform_code ?? '', + sys_logistics_code: platform?.sys_logistics_code ?? platform?.sysLogisticsCode ?? platform?.logistics_code ?? '', + order_ids: Array.isArray(platform?.order_ids) ? platform.order_ids : [] + }); + }); + } else if (waveId !== '' && waveId != null) { + // 无平台嵌套时按波次兜底 + groups.push({ wave_id: waveId, platform: '', sys_logistics_code: '', order_ids: [] }); + } + }); + return groups.filter(group => group.wave_id !== '' && group.wave_id != null); + }, + /** + * 按分组解锁波次平台打印锁(order.print.unlockWavePlatformPrintDataByGroup) + * 将传入的分组中已锁定的订单 print_lock_status 置为 none + * @param {Array} lockedWaveGroups 打印锁占用的波次平台分组(用于构建 groups 条件) + * @returns {Promise} 解锁结果(summary / unlocked_order_ids / unlocked_orders 等) + */ + async unlockWavePlatformPrintDataByGroup(lockedWaveGroups) { + const warehouseId = this.resolveWarehouseId(); + if (!warehouseId) { + throw new Error('缺少仓库ID'); + } + const groups = this.buildUnlockGroups(lockedWaveGroups); + if (!groups.length) { + throw new Error('缺少可解锁的分组条件'); + } + const waveIds = Array.from(new Set( + groups.map(g => g.wave_id).filter(id => id !== '' && id != null) + )); + const params = { + warehouse_id: warehouseId, + wave_ids: waveIds, + group_type: 'platform_express', + unlock_scope: 'group', + groups + }; + const response = await this.$http('order.print.unlockWavePlatformPrintDataByGroup', params); + const unlockPayload = response?.data?.data + || response?.data + || response?.result + || response + || {}; + const unlockedIds = unlockPayload?.unlocked_order_ids || []; + const unlockedCount = Array.isArray(unlockedIds) ? unlockedIds.length : 0; + console.log(`[GrouponPickingDetail] 波次平台打印锁解锁成功,解锁订单数: ${unlockedCount}`); + return response; + }, + async fetchWavePlatformPrintPayload(params) { + const response = await this.$http('order.print.getWavePlatformPrintData', params); + return this.extractWavePlatformPrintPayload(response); + }, buildPrintRequestCode() { const timePart = Date.now().toString(36); const randomPart = Math.random().toString(36).slice(2, 10); @@ -456,23 +636,38 @@ }, async requestWavePlatformPrintData() { const params = this.buildWavePlatformPrintParams(); - console.log('[GrouponPickingDetail] getWavePlatformPrintData params:', params); - try { - const response = await this.$http('order.print.getWavePlatformPrintData', params); - console.log('[GrouponPickingDetail] getWavePlatformPrintData success:', response); - const payload = this.extractWavePlatformPrintPayload(response); - const waveGroups = this.normalizeWaveGroups(payload); - if (!waveGroups.length) { - throw new Error('未获取到可打印的waveGroups'); - } - this.printWavePlatformPrintData = payload; - this.printWaveGroups = waveGroups; - this.printRequestCode = this.buildPrintRequestCode(); - return payload; - } catch (error) { - console.error('[GrouponPickingDetail] getWavePlatformPrintData error:', error); - throw error; + if (!params.warehouse_id) { + throw new Error('缺少仓库ID'); } + if (!params.wave_ids.length) { + throw new Error('缺少波次ID'); + } + + let payload = await this.fetchWavePlatformPrintPayload(params); + let waveGroups = this.normalizeWaveGroups(payload); + const lockedWaveGroups = this.extractLockedWaveGroups(payload); + // 打印锁占用:waveGroups 为空 + locked_wave_groups 有值 → 先按分组解锁打印锁,解锁后重新获取可打印数据 + if (!waveGroups.length && lockedWaveGroups.length) { + // 拦截订单与锁定订单 order_id 一致 → 拦截订单不支持打印,无需解锁 + if (this.isInterceptedPrintBlock(payload)) { + throw new Error('拦截订单,不支持打印'); + } + try { + await this.unlockWavePlatformPrintDataByGroup(lockedWaveGroups); + } catch (error) { + throw new Error(`解锁打印锁失败:${String(error?.message || error?.msg || error?.errMsg || '请稍后重试')}`); + } + payload = await this.fetchWavePlatformPrintPayload(params); + waveGroups = this.normalizeWaveGroups(payload); + } + + if (!waveGroups.length) { + throw new Error('未获取到可打印的waveGroups'); + } + this.printWavePlatformPrintData = payload; + this.printWaveGroups = waveGroups; + this.printRequestCode = this.buildPrintRequestCode(); + return payload; }, buildPrintRecordWhere() { return {}; @@ -494,39 +689,170 @@ const source = item && typeof item === 'object' ? item : {}; const id = String(source.id ?? source.print_station_id ?? source.printStationId ?? '').trim(); const name = String(source.name || source.station_name || source.print_station_name || '').trim(); + const customBarcode = String(source.custom_barcode || source.bar_code || source.barcode || source.station_code || source.print_station_code || '').trim(); return { id, - name + name, + customBarcode }; }) .filter(item => !!item.id && !!item.name); }, - async loadPrintStations() { + async loadPrintStations(autoAssign = false) { const response = await this.$http('print.getList', this.buildPrintRecordParams()); const list = this.extractPrintRecordList(response); const stations = this.normalizePrintStations(list); this.printStationList = stations; - this.printStationId = stations[0]?.id || ''; - this.printStationName = stations[0]?.name || '--'; + // 输入框模式:不再默认分配打印台,需扫码/输入精确匹配 + if (autoAssign && stations.length && !this.printStationId) { + this.printStationId = stations[0]?.id || ''; + this.printStationName = stations[0]?.name || '--'; + } }, - togglePrintStationDropdown() { - if (!this.printStationList.length) { - uni.showToast({ - title: '暂无可用打印台', - icon: 'none' - }); + async ensurePrintStationsLoaded() { + if (Array.isArray(this.printStationList) && this.printStationList.length) { + return true; + } + try { + uni.showLoading({ title: '加载打印台...' }); + await this.loadPrintStations(false); + return Array.isArray(this.printStationList) && this.printStationList.length; + } catch (error) { + console.warn('[GrouponPickingDetail] 加载打印台列表失败:', error); + return false; + } finally { + uni.hideLoading(); + } + }, + resolvePrintStationByKeyword(keyword) { + const list = Array.isArray(this.printStationList) ? this.printStationList : []; + if (!list.length) { + return null; + } + const kw = this.normalizeKeyword(keyword).toLowerCase(); + if (!kw) { + return null; + } + return list.find(station => + String(station.name || '').toLowerCase() === kw + || String(station.id || '').toLowerCase() === kw + || String(station.customBarcode || '').toLowerCase() === kw + ) || null; + }, + applyPrintStation(station) { + if (!station) { + return false; + } + this.printStationId = String(station.id || ''); + this.printStationName = String(station.name || '--'); + // 仅回显打印台名称,不追加条码 + this.printStationInputKeyword = String(station.name || ''); + return true; + }, + handlePrintStationInput(value) { + const keyword = this.normalizeKeyword(value); + if (!keyword) { return; } - this.showPrintStationDropdown = !this.showPrintStationDropdown; + const matched = this.resolvePrintStationByKeyword(keyword); + if (matched) { + this.applyPrintStation(matched); + uni.showToast({ title: `已匹配打印台:${matched.name}`, icon: 'none' }); + } }, - handlePrintStationSelect(station) { - this.printStationId = String(station?.id || ''); - this.printStationName = String(station?.name || '--'); - this.showPrintStationDropdown = false; + async matchPrintStationByKeyword(keyword) { + const text = this.normalizeKeyword(keyword); + if (!text) { + return; + } + // 打印台列表未加载时自动加载,保证广播扫描可直接匹配 + const loaded = await this.ensurePrintStationsLoaded(); + if (!loaded) { + uni.showToast({ title: '暂无可用打印台', icon: 'none' }); + return; + } + const matched = this.resolvePrintStationByKeyword(text); + if (matched) { + this.applyPrintStation(matched); + uni.showToast({ title: `已匹配打印台:${matched.name}`, icon: 'success' }); + } else { + uni.showToast({ title: '未匹配到打印台', icon: 'none' }); + } + }, + handlePrintStationInputConfirm() { + const keyword = this.normalizeKeyword(this.printStationInputKeyword); + if (!keyword) { + return; + } + const matched = this.resolvePrintStationByKeyword(keyword); + if (matched) { + this.applyPrintStation(matched); + uni.showToast({ title: `已匹配打印台:${matched.name}`, icon: 'success' }); + } else { + this.matchPrintStationByKeyword(keyword); + } }, handlePrintPopupClose() { this.showPrintPopup = false; - this.showPrintStationDropdown = false; + }, + normalizeKeyword(value) { + return String(value || '').replace(/\s+/g, ''); + }, + normalizeScanResult(scanResult) { + if (!scanResult) { + return ''; + } + + if (typeof scanResult === 'string') { + return this.normalizeKeyword(scanResult); + } + + if (typeof scanResult.result === 'string') { + return this.normalizeKeyword(scanResult.result); + } + + if (Array.isArray(scanResult.result)) { + const firstResult = scanResult.result.find(item => item); + if (typeof firstResult === 'string') { + return this.normalizeKeyword(firstResult); + } + if (firstResult && typeof firstResult.data === 'string') { + return this.normalizeKeyword(firstResult.data); + } + } + + if (typeof scanResult.data === 'string') { + return this.normalizeKeyword(scanResult.data); + } + + return ''; + }, + handleBroadcastResult(result) { + const scanText = this.normalizeScanResult(result); + if (!scanText) { + return; + } + // 打印设置弹窗打开时,扫描结果填入打印台输入框并自动匹配打印台 + if (this.showPrintPopup) { + this.printStationInputKeyword = scanText; + this.matchPrintStationByKeyword(scanText); + return; + } + // 弹窗未打开:按扫码内容搜索波次号 + this.keyword = scanText; + this.handleSearch(); + }, + safeDispatchBroadcast(action, payload) { + try { + const task = this.$store.dispatch(`broadcast/${action}`, payload); + if (task && typeof task.catch === 'function') { + task.catch(error => { + console.warn(`[GrouponPickingDetail] broadcast/${action} 调用失败:`, error); + }); + } + } catch (error) { + console.warn(`[GrouponPickingDetail] broadcast/${action} 调用异常:`, error); + } }, async loadBatchWaveNoList(page = this.currentPage) { const targetPage = Math.max(1, Number(page || 1)); @@ -552,6 +878,16 @@ toggleOnlyMine() { this.onlyMine = !this.onlyMine; }, + handleSearch() { + this.keyword = this.normalizeKeyword(this.keyword); + this.currentPage = 1; + this.loadBatchWaveNoList(1); + }, + clearSearch() { + this.keyword = ''; + this.currentPage = 1; + this.loadBatchWaveNoList(1); + }, buildMockOrderList(count) { const listCount = Math.max(0, Number(count || 0)); return Array.from({ length: listCount }).map((_, index) => { @@ -570,9 +906,6 @@ }; }); }, - getStatusText(status) { - return this.normalizeReviewAssignmentStatus(status); - }, async showRecordDetail(item) { const target = item && typeof item === 'object' ? item : null; console.log('[GrouponPickingDetail] print button clicked:', target); @@ -605,17 +938,19 @@ this.printMessage = message; uni.showToast({ title: message, - icon: 'none' + icon: 'none', + duration: 4000 }); return; } try { - await this.loadPrintStations(); + await this.loadPrintStations(false); } catch (error) { this.printStationList = []; this.printStationId = ''; this.printStationName = '--'; + this.printStationInputKeyword = ''; uni.showToast({ title: '打印台加载失败', icon: 'none' @@ -623,7 +958,14 @@ } this.pendingPrintCount = Number(target.pendingCount || 0); this.printMessage = `待打印未复核订单 ${this.pendingPrintCount} 条`; - this.showPrintStationDropdown = false; + // 回显已匹配的打印台;未匹配时清空输入等待扫码/输入 + if (this.printStationId && this.printStationName && this.printStationName !== '--') { + this.printStationInputKeyword = this.printStationName; + } else { + this.printStationId = ''; + this.printStationName = '--'; + this.printStationInputKeyword = ''; + } this.showPrintPopup = true; }, buildPrintSendParams() { @@ -640,18 +982,20 @@ }; }, async handleConfirmPrint() { - console.log('[GrouponPickingDetail] handleConfirmPrint clicked:', { - printStationId: this.printStationId, - printStationName: this.printStationName, - printStationListLength: Array.isArray(this.printStationList) ? this.printStationList.length : 0, - pendingPrintCount: this.pendingPrintCount, - waveGroupsLength: Array.isArray(this.printWaveGroups) ? this.printWaveGroups.length : 0 - }); - if (!this.printStationList.length || !this.printStationId || !this.printStationName || this.printStationName === '--') { - console.warn('[GrouponPickingDetail] handleConfirmPrint blocked: invalid print station'); - this.printMessage = '请选择打印台'; + if (!Array.isArray(this.printStationList) || !this.printStationList.length) { + console.warn('[GrouponPickingDetail] handleConfirmPrint blocked: no print station list'); + this.printMessage = '暂无可用打印台'; uni.showToast({ - title: '请选择打印台', + title: '暂无可用打印台', + icon: 'none' + }); + return; + } + if (!this.printStationId || !this.printStationName || this.printStationName === '--') { + console.warn('[GrouponPickingDetail] handleConfirmPrint blocked: print station not matched'); + this.printMessage = '请先扫描/输入打印台'; + uni.showToast({ + title: '请先扫描/输入打印台', icon: 'none' }); return; @@ -749,6 +1093,64 @@ background: #1f67e6; } + .search-filter { + background: #ffffff; + padding: 20rpx 24rpx; + border: 1rpx solid #f0f0f0; + border-top: none; + border-radius: 0; + } + + .search-box { + position: relative; + } + + .search-box-inner { + position: relative; + } + + ::v-deep .search-box-inner .u-search { + width: 100%; + } + + ::v-deep .search-box-inner .u-search__content { + padding-right: 200rpx; + } + + ::v-deep .search-box-inner .u-search__content__close { + margin-right: 12rpx; + } + + .search-actions { + position: absolute; + right: 24rpx; + top: 50%; + transform: translateY(-50%); + height: 68rpx; + display: flex; + align-items: center; + } + + .search-btn { + height: 68rpx; + padding: 0 8rpx; + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + + &:active { + opacity: 0.88; + } + } + + .search-btn__text { + font-size: 30rpx; + color: #2979ff; + font-weight: 500; + line-height: 1; + } + .detail-scroll { flex: 1; min-height: 0; @@ -791,8 +1193,8 @@ .record-line { display: flex; align-items: center; - font-size: 32rpx; - line-height: 52rpx; + font-size: 36rpx; + line-height: 60rpx; } .record-line + .record-line { @@ -812,23 +1214,10 @@ color: #303133; } - .record-logistics { - color: #303133; - font-size: 30rpx; - margin-left: 16rpx; - flex-shrink: 0; - } - - .record-logistics-label { - color: #909399; - margin-left: 16rpx; - flex-shrink: 0; - white-space: nowrap; - } - .record-line--split { display: flex; gap: 16rpx; + font-size: 34rpx; } .record-half { @@ -865,16 +1254,21 @@ } .record-count { - font-size: 30rpx; - line-height: 40rpx; + font-size: 36rpx; + line-height: 46rpx; color: #fa8c16; } - .record-status { - margin-top: 12rpx; - font-size: 30rpx; - line-height: 40rpx; - color: #2979ff; + .record-status-value { + margin-top: 8rpx; + font-size: 36rpx; + line-height: 46rpx; + color: #303133; + text-align: right; + } + + .record-status-value--success { + color: #07c160; } .record-footer { @@ -921,99 +1315,84 @@ } .print-row { - position: relative; display: flex; - align-items: center; - justify-content: space-between; + align-items: flex-start; padding: 16rpx 0; - border-bottom: 1rpx solid #f5f5f5; - gap: 16rpx; + border-bottom: 1rpx solid #f2f3f5; } .print-row--station { - align-items: flex-start; - padding-top: 8rpx; + position: relative; } .print-row--station .print-label { - padding-top: 10rpx; + padding-top: 20rpx; + } + + .print-row--action { + align-items: center; + } + + .print-row--message { + border-bottom: none; } .print-label { - min-width: 120rpx; - font-size: 30rpx; - color: #606266; - line-height: 44rpx; - } - - .print-picker { - flex: 1; - min-width: 0; - display: flex; - align-items: center; - justify-content: space-between; - padding: 10rpx 16rpx; - border: 1rpx solid #dcdfe6; - border-radius: 10rpx; - background: #fafafa; - } - - .print-picker-value { - flex: 1; + min-width: 130rpx; + width: 130rpx; font-size: 28rpx; - color: #303133; - padding-right: 16rpx; - word-break: break-all; + line-height: 40rpx; + color: #909399; } - .print-station-dropdown { - position: absolute; - right: 0; - top: calc(100% - 4rpx); - width: calc(100% - 144rpx); - max-height: 360rpx; - overflow-y: auto; - background: #ffffff; - border: 1rpx solid #ebeef5; - border-radius: 12rpx; - box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.08); - z-index: 12; - } - - .print-station-option { - padding: 16rpx 20rpx; + .print-value { + flex: 1; font-size: 28rpx; line-height: 40rpx; color: #303133; } - .print-station-option + .print-station-option { - border-top: 1rpx solid #f5f5f5; + .print-station-input-wrap { + flex: 1; + min-width: 0; + max-width: 100%; + display: flex; + align-items: center; + box-sizing: border-box; } - .print-station-option--active { - color: #2979ff; - background: rgba(41, 121, 255, 0.08); + .print-station-input-wrap ::v-deep .u-input { + flex: 1; + min-width: 0; + width: auto; + max-width: 100%; + box-sizing: border-box; } - .print-row--action .u-btn { - min-width: 160rpx; + .print-station-input-wrap ::v-deep .u-input__content { + min-width: 0; + box-sizing: border-box; } - .print-row--message { - align-items: flex-start; - justify-content: flex-start; - border-bottom: none; - padding-bottom: 0; - padding-top: 12rpx; + .print-action-wrap { + flex: 1; + min-width: 0; + max-width: 100%; + display: flex; + align-items: center; + box-sizing: border-box; + } + + .print-action-wrap ::v-deep .u-button { + width: 100%; + box-sizing: border-box; } .print-message { flex: 1; font-size: 28rpx; line-height: 40rpx; - color: #606266; - text-align: left; + color: #303133; word-break: break-all; } diff --git a/pages/work/order/scatter-picking-detail.vue b/pages/work/order/scatter-picking-detail.vue index a80b6c7..7826716 100644 --- a/pages/work/order/scatter-picking-detail.vue +++ b/pages/work/order/scatter-picking-detail.vue @@ -37,8 +37,18 @@ - 波次号:{{ item.waveNo || '--' }} - 总订单数:{{ item.totalOrderCount }}{{ item.logisticsName || '--' }} + {{ item.waveNo || '--' }} + {{ item.storeName || '--' }} + + + 创建: + {{ item.creator || '--' }} + + + 总订单数: + {{ item.totalOrderCount }} + + 库位: @@ -51,8 +61,9 @@ - 未复核 {{ item.unreviewedCount }} - {{ getStatusText(item.status) }} + {{ item.status === '已复核' ? '已复核' : '未复核' }} {{ item.unreviewedCount }} + {{ item.pickAssignmentStatus || '--' }} + {{ item.printAssignmentStatus || '--' }} @@ -155,7 +166,33 @@ }, computed: { displayOrderList() { - return Array.isArray(this.orderList) ? this.orderList : []; + const list = Array.isArray(this.orderList) ? this.orderList : []; + if (!this.onlyMine) { + return list; + } + return list.filter(item => item.isMine); + }, + currentUserName() { + const user = this.$store?.getters?.user || {}; + const userInfo = this.$store?.getters?.userInfo || {}; + const candidates = [ + user?.employees_name, + user?.employee_name, + user?.real_name, + user?.name, + user?.username, + userInfo?.employees_name, + userInfo?.employee_name, + userInfo?.real_name, + userInfo?.name + ]; + for (let i = 0; i < candidates.length; i += 1) { + const value = String(candidates[i] || '').trim(); + if (value) { + return value; + } + } + return ''; } }, onLoad(options) { @@ -270,9 +307,6 @@ const where = { wave_type: 2 }; - if (this.onlyMine && this.currentUserId) { - where.picker_id = this.currentUserId; - } const keyword = this.normalizeKeyword(this.keyword); if (keyword) { where.wave_no = keyword; @@ -336,10 +370,12 @@ const totalOrderCount = Number(source.total_order_count ?? source.totalOrderCount ?? source.order_count ?? source.orderCount ?? source.total_count ?? source.totalCount ?? source.order_num ?? source.orderNum ?? 0); const unreviewedCount = Number(source.unreviewed_order_count ?? source.unreviewedOrderCount ?? source.unreviewed_count ?? source.unreviewedCount ?? source.pending_count ?? source.pendingCount ?? 0); const reviewAssignmentStatus = this.normalizeReviewAssignmentStatus(source.review_assignment_status ?? source.reviewAssignmentStatus ?? source.status); - const assigneeId = String((source.picker_id ?? source.pickerId ?? source.user_id ?? source.userId) || '').trim(); - const logisticsName = String(source.logistics_name || '').trim(); const storageAssignmentStatus = String(source.storage_assignment_status || '').trim(); const expressAssignmentStatus = String(source.express_assignment_status || '').trim(); + const storeName = String(source.store_name || source.storeName || '').trim(); + const pickAssignmentStatus = String(source.pick_assignment_status || source.pickAssignmentStatus || '').trim(); + const printAssignmentStatus = String(source.print_assignment_status || source.printAssignmentStatus || '').trim(); + const creator = String(source.creator || source.creator_name || source.creatorName || '').trim(); return { id: String(rowId || `batch-${this.currentPage}-${index + 1}`), waveId: typeof waveId === 'number' ? waveId : String(waveId || '').trim(), @@ -350,8 +386,11 @@ unreviewedCount: Number.isFinite(unreviewedCount) ? unreviewedCount : 0, status: reviewAssignmentStatus, waybillCode: String(source.waybill_no || source.waybillCode || source.waybill_code || ''), - isMine: !!this.currentUserId && !!assigneeId && assigneeId === this.currentUserId, - logisticsName, + isMine: !!this.currentUserName && !!creator && creator === this.currentUserName, + storeName, + pickAssignmentStatus, + printAssignmentStatus, + creator, storageAssignmentStatus, expressAssignmentStatus }; @@ -798,9 +837,6 @@ this.currentPage = 1; this.loadBatchWaveNoList(1); }, - getStatusText(status) { - return this.normalizeReviewAssignmentStatus(status); - }, extractPickQueryPayload(response) { const candidates = [ response?.data?.data, @@ -1191,9 +1227,8 @@ .record-line { display: flex; align-items: center; - flex-wrap: nowrap; - font-size: 32rpx; - line-height: 52rpx; + font-size: 36rpx; + line-height: 60rpx; } .record-line + .record-line { @@ -1215,16 +1250,10 @@ color: #303133; } - .record-logistics { - color: #303133; - font-size: 32rpx; - margin-left: 16rpx; - flex-shrink: 0; - } - .record-line--split { display: flex; gap: 16rpx; + font-size: 34rpx; } .record-half { @@ -1261,16 +1290,21 @@ } .record-count { - font-size: 30rpx; - line-height: 40rpx; + font-size: 36rpx; + line-height: 46rpx; color: #fa8c16; } - .record-status { - margin-top: 12rpx; - font-size: 30rpx; - line-height: 40rpx; - color: #2979ff; + .record-status-value { + margin-top: 8rpx; + font-size: 36rpx; + line-height: 46rpx; + color: #303133; + text-align: right; + } + + .record-status-value--success { + color: #07c160; } .record-footer {