diff --git a/pages/work/order/groupon-picking-detail.vue b/pages/work/order/groupon-picking-detail.vue
index a949e3e..1942ccc 100644
--- a/pages/work/order/groupon-picking-detail.vue
+++ b/pages/work/order/groupon-picking-detail.vue
@@ -18,6 +18,16 @@
波次号:{{ item.waveNo || '--' }}
总订单数:{{ item.totalOrderCount }}{{ item.logisticsName || '--' }}
+
+
+ 库位:
+ {{ item.storageAssignmentStatus || '--' }}
+
+
+ 快递:
+ {{ item.expressAssignmentStatus || '--' }}
+
+
{{ item.status === '已复核' ? '已复核' : '未复核' }} {{ item.pendingCount }}
@@ -234,6 +244,8 @@
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();
return {
id: String(rowId || ''),
waveId: typeof waveId === 'number' ? waveId : String(waveId || '').trim(),
@@ -243,7 +255,9 @@
pendingCount: Number.isFinite(pendingCount) ? pendingCount : 0,
status: reviewAssignmentStatus,
isMine: !!this.currentUserId && !!assigneeId && assigneeId === this.currentUserId,
- logisticsName
+ logisticsName,
+ storageAssignmentStatus,
+ expressAssignmentStatus
};
})
.filter(item => !!item.waveNo)
@@ -805,6 +819,43 @@
flex-shrink: 0;
}
+ .record-logistics-label {
+ color: #909399;
+ margin-left: 16rpx;
+ flex-shrink: 0;
+ white-space: nowrap;
+ }
+
+ .record-line--split {
+ display: flex;
+ gap: 16rpx;
+ }
+
+ .record-half {
+ min-width: 0;
+ display: flex;
+ align-items: center;
+ }
+
+ .record-half:last-child {
+ margin-left: auto;
+ }
+
+ .record-half-label {
+ color: #909399;
+ flex-shrink: 0;
+ white-space: nowrap;
+ margin-right: 8rpx;
+ }
+
+ .record-half-value {
+ color: #303133;
+ min-width: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
.record-right {
min-width: 180rpx;
display: flex;
diff --git a/pages/work/order/picking.vue b/pages/work/order/picking.vue
index 77976ec..9928e32 100644
--- a/pages/work/order/picking.vue
+++ b/pages/work/order/picking.vue
@@ -398,16 +398,7 @@
return list[index] || list[0] || '';
},
handleImageClick() {
- const list = this.getSelectedImageList();
- if (list.length <= 1) {
- this.previewSelectedItemImage();
- return;
- }
- if (this.currentImageIndex < list.length - 1) {
- this.currentImageIndex += 1;
- } else {
- this.currentImageIndex = 0;
- }
+ this.previewSelectedItemImage();
},
normalizeScanResult(scanResult) {
if (!scanResult) {
diff --git a/pages/work/order/scatter-picking-detail.vue b/pages/work/order/scatter-picking-detail.vue
index 4743ee7..5d0c1ff 100644
--- a/pages/work/order/scatter-picking-detail.vue
+++ b/pages/work/order/scatter-picking-detail.vue
@@ -39,6 +39,16 @@
波次号:{{ item.waveNo || '--' }}
总订单数:{{ item.totalOrderCount }}{{ item.logisticsName || '--' }}
+
+
+ 库位:
+ {{ item.storageAssignmentStatus || '--' }}
+
+
+ 快递:
+ {{ item.expressAssignmentStatus || '--' }}
+
+
未复核 {{ item.unreviewedCount }}
@@ -331,6 +341,8 @@
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();
return {
id: String(rowId || `batch-${this.currentPage}-${index + 1}`),
waveId: typeof waveId === 'number' ? waveId : String(waveId || '').trim(),
@@ -342,7 +354,9 @@
status: reviewAssignmentStatus,
waybillCode: String(source.waybill_no || source.waybillCode || source.waybill_code || ''),
isMine: !!this.currentUserId && !!assigneeId && assigneeId === this.currentUserId,
- logisticsName
+ logisticsName,
+ storageAssignmentStatus,
+ expressAssignmentStatus
};
})
.filter(item => !!item.waveNo);
@@ -995,6 +1009,36 @@
flex-shrink: 0;
}
+ .record-line--split {
+ display: flex;
+ gap: 16rpx;
+ }
+
+ .record-half {
+ min-width: 0;
+ display: flex;
+ align-items: center;
+ }
+
+ .record-half:last-child {
+ margin-left: auto;
+ }
+
+ .record-half-label {
+ color: #909399;
+ flex-shrink: 0;
+ white-space: nowrap;
+ margin-right: 8rpx;
+ }
+
+ .record-half-value {
+ color: #303133;
+ min-width: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
.record-right {
min-width: 180rpx;
display: flex;
diff --git a/pages/work/product/query.vue b/pages/work/product/query.vue
index ac87c2d..471efd6 100644
--- a/pages/work/product/query.vue
+++ b/pages/work/product/query.vue
@@ -2128,4 +2128,8 @@
font-size: 28rpx;
color: #c0c4cc;
}
+
+ .safe-area-bottom {
+ height: calc(30rpx + env(safe-area-inset-bottom));
+ }