diff --git a/dist.tar.gz b/dist.tar.gz index 2e774db0..b48b2584 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/order.deliveryOrder/orderdeliveryOrder.ts b/src/api/order.deliveryOrder/orderdeliveryOrder.ts index 1d0d5179..53b37802 100644 --- a/src/api/order.deliveryOrder/orderdeliveryOrder.ts +++ b/src/api/order.deliveryOrder/orderdeliveryOrder.ts @@ -33,6 +33,160 @@ export type DeliveryOrderDetailParams = { moduleName?: string } +/** order.deliveryOrder.list 单条 raw 行(dispatch 模型) */ +export type DeliveryOrderListItem = { + id: number + delivery_order_code: string + pre_delivery_order_code?: string + pre_delivery_order_id?: string + order_type?: string + order_flag?: string + source_order_codes?: string + sys_platform_code?: string + sys_platform_name?: string + create_at?: string | null + place_order_time?: string | null + pay_time?: string | null + pay_no?: string + service_code?: string | null + operator_name?: string | null + operate_time?: string | null + delivery_time?: string | null + shop_nick?: string + seller_nick?: string | null + buyer_nick?: string | null + buyer_message?: string + seller_message?: string + remark?: string + total_amount?: string + item_amount?: string + discount_amount?: string + freight?: string + ar_amount?: string + got_amount?: string + service_fee?: string | null + logistics_name?: string + delivery_type?: string | null + weight_type?: string | number | null + is_urgency?: string + invoice_flag?: string + status?: string + name?: string + zip_code?: string + tel?: string + mobile?: string + email?: string + province?: string + city?: string + area?: string + town?: string + detail_address?: string + id_type?: string | null + id_number?: string | null + sync_status?: string + items?: string + items_count?: number + items_total?: number + items_weight?: string + wave_id?: number + wave_no?: string + wave_strategy_version?: number + wave_scan_result?: number + post_status?: string + storage_status?: string + pick_status?: string + pack_status?: string + inspection_status?: string + print_status?: string + claim_status?: string + outbound_status?: string + lock_status?: string + intercept_status?: string + basket_number?: string | null + recheck_status?: string + sys_logistics_name?: string | null + express_numbers?: string[] + waybill_codes?: string[] +} + +/** order.deliveryOrder.detail 订单头(detail / order) */ +export type DeliveryOrderDetailHeader = DeliveryOrderListItem & { + warehouse_code?: string | null + extend_props?: Record | null + source_platform_code?: string + source_platform_name?: string + create_channel?: string + delete_at?: string | null + updated_at?: string + logistics_code?: string + sys_logistics_code?: string + express_code?: string + logistics_area_code?: string + country_code?: string + oaid?: string | null + store_id?: number + warehouse_id?: number + from_key?: string | null + items_hash?: string + items_crc?: number + sended_status?: string + recheck_time?: string | null + step?: number + print_lock_status?: string + dispatch_lane?: string +} + +/** order.deliveryOrder.detail 商品明细项 */ +export type DeliveryOrderDetailItem = { + id: number + order_id: number + actual_price?: string + retail_price?: string + ext_code?: string + inventory_type?: string + item_code?: string + item_id?: number + item_name?: string + order_line_no?: string + owner_code?: string + plan_qty?: number + source_order_code?: string + sub_source_order_code?: string + extend_props?: Record | null + stock_id?: number + item_snapshot?: Record + created_at?: string + updated_at?: string + createdAt?: string + updatedAt?: string + images?: string[] +} + +/** order.deliveryOrder.detail 日志项 */ +export type DeliveryOrderDetailLogItem = { + id: number + operation_code: string + operator_name?: string + created_at: string + external_log_type?: string | null + external_log_id?: number | string | null + platform_code?: string + message?: string + operation_name?: string + platform_name?: string +} + +/** order.deliveryOrder.detail 响应 data */ +export type DeliveryOrderDetailPayload = { + detail?: DeliveryOrderDetailHeader + order?: DeliveryOrderDetailHeader + items?: DeliveryOrderDetailItem[] + orderItems?: DeliveryOrderDetailItem[] + expresses?: Record[] + logs?: DeliveryOrderDetailLogItem[] + waybill_codes?: string[] +} + export function orderDeliveryOrderList(data: DeliveryOrderListParams = {}): Promise { return request({ url: '/system', diff --git a/src/api/order.index/orderindex.ts b/src/api/order.index/orderindex.ts index 4226a3e5..19e76dc7 100644 --- a/src/api/order.index/orderindex.ts +++ b/src/api/order.index/orderindex.ts @@ -61,31 +61,42 @@ export type QueryOrderLogListParams = { export type UpdateExpressWeighingWeightParams = { /** 订单 ID;正整数为订单模式,0 为运单号模式(需配合 waybill_code) */ order_id: number | string - /** 运单号;多运单订单必填,运单号模式(order_id=0)必填 */ + /** 订单仅一个运单时可不传;多运单时必填;order_id=0 时必填 */ waybill_code?: string /** 称重重量(kg),必须大于 0,最多 3 位小数 */ weighing_weight: number | string } -/** order.updateExpressWeighingWeight 团购拆单明细项 */ +/** order.updateExpressWeighingWeight 团购拆单明细项(splits 数组元素) */ export type UpdateExpressWeighingWeightSplitItem = { business_key: string weighing_weight: number waybill_code: string } -/** order.updateExpressWeighingWeight 响应 data */ +/** order.updateExpressWeighingWeight 响应 data(散单/订单模式或团购批量模式) */ export type UpdateExpressWeighingWeightResponse = { + /** 订单 ID;订单模式及运单号散单模式返回 */ order_id?: number + /** 写入重量的运单号;订单模式及运单号散单模式返回 */ waybill_code?: string + /** 已写入的称重重量(kg) */ weighing_weight: number + /** 波次号;团购批量模式返回 */ wave_no?: string + /** 业务键;运单号团购批量模式返回 */ business_key?: string + /** 波次 ID;团购批量模式返回 */ wave_id?: number + /** 所有拆单重量累加(kg);团购批量模式返回 */ total_weight?: number + /** waybill_code 非空的 business_key 数量;团购批量模式返回 */ split_count?: number + /** 按 business_key 分组的拆单明细;团购批量模式返回 */ splits?: UpdateExpressWeighingWeightSplitItem[] + /** 货主名称(订单 shop_nick);团购批量模式返回 */ store_name?: string + /** 系统快递名称;团购批量模式返回 */ sys_logistics_name?: string } diff --git a/src/api/order.recheckorder/recheckOrder.ts b/src/api/order.recheckorder/recheckOrder.ts index 8373ec05..056483bd 100644 --- a/src/api/order.recheckorder/recheckOrder.ts +++ b/src/api/order.recheckorder/recheckOrder.ts @@ -1,7 +1,9 @@ import request from '@/utils/request' import { orderUpdateExpressWeighingWeight, - type UpdateExpressWeighingWeightParams + type UpdateExpressWeighingWeightParams, + type UpdateExpressWeighingWeightResponse, + type UpdateExpressWeighingWeightSplitItem } from '@/api/order.index/orderindex' const v = '1.0' @@ -171,7 +173,11 @@ export const orderRecheckOrder = { confirmIntercept } -export type { UpdateExpressWeighingWeightParams } +export type { + UpdateExpressWeighingWeightParams, + UpdateExpressWeighingWeightResponse, + UpdateExpressWeighingWeightSplitItem +} /** @deprecated 请使用 orderUpdateExpressWeighingWeight from @/api/order.index/orderindex */ export function updateExpressWeighingWeight(data: UpdateExpressWeighingWeightParams) { diff --git a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue index fc8bd973..58912dc0 100644 --- a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue +++ b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue @@ -37,6 +37,13 @@ 选择Excel 下载模板 添加明细 + + 发货单号查重 + 清除数据 确认创建 @@ -94,7 +101,7 @@ clearable placeholder="留空自动生成" :disabled="isPreviewRowLocked(row)" - @change="markPreviewRowDirty(row)" + @change="handleDeliveryOrderCodeChange(row)" /> @@ -313,9 +320,9 @@
-
地址智能识别
+
地址智能建单
- 已勾选 {{ selectedPreviewRowsForAddress.length }} 行 + 已勾选 {{ selectedPreviewRowsForAddress.length }} 行,可使用「识别地址」填充
-
请先勾选左侧订单行
+
+ 粘贴地址后点击「识别建单」可新增明细;多行地址将分别建单 +
+ 识别建单 + + 清空
- -
@@ -403,6 +414,7 @@ import { orderPendingOrderParseAddress, type PendingOrderParseAddressData } from '@/api/order.pendingorder/orderpendingOrder' +import { parseOrderListResponse } from '../utils/order-index-helpers' import type { PendingOrderCreateOrderParams } from '@/api/order.pendingorder/orderpendingOrder' import { buildCityOptions, @@ -521,6 +533,7 @@ const activePreviewRowKey = ref('') const selectedPreviewRowKeys = ref>(new Set()) const addressPasteText = ref('') const parseAddressLoading = ref(false) +const checkDeliveryCodeLoading = ref(false) const selectProductDialogVisible = ref(false) const selectProductTargetRow = ref(null) @@ -813,7 +826,7 @@ function hasUnmatchedItems(row: ImportPreviewRow): boolean { function getRowIssues(row: ImportPreviewRow): string[] { const issues: string[] = [] - if (row._orderExists) issues.push('订单号已存在') + if (row._orderExists) issues.push('发货单号已存在') if (isRequiredFieldEmpty(row, 'store_id')) issues.push('货主未选择') if (isRequiredFieldEmpty(row, 'shop_nick')) issues.push('自定义店铺未填写') if (isRequiredFieldEmpty(row, 'name')) issues.push('收件人未填写') @@ -1012,7 +1025,7 @@ function getNextPreviewRowTemplate(copyFrom?: ImportPreviewRow): ImportPreviewRo return { ...base, delivery_order_code: lastRow.delivery_order_code, - store_id: lastRow.store_id ?? defaultStoreId.value, + store_id: defaultStoreId.value ?? lastRow.store_id, shop_nick: lastRow.shop_nick, remark: lastRow.remark, logistics_code: lastRow.logistics_code, @@ -1059,6 +1072,135 @@ function markPreviewRowDirty(row: ImportPreviewRow) { importOrderResult.value = null } +function handleDeliveryOrderCodeChange(row: ImportPreviewRow) { + row._orderExists = false + markPreviewRowDirty(row) +} + +function getPreviewRowDeliveryOrderCode(row: ImportPreviewRow) { + return String(row.delivery_order_code || '').trim() +} + +function resolveExistingDeliveryOrderCode(order: Record) { + return String(order?.delivery_order_code || order?.order_code || '').trim() +} + +async function queryPendingOrdersByDeliveryCodes(codes: string[]) { + const normalizedCodes = [...new Set(codes.map((code) => String(code || '').trim()).filter(Boolean))] + if (!normalizedCodes.length) return [] + + const res: any = await orderPendingOrder.list({ + pagination: { page: 1, pageSize: Math.max(50, normalizedCodes.length * 10) }, + where: { + delivery_order_code: { + operator: 'contains', + value: normalizedCodes, + type: 'text' + } + }, + sort: { + sortField: 'updated_at', + sortOrder: 'DESC' + } + }) + const ok = res && (res.code === 1 || res.code === 200 || res.flag === 'success') + if (!ok) return [] + const data = parseOrderListResponse(res) + const targetSet = new Set(normalizedCodes) + return data.list.filter((order) => { + const existingCode = resolveExistingDeliveryOrderCode(order) + return existingCode && targetSet.has(existingCode) + }) +} + +const DELIVERY_CODE_CHECK_BATCH_SIZE = 5 +const DELIVERY_CODE_CHECK_MAX_CONCURRENT = 5 + +function chunkDeliveryOrderCodes(codes: string[], size = DELIVERY_CODE_CHECK_BATCH_SIZE) { + const chunks: string[][] = [] + for (let i = 0; i < codes.length; i += size) { + chunks.push(codes.slice(i, i + size)) + } + return chunks +} + +async function runWithConcurrencyLimit( + items: T[], + limit: number, + worker: (item: T) => Promise +) { + if (!items.length) return + let cursor = 0 + const poolSize = Math.min(limit, items.length) + await Promise.all( + Array.from({ length: poolSize }, async () => { + while (cursor < items.length) { + const item = items[cursor] + cursor += 1 + if (item === undefined) continue + await worker(item) + } + }) + ) +} + +/** 5 个发货单号合并为 1 次 contains 查询;最多 5 个请求并发,循环直到全部单号查完 */ +async function findExistingDeliveryOrderCodes(codes: string[]) { + const existingCodeSet = new Set() + const uniqueCodes = [...new Set(codes.map((code) => String(code || '').trim()).filter(Boolean))] + const batches = chunkDeliveryOrderCodes(uniqueCodes) + + await runWithConcurrencyLimit(batches, DELIVERY_CODE_CHECK_MAX_CONCURRENT, async (batch) => { + const matches = await queryPendingOrdersByDeliveryCodes(batch) + for (const order of matches) { + const code = resolveExistingDeliveryOrderCode(order) + if (code) existingCodeSet.add(code) + } + }) + + return existingCodeSet +} + +async function handleCheckDeliveryOrderCodes() { + const rowsWithCode = importPreviewRows.value.filter((row) => getPreviewRowDeliveryOrderCode(row)) + if (!rowsWithCode.length) { + ElMessage.warning('请先填写发货单号') + return + } + + importPreviewRows.value.forEach((row) => { + row._orderExists = false + }) + + const uniqueCodes = rowsWithCode.map((row) => getPreviewRowDeliveryOrderCode(row)) + checkDeliveryCodeLoading.value = true + + try { + const existingCodeSet = await findExistingDeliveryOrderCodes(uniqueCodes) + + let duplicateRowCount = 0 + for (const row of importPreviewRows.value) { + const code = getPreviewRowDeliveryOrderCode(row) + if (code && existingCodeSet.has(code)) { + row._orderExists = true + duplicateRowCount += 1 + } + } + + if (!duplicateRowCount) { + ElMessage.success('未发现重复发货单号') + return + } + + ElMessage.warning(`发现 ${existingCodeSet.size} 个重复发货单号,共 ${duplicateRowCount} 行`) + } catch (error) { + console.error('check delivery order code failed:', error) + ElMessage.error('发货单号查重失败') + } finally { + checkDeliveryCodeLoading.value = false + } +} + function resetImportOrderDialog() { importOrderFileName.value = '' importPreviewRows.value = [] @@ -1691,6 +1833,86 @@ function applyParsedAddressToRow(row: ImportPreviewRow, data: PendingOrderParseA markPreviewRowDirty(row) } +function createPreviewRowFromParsedAddress( + data: PendingOrderParseAddressData, + fallbackAddress?: string +): ImportPreviewRow { + const nextRow = getNextPreviewRowTemplate() + applyParsedAddressToRow(nextRow, data) + if (!nextRow.detail_address && fallbackAddress) { + nextRow.detail_address = fallbackAddress + } + return nextRow +} + +function splitAddressPasteLines(text: string) { + return text + .split(/\r?\n/) + .map((line) => line.trim()) + .filter(Boolean) +} + +async function handleCreateOrderFromAddress() { + const addressLines = splitAddressPasteLines(addressPasteText.value) + if (!addressLines.length) { + ElMessage.warning('请粘贴地址') + return + } + + parseAddressLoading.value = true + const createdRows: ImportPreviewRow[] = [] + const failedAddresses: string[] = [] + + try { + for (const address of addressLines) { + try { + const res = await orderPendingOrderParseAddress({ address }) + const ok = res && (res.code === 1 || res.code === 200 || (res as any).flag === 'success') + if (!ok) { + failedAddresses.push(address) + continue + } + + const data = extractPendingOrderParseAddressData(res) + createdRows.push(createPreviewRowFromParsedAddress(data, address)) + } catch (error) { + console.error('create order from address failed:', error) + failedAddresses.push(address) + } + } + + if (!createdRows.length) { + ElMessage.error('地址解析失败,未能新增明细') + return + } + + importPreviewRows.value.push(...createdRows) + renumberPreviewRows() + importOrderResult.value = null + if (!importOrderFileName.value) { + importOrderFileName.value = '手动录入' + } + + clearPreviewRowSelection() + const lastRow = createdRows[createdRows.length - 1] + if (lastRow) { + void selectPreviewRow(lastRow) + } + addressPasteText.value = '' + + if (failedAddresses.length) { + ElMessage.warning( + `已新增 ${createdRows.length} 行明细,${failedAddresses.length} 条地址解析失败` + ) + return + } + + ElMessage.success(createdRows.length > 1 ? `已新增 ${createdRows.length} 行明细` : '已新增明细') + } finally { + parseAddressLoading.value = false + } +} + async function handleParseAddress() { const targetRows = selectedPreviewRowsForAddress.value if (!targetRows.length) { diff --git a/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue b/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue index a6846f6b..4c5293d1 100644 --- a/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue +++ b/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue @@ -105,6 +105,15 @@ function displayFieldValue(field: OrderDetailFieldConfig) { const raw = getFieldRawValue(field.prop) if (raw === undefined || raw === null || raw === '') return '-' + if (typeof raw === 'object') { + try { + const text = JSON.stringify(raw) + return text === '{}' || text === '[]' ? '-' : text + } catch { + return '-' + } + } + if (field.waybill) { return formatWaybillCodes(raw) } diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 715e356e..d3085f0f 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -108,6 +108,23 @@ export const COMMON_TRANSLATIONS: Record> = { recheck_status: { 'none': '未复核', 'fin': '已复核' + }, + lock_status: { + none: '未锁定', + warehouse: '仓库锁定' + }, + claim_status: { + none: '未认领', + fin: '已认领' + }, + sended_status: { + none: '未发货', + padding: '发货中', + fin: '已发货' + }, + print_lock_status: { + none: '未锁定', + warehouse: '仓库锁定' } } @@ -196,6 +213,23 @@ export const COMMON_TAG_TYPES: Record> = { recheck_status: { 'none': 'info', 'fin': 'success' + }, + lock_status: { + none: 'info', + warehouse: 'warning' + }, + claim_status: { + none: 'info', + fin: 'success' + }, + sended_status: { + none: 'info', + padding: 'warning', + fin: 'success' + }, + print_lock_status: { + none: 'info', + warehouse: 'warning' } } @@ -252,7 +286,7 @@ export const ORDER_TOOLBAR_BUTTONS: Record = { columnConfig: { key: 'columnConfig', label: '字段设置', size: 'small', action: 'openColumnConfigPanel' }, toggleDetail: { key: 'toggleDetail', label: '显示详情', dynamicLabelKey: 'detailToggleLabel', size: 'small', action: 'toggleDetailVisible' }, reverseReview: { key: 'reverseReview', label: '反审回待审核', size: 'small', loadingKey: 'actionLoading', disabledKey: 'hasNoSelection', action: 'handleReverseReview' }, - markPendingOutbound: { key: 'markPendingOutbound', label: '标记待出库', size: 'small', type: 'warning', loadingKey: 'actionLoading', disabledKey: 'hasNoSelection', action: 'handleMarkPendingOutbound' }, + // markPendingOutbound: { key: 'markPendingOutbound', label: '标记待出库', size: 'small', type: 'warning', loadingKey: 'actionLoading', disabledKey: 'hasNoSelection', action: 'handleMarkPendingOutbound' }, allocateStorage: { key: 'allocateStorage', label: '分配储位', size: 'small', type: 'primary', plain: true, loadingKey: 'storageAllocateLoading', disabledKey: 'hasNoSelection', action: 'openStorageAllocateDialog' }, cancelAllocateStorage: { key: 'cancelAllocateStorage', label: '取消分配储位', size: 'small', type: 'danger', plain: true, loadingKey: 'storageAllocateLoading', disabledKey: 'hasNoSelection', action: 'openStorageCancelDialog' }, waveSingleFetchByIds: { @@ -997,16 +1031,21 @@ export const deliveryAvailableFields = [ export const deliveryColumns = [ { prop: 'delivery_order_code', label: '发货单号', width: '170', fixed: 'left' }, + { prop: 'pre_delivery_order_code', label: '前置单号', width: '150' }, { prop: 'shop_nick', label: '店铺名称', width: '140' }, { prop: 'wave_no', label: '波次号', width: '150' }, + { prop: 'wave_id', label: '波次ID', width: '90' }, { prop: 'order_flag', label: '订单标记', minWidth: '220' }, { prop: 'sys_platform_name', label: '来源', width: '110' }, + { prop: 'sys_platform_code', label: '平台编码', width: '100' }, { prop: 'order_type', label: '订单类型', width: '90', formatter: orderTypeFormatter }, { prop: 'buyer_nick', label: '买家昵称', width: '120' }, + { prop: 'seller_nick', label: '卖家昵称', width: '120' }, { prop: 'name', label: '收件人', width: '100' }, { prop: 'mobile', label: '电话', width: '120' }, { prop: 'province', label: '省份', width: '90' }, { prop: 'city', label: '城市', width: '90' }, + { prop: 'area', label: '区/县', width: '90' }, { prop: 'status', label: '订单状态', width: '100' }, { prop: 'outbound_status', label: '出库状态', width: '100' }, { prop: 'sync_status', label: '同步状态', width: '100' }, @@ -1017,19 +1056,30 @@ export const deliveryColumns = [ { prop: 'print_status', label: '打印状态', width: '100' }, { prop: 'pick_status', label: '拣货状态', width: '90' }, { prop: 'pack_status', label: '打包状态', width: '90' }, + { prop: 'claim_status', label: '认领状态', width: '100' }, + { prop: 'lock_status', label: '锁定状态', width: '100' }, { prop: 'intercept_status', label: '拦截状态', width: '100', tag: true }, { prop: 'logistics_name', label: '快递', width: '120' }, + { prop: 'sys_logistics_name', label: '系统快递', width: '120' }, { prop: 'express_numbers', label: '运单号', width: '160', formatter: waybillCodesFormatter }, { prop: 'waybill_codes', label: '运单号', width: '150', formatter: waybillCodesFormatter }, { prop: 'source_order_codes', label: '来源单号', width: '140' }, { prop: 'is_urgency', label: '是否紧急', width: '80' }, + { prop: 'invoice_flag', label: '发票', width: '80' }, + { prop: 'weight_type', label: '重量类型', width: '90' }, + { prop: 'delivery_type', label: '配送类型', width: '100' }, + { prop: 'basket_number', label: '篮号', width: '90' }, { prop: 'items_count', label: '商品种类', width: '90' }, { prop: 'items_total', label: '商品总数', width: '90' }, { prop: 'items_weight', label: '总重量', width: '90' }, { prop: 'total_amount', label: '订单金额', width: '100' }, + { prop: 'item_amount', label: '商品金额', width: '100' }, + { prop: 'freight', label: '运费', width: '90' }, { prop: 'remark', label: '留言', width: '140' }, + { prop: 'operator_name', label: '操作人', width: '100' }, { prop: 'pay_time', label: '支付时间', width: '160', formatter: orderTimeFormatter }, { prop: 'delivery_time', label: '配送时间', width: '160', formatter: orderTimeFormatter }, + { prop: 'operate_time', label: '操作时间', width: '160', formatter: orderTimeFormatter }, { prop: 'place_order_time', label: '时效', width: '160', formatter: orderTimeFormatter }, { prop: 'create_at', label: '创建时间', width: '160', formatter: orderTimeFormatter }, ] @@ -1044,18 +1094,41 @@ function appendOrderDetailSectionFields( })) } -/** 配送订单详情分区(在通用订单详情基础上补充配送高频字段) */ +/** 配送订单详情分区(在通用订单详情基础上补充 data.json 返回但未展示的字段) */ export const deliveryOrderDetailSections = appendOrderDetailSectionFields(pendingOrderDetailSections, { '基础信息': [ + { prop: 'id', label: '订单ID' }, + { prop: 'pre_delivery_order_id', label: '前置单ID' }, + { prop: 'warehouse_code', label: '仓库编码' }, + { prop: 'source_platform_code', label: '来源平台编码', tag: true }, + { prop: 'service_code', label: '服务编码' }, + { prop: 'from_key', label: '来源键' }, + { prop: 'oaid', label: 'OAID' }, + { prop: 'delete_at', label: '删除时间', time: true }, { prop: 'remark', label: '备注', span: 4 }, { prop: 'buyer_message', label: '买家留言', span: 2 }, - { prop: 'seller_message', label: '卖家留言', span: 2 } + { prop: 'seller_message', label: '卖家留言', span: 2 }, + { prop: 'extend_props', label: '扩展属性', span: 4 } ], '流程与状态': [ - { prop: 'basket_number', label: '篮号' } + { prop: 'basket_number', label: '篮号' }, + { prop: 'wave_strategy_version', label: '波次策略版本' }, + { prop: 'wave_scan_result', label: '波次扫描结果' }, + { prop: 'print_lock_status', label: '打印锁定', tag: true }, + { prop: 'dispatch_lane', label: '配送通道' } + ], + '收货与物流': [ + { prop: 'sys_logistics_code', label: '系统快递编码' }, + { prop: 'sys_logistics_name', label: '系统快递名称' }, + { prop: 'logistics_area_code', label: '物流区域编码' }, + { prop: 'country_code', label: '国家编码' }, + { prop: 'id_type', label: '证件类型' }, + { prop: 'id_number', label: '证件号码' } ], '金额汇总': [ - { prop: 'items', label: '商品明细摘要', span: 4 } + { prop: 'items', label: '商品明细摘要', span: 4 }, + { prop: 'items_hash', label: '商品哈希', span: 2 }, + { prop: 'items_crc', label: '商品CRC' } ] }) diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index 9e688e77..40930b3c 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -125,6 +125,24 @@ + + + + + +