diff --git a/core/request/apis.js b/core/request/apis.js
index 7ae06e5..9ced2fb 100644
--- a/core/request/apis.js
+++ b/core/request/apis.js
@@ -333,6 +333,12 @@ export default {
method: "POST",
isSystemApi: true
},
+ waveClaimScan: {
+ path: "pick.waveClaimScan",
+ auth: true,
+ method: "POST",
+ isSystemApi: true
+ },
items: {
path: "pick.items",
auth: true,
diff --git a/env.js b/env.js
index c33f58a..b87b72a 100644
--- a/env.js
+++ b/env.js
@@ -1,4 +1,4 @@
-// export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址
-export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址
+export const BASE_URL = 'http://qimen.wms.gztbyc.com' //生产环境接口地址
+// export const BASE_URL = 'http://192.168.11.56:6060' //开发环境接口地址
export const API_URL = `${BASE_URL}/system` //后台接口域名
export const IMG_URL = 'https://ye4s.file.gzxunren.com' //全局网络图片地址变量,css背景图片地址变量在uni.scss
diff --git a/pages.json b/pages.json
index 5e7b6fd..1eedd0a 100644
--- a/pages.json
+++ b/pages.json
@@ -278,6 +278,13 @@
{
"titleNView": false
}
+ },
+ {
+ "path" : "pages/claim/shippingLabel",
+ "style" :
+ {
+ "titleNView": false
+ }
}
],
diff --git a/pages/claim/shippingLabel.vue b/pages/claim/shippingLabel.vue
new file mode 100644
index 0000000..6509dc6
--- /dev/null
+++ b/pages/claim/shippingLabel.vue
@@ -0,0 +1,380 @@
+
+
+
+
+
+
+ {{ showScanInput ? '关闭手动输入' : '手动输入' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/work/order/pickingRecord.vue b/pages/work/order/pickingRecord.vue
index fd06f70..efd65eb 100644
--- a/pages/work/order/pickingRecord.vue
+++ b/pages/work/order/pickingRecord.vue
@@ -16,9 +16,9 @@
暂无拣货记录
-
+
- {{ item.waveNo || '--' }}
+ {{ item.waveNoBase || '--' }}
{{ item.pickUserName || '--' }}
@@ -61,14 +61,6 @@
+
+
+ 时间范围
+
+ {{ dateRangeText }}
+
+
+
+
+
+
+
@@ -116,6 +183,28 @@
source: ''
},
filterConfig: [
+ {
+ key: 'pickMode',
+ label: '拣货模式',
+ type: 'select',
+ options: [
+ { label: '小团购', value: 1 },
+ { label: '单品单件', value: 2 },
+ { label: '先拣后分', value: 3 },
+ { label: '边拣边分', value: 4 },
+ { label: '大团购', value: 5 }
+ ]
+ },
+ {
+ key: 'source',
+ label: '来源',
+ type: 'select',
+ options: [
+ { label: '默认', value: 0 },
+ { label: 'PDA', value: 1 },
+ { label: '后台', value: 2 }
+ ]
+ },
{
key: 'taskStatus',
label: '任务状态',
@@ -139,28 +228,6 @@
{ label: '复核通过', value: 3 },
{ label: '复核异常', value: 4 }
]
- },
- {
- key: 'pickMode',
- label: '拣货模式',
- type: 'select',
- options: [
- { label: '小团购', value: 1 },
- { label: '单品单件', value: 2 },
- { label: '先拣后分', value: 3 },
- { label: '边拣边分', value: 4 },
- { label: '大团购', value: 5 }
- ]
- },
- {
- key: 'source',
- label: '来源',
- type: 'select',
- options: [
- { label: '默认', value: 0 },
- { label: 'PDA', value: 1 },
- { label: '后台', value: 2 }
- ]
}
],
// 时间范围日历
@@ -175,7 +242,11 @@
reviewStatus: '',
pickMode: '',
source: ''
- }
+ },
+
+ // 详情抽屉
+ showDetailPopup: false,
+ detailItem: null
};
},
computed: {
@@ -243,9 +314,9 @@
if (isSet(filter.pickMode)) {
params.pick_mode = Number(filter.pickMode);
}
- // 来源(number)
+ // 来源(string)
if (isSet(filter.source)) {
- params.source = Number(filter.source);
+ params.source = String(filter.source);
}
return params;
},
@@ -317,13 +388,46 @@
const pickUserName = String(source.pick_user_name || source.pickUserName || source.operator_name || source.operatorName || '').trim();
const waveList = Array.isArray(source.wave_list) ? source.wave_list : [];
const firstWave = waveList[0] && typeof waveList[0] === 'object' ? waveList[0] : {};
- const waveNo = String(firstWave.wave_no || source.wave_no || source.waveNo || '').trim() || String(source.batch_no || source.batchNo || '').trim();
- const id = source.id ?? source.task_id ?? source.taskId ?? waveNo ?? `record-${this.currentPage}-${index + 1}`;
+ const baseWaveNo = String(firstWave.wave_no || source.wave_no || source.waveNo || '').trim() || String(source.batch_no || source.batchNo || '').trim();
+ const waveCount = Number(source.wave_count) || (Array.isArray(source.wave_list) ? source.wave_list.length : 0) || 1;
+ const waveNoExtra = baseWaveNo && waveCount > 1 ? `+${waveCount - 1}` : '';
+ const waveNo = baseWaveNo + waveNoExtra;
+ const id = source.id ?? source.task_id ?? source.taskId ?? baseWaveNo ?? `record-${this.currentPage}-${index + 1}`;
+ const taskNo = String(source.task_no || source.taskNo || '').trim();
+ const orderCount = Number(source.order_count ?? source.orderCount ?? 0);
+ const startTime = source.start_time || source.startTime || source.start_at || source.startAt || '';
+ const waveNoList = waveList
+ .map(w => (w && typeof w === 'object' ? String(w.wave_no || w.waveNo || '').trim() : ''))
+ .filter(Boolean);
+ if (!waveNoList.length) {
+ const batchNo = String(source.batch_no || source.batchNo || '').trim();
+ if (batchNo) {
+ waveNoList.push(batchNo);
+ }
+ }
return {
id: String(id || `record-${this.currentPage}-${index + 1}`),
cartName,
pickUserName,
- waveNo
+ waveNo,
+ waveNoBase: baseWaveNo,
+ waveNoExtra,
+ taskNo,
+ waveCount,
+ orderCount: Number.isFinite(orderCount) ? orderCount : 0,
+ status: source.status,
+ reviewStatus: source.review_status,
+ pickMode: source.pick_mode,
+ sourceType: source.source,
+ startTime,
+ waveNoList,
+ waveCountText: String(waveCount),
+ orderCountText: String(Number.isFinite(orderCount) ? orderCount : 0),
+ statusText: this.resolveLabel('taskStatus', source.status),
+ reviewStatusText: this.resolveLabel('reviewStatus', source.review_status),
+ pickModeText: this.resolveLabel('pickMode', source.pick_mode),
+ sourceText: this.resolveLabel('source', source.source),
+ startTimeText: this.formatDateTime(startTime)
};
})
.filter(item => !!(item.waveNo || item.cartName || item.pickUserName));
@@ -534,6 +638,38 @@
}
this.currentPage = targetPage;
this.loadTaskList(targetPage);
+ },
+ resolveLabel(key, value) {
+ if (value === null || value === undefined || value === '') {
+ return '';
+ }
+ const config = (this.filterConfig || []).find(item => item.key === key);
+ if (!config || !Array.isArray(config.options)) {
+ return '';
+ }
+ const target = String(value);
+ const opt = config.options.find(item => String(item.value) === target);
+ return opt ? opt.label : '';
+ },
+ formatDateTime(value) {
+ if (value === null || value === undefined || value === '') {
+ return '';
+ }
+ const date = new Date(String(value).trim());
+ if (Number.isNaN(date.getTime())) {
+ return String(value).trim();
+ }
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const day = String(date.getDate()).padStart(2, '0');
+ const hour = String(date.getHours()).padStart(2, '0');
+ const minute = String(date.getMinutes()).padStart(2, '0');
+ const second = String(date.getSeconds()).padStart(2, '0');
+ return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+ },
+ handleRecordClick(item) {
+ this.detailItem = item || null;
+ this.showDetailPopup = true;
}
}
};
@@ -593,7 +729,7 @@
}
.filter-popup {
- height: 70vh;
+ height: 85vh;
background: #ffffff;
border-top-left-radius: 20rpx;
border-top-right-radius: 20rpx;
@@ -627,7 +763,7 @@
.filter-row__label {
display: block;
- font-size: 28rpx;
+ font-size: 36rpx;
color: #909399;
margin-bottom: 16rpx;
}
@@ -643,7 +779,7 @@
}
.filter-row__value {
- font-size: 28rpx;
+ font-size: 36rpx;
color: #303133;
}
@@ -674,7 +810,7 @@
}
.filter-option__text {
- font-size: 26rpx;
+ font-size: 36rpx;
color: #303133;
}
@@ -709,7 +845,7 @@
}
.filter-popup__btn-text {
- font-size: 30rpx;
+ font-size: 36rpx;
color: #303133;
}
@@ -717,6 +853,99 @@
color: #ffffff;
}
+ .detail-popup {
+ height: 85vh;
+ background: #ffffff;
+ border-top-left-radius: 20rpx;
+ border-top-right-radius: 20rpx;
+ display: flex;
+ flex-direction: column;
+ }
+
+ .detail-popup__header {
+ padding: 30rpx 32rpx 20rpx;
+ border-bottom: 1rpx solid #f0f0f0;
+ flex-shrink: 0;
+ }
+
+ .detail-popup__title {
+ font-size: 32rpx;
+ font-weight: 600;
+ color: #303133;
+ }
+
+ .detail-popup__scroll {
+ flex: 1;
+ min-height: 0;
+ padding: 8rpx 32rpx;
+ box-sizing: border-box;
+ }
+
+ .detail-list {
+ padding: 8rpx 0 40rpx;
+ }
+
+ .detail-row {
+ display: flex;
+ align-items: flex-start;
+ justify-content: space-between;
+ padding: 24rpx 0;
+ border-bottom: 1rpx solid #f5f5f5;
+ }
+
+ .detail-row:last-child {
+ border-bottom: none;
+ }
+
+ .detail-row--two-col {
+ justify-content: flex-start;
+ }
+
+ .detail-row__cell {
+ flex: 1;
+ min-width: 0;
+ display: flex;
+ align-items: center;
+ }
+
+ .detail-row__cell + .detail-row__cell {
+ margin-left: 24rpx;
+ }
+
+ .detail-row__cell .detail-row__value {
+ text-align: left;
+ }
+
+ .detail-row__label {
+ flex-shrink: 0;
+ font-size: 36rpx;
+ color: #909399;
+ margin-right: 24rpx;
+ }
+
+ .detail-row__value {
+ flex: 1;
+ font-size: 36rpx;
+ color: #303133;
+ text-align: left;
+ word-break: break-all;
+ overflow-wrap: break-word;
+ }
+
+ .detail-row__value--stacked {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ }
+
+ .detail-row__wave {
+ font-size: 36rpx;
+ color: #303133;
+ line-height: 1.6;
+ word-break: break-all;
+ overflow-wrap: break-word;
+ }
+
.detail-scroll {
flex: 1;
min-height: 0;
@@ -763,6 +992,14 @@
white-space: normal;
}
+ .record-single-line__value:first-child {
+ margin-left: 24rpx;
+ }
+
+ .record-single-line__extra {
+ color: #ff4d4f;
+ }
+
.record-single-line__dot {
display: inline-block;
width: 8rpx;