diff --git a/dist.tar.gz b/dist.tar.gz index c361d477..8d2041c6 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/order.pendingOrder/orderpendingOrder.ts b/src/api/order.pendingOrder/orderpendingOrder.ts index 4feb4b7f..857cb87b 100644 --- a/src/api/order.pendingOrder/orderpendingOrder.ts +++ b/src/api/order.pendingOrder/orderpendingOrder.ts @@ -16,8 +16,6 @@ export type { export const orderPendingOrderDownloadCreateTemplate = orderModulePendingOrderDownloadCreateTemplate; export const orderPendingOrderManualWaybill = orderModulePendingOrderManualWaybill; -// 啊大王大大 - export type OrderWhere = Record; export type OrderSort = { sortField?: string; @@ -769,5 +767,5 @@ export const orderPendingOrder: OrderPendingOrderApi = { batchLock: orderPendingOrderBatchLock, batchLockTaskProgress: orderPendingOrderBatchLockTaskProgress, batchUnlock: orderPendingOrderBatchUnlock, - batchUnlockTaskProgress: orderPendingOrderBatchUnlockTaskProgress + batchUnlockTaskProgress: orderPendingOrderBatchUnlockTaskProgress, }; diff --git a/src/api/pick/pick.ts b/src/api/pick/pick.ts index 97c6717c..9ac0b4d1 100644 --- a/src/api/pick/pick.ts +++ b/src/api/pick/pick.ts @@ -110,6 +110,36 @@ export type PickWavePickTaskCompleteResponse = { progress: Record } +export type PickWavePickCompleteParams = { + wave_id: number +} + +export type PickWavePickCompleteResponse = { + task_id: number + status: string + tip: string + confirmed_order_ids?: Array + is_completed?: boolean + progress?: Record +} + +/** pick.wavePickComplete:按波次 ID 一键完成整个波次的拣货 */ +export function pickWavePickComplete( + data: PickWavePickCompleteParams +): Promise }> { + return request({ + url: '/system', + method: 'post', + params: { + method: 'pick.wavePickComplete', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + /** pick.wavePickTaskComplete:完全提交拣货任务 */ export function pickWavePickTaskComplete( data: PickWavePickTaskCompleteParams @@ -129,6 +159,7 @@ export function pickWavePickTaskComplete( export const pick = { query: pickQuery, + wavePickComplete: pickWavePickComplete, wavePickTaskDetail: pickWavePickTaskDetail, wavePickTaskSubmit: pickWavePickTaskSubmit, wavePickTaskComplete: pickWavePickTaskComplete diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 4f8d352d..f8695e9a 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -64,16 +64,17 @@ export const COMMON_TRANSLATIONS: Record> = { 'none': '未分配' }, outbound_status: { - 'none': '未出库', - 'padding': '待出库', - 'pending': '待出库', - 'pedding': '待出库', - 'processing': '出库中', - 'fin': '已出库', - 'done': '已出库', - 'finished': '已出库', - 'error': '出库异常', - 'failed': '出库失败' + 'none': '未归档', + 'padding': '归档中', + 'pending': '归档中', + 'pedding': '归档中', + 'processing': '归档中', + 'fin': '已归档', + 'done': '已归档', + 'finished': '已归档', + 'archived': '已归档', + 'error': '归档异常', + 'failed': '归档失败' }, order_type: { 'JYCK': '交易出库', @@ -206,6 +207,7 @@ export const COMMON_TAG_TYPES: Record> = { 'fin': 'success', 'done': 'success', 'finished': 'success', + 'archived': 'success', 'error': 'danger', 'failed': 'danger' }, @@ -724,8 +726,7 @@ export const orderDetailFullSections: OrderDetailSectionConfig[] = [ { prop: 'warehouse_code', label: '仓库编码' }, { prop: 'create_channel', label: '来源' }, { prop: 'order_flag', label: '订单标记', span: 4, multiline: true }, - { prop: 'sys_platform_name', label: '平台' }, - { prop: 'sys_platform_code', label: '平台编码', tag: true }, + { prop: 'sys_platform_name', label: '平台编码' }, { prop: 'source_platform_name', label: '来源平台名' }, { prop: 'source_platform_code', label: '来源平台编码', tag: true }, { prop: 'source_order_codes', label: '平台交易单号' }, @@ -755,7 +756,7 @@ export const orderDetailFullSections: OrderDetailSectionConfig[] = [ { prop: 'sync_status', label: '同步状态', tag: true }, { prop: 'inspection_status', label: '审核状态', tag: true }, { prop: 'recheck_status', label: '复核状态', tag: true }, - { prop: 'outbound_status', label: '出库状态', tag: true }, + { prop: 'outbound_status', label: '数据归档', tag: true }, { prop: 'storage_status', label: '储位状态', tag: true }, { prop: 'post_status', label: '快递状态', tag: true }, { prop: 'pick_status', label: '拣货状态', tag: true }, @@ -865,7 +866,7 @@ export const orderDetailCompactSections: OrderDetailSectionConfig[] = [ { prop: 'recheck_status', label: '复核状态', tag: true }, { prop: 'storage_status', label: '储位状态', tag: true }, { prop: 'post_status', label: '快递状态', tag: true }, - { prop: 'outbound_status', label: '出库状态', tag: true }, + { prop: 'outbound_status', label: '数据归档', tag: true }, { prop: 'wave_no', label: '波次号' }, { prop: 'pick_status', label: '拣货状态', tag: true }, { prop: 'pack_status', label: '打包状态', tag: true }, @@ -1068,9 +1069,9 @@ export const printStatusFilterOptions = [ ] export const outboundStatusFilterOptions = [ - { label: '未出库', value: 'none' }, - { label: '待出库', value: 'padding' }, - { label: '已出库', value: 'fin' }, + { label: '未归档', value: 'none' }, + { label: '归档中', value: 'padding' }, + { label: '已归档', value: 'fin' }, ] export const interceptStatusFilterOptions = [ @@ -1152,7 +1153,7 @@ export const pendingOrderCodeScanField = scanBasicField({ label: '发货单号', export const exceptionOrderCodeScanField = scanBasicField({ label: '发货单号', value: 'order_code', type: 'text', operators: ORDER_BULK_SEARCH_OPERATORS, defaultOperator: 'eq' }) export const shopNickScanField = scanBasicField({ label: '店铺名称', value: 'shop_nick', type: 'text' }) export const sysPlatformNameScanField = scanBasicField({ label: '平台', value: 'sys_platform_name', type: 'select', options: [] }) -export const sysPlatformCodeScanField = scanBasicField({ label: '平台编码', value: 'sys_platform_code', type: 'select', options: [] }) +export const sysPlatformCodeScanField = scanBasicField({ label: '平台编码', value: 'sys_platform_name', type: 'select', options: [] }) export const buyerNickScanField = scanBasicField({ label: '买家昵称', value: 'buyer_nick', type: 'text' }) export const receiverNameScanField = scanBasicField({ label: '收件人', value: 'name', type: 'text' }) export const receiverMobileScanField = scanBasicField({ label: '电话', value: 'mobile', type: 'text' }) @@ -1181,7 +1182,7 @@ export const postStatusScanField = scanWorkflowField({ label: '快递状态', va export const pickStatusScanField = scanWorkflowField({ label: '拣货状态', value: 'pick_status', type: 'select', options: pickStatusFilterOptions }) export const packStatusScanField = scanWorkflowField({ label: '打包状态', value: 'pack_status', type: 'select', options: packStatusFilterOptions }) export const printStatusScanField = scanWorkflowField({ label: '打印状态', value: 'print_status', type: 'select', options: printStatusFilterOptions }) -export const outboundStatusScanField = scanWorkflowField({ label: '出库状态', value: 'outbound_status', type: 'select', options: outboundStatusFilterOptions }) +export const outboundStatusScanField = scanWorkflowField({ label: '数据归档', value: 'outbound_status', type: 'select', options: outboundStatusFilterOptions }) export const claimStatusScanField = scanWorkflowField({ label: '认领状态', value: 'claim_status', type: 'select', options: claimStatusFilterOptions }) export const lockStatusScanField = scanWorkflowField({ label: '锁定状态', value: 'lock_status', type: 'select', options: lockStatusFilterOptions }) export const interceptStatusScanField = scanWorkflowField({ label: '拦截状态', value: 'intercept_status', type: 'select', options: interceptStatusFilterOptions }) @@ -1367,7 +1368,7 @@ export const deliveryColumns = applyOrderListCopyActions([ { prop: 'order_flag', label: '订单标记', minWidth: '220' }, { prop: 'sys_platform_name', label: '平台', width: '110' }, { prop: 'create_channel', label: '来源', width: '120' }, - { prop: 'sys_platform_code', label: '平台编码', width: '100' }, + { prop: 'sys_platform_name', label: '平台编码', width: '100' }, { prop: 'order_type', label: '订单类型', width: '90', formatter: orderTypeFormatter }, { prop: 'buyer_nick', label: '买家昵称', width: '120' }, { prop: 'seller_nick', label: '卖家昵称', width: '120' }, @@ -1378,7 +1379,7 @@ export const deliveryColumns = applyOrderListCopyActions([ { prop: 'city', label: '城市', width: '90' }, { prop: 'area', label: '区/县', width: '90' }, { prop: 'status', label: '订单状态', width: '100' }, - { prop: 'outbound_status', label: '出库状态', width: '100' }, + { prop: 'outbound_status', label: '数据归档', width: '100' }, { prop: 'sync_status', label: '同步状态', width: '100' }, { prop: 'inspection_status', label: '审核状态', width: '100' }, { prop: 'recheck_status', label: '复核状态', width: '100' }, @@ -1494,7 +1495,7 @@ export const reviewColums = applyOrderListCopyActions([ { prop: 'order_flag', label: '订单标记', minWidth: '260' }, { prop: 'shop_nick', label: '店铺名称', width: '140' }, orderStoreRemarkColumn, - { prop: 'sys_platform_code', label: '平台编码', width: '100' }, + { prop: 'sys_platform_name', label: '平台编码', width: '100' }, { prop: 'name', label: '收件人', width: '110' }, { prop: 'status', label: '订单状态', width: '100' }, { prop: 'sync_status', label: '同步状态', width: '100' }, @@ -1518,9 +1519,8 @@ export const reviewOrderDetail = [ { prop: 'pre_delivery_order_code', label: '前置单号' }, { prop: 'order_type', label: '订单类型' }, { prop: 'order_flag', label: '订单标记' }, - { prop: 'sys_platform_name', label: '平台' }, { prop: 'create_channel', label: '来源' }, - { prop: 'sys_platform_code', label: '平台编码' }, + { prop: 'sys_platform_name', label: '平台编码' }, { prop: 'shop_nick', label: '店铺名称' }, { prop: 'buyer_nick', label: '买家昵称' }, { prop: 'seller_nick', label: '卖家昵称' }, @@ -1657,6 +1657,7 @@ export const pendingCloums = [ { prop: 'order_flag', label: '订单标记', minWidth: '260' }, { prop: 'shop_nick', label: '店铺名称', width: '140' }, orderStoreRemarkColumn, + { prop: 'sys_platform_name', label: '平台编码', width: '100' }, { prop: 'name', label: '收件人', width: '110' }, { prop: 'mobile', label: '电话', width: '120' }, { prop: 'buyer_message', label: '买家留言', minWidth: '180' }, @@ -1676,7 +1677,6 @@ export const pendingCloums = [ { prop: 'create_at', label: '创建时间', width: '165', formatter: orderTimeFormatter }, { prop: 'pay_time', label: '支付时间', width: '160', formatter: orderTimeFormatter }, { prop: 'place_order_time', label: '时效', width: '165', formatter: orderTimeFormatter }, - { prop: 'sys_platform_name', label: '平台', width: '120' }, { prop: 'create_channel', label: '来源', width: '120' }, { prop: 'source_order_codes', label: '平台交易单号', width: '140' }, { prop: 'logistics_name', label: '快递', width: '120' }, @@ -1688,10 +1688,9 @@ export const ORDER_LIST_FIELD_LABELS: Record = { ...Object.fromEntries(pendingCloums.map((col) => [col.prop, col.label])), recheck_status: '复核状态', print_status: '打印状态', - outbound_status: '出库状态', + outbound_status: '数据归档', inspection_status: '审核状态', order_code: '发货单号', - sys_platform_code: '平台编码', total_amount: '订单金额', source_order_codes: '平台交易单号', order_type: '订单类型', @@ -1741,9 +1740,8 @@ export const pendingOrderDetail = [ { prop: 'pre_delivery_order_code', label: '前置单号' }, { prop: 'order_type', label: '订单类型' }, { prop: 'order_flag', label: '订单标记' }, - { prop: 'sys_platform_name', label: '平台' }, { prop: 'create_channel', label: '来源' }, - { prop: 'sys_platform_code', label: '平台编码' }, + { prop: 'sys_platform_name', label: '平台编码' }, { prop: 'shop_nick', label: '店铺名称' }, { prop: 'buyer_nick', label: '买家昵称' }, { prop: 'seller_nick', label: '卖家昵称' }, @@ -1917,7 +1915,7 @@ export const workbenchColumns = applyOrderListCopyActions([ { prop: 'status', label: '订单状态', minWidth: 120 }, { prop: 'sync_status', label: '同步状态', minWidth: 110 }, { prop: 'inspection_status', label: '审核状态', minWidth: 110 }, - { prop: 'outbound_status', label: '出库状态', minWidth: 120 }, + { prop: 'outbound_status', label: '数据归档', minWidth: 120 }, { prop: 'logistics_name', label: '快递', minWidth: 120 }, { prop: 'waybill_codes', label: '运单号', minWidth: 140, formatter: waybillCodesFormatter }, { prop: 'items_total', label: '商品总数', minWidth: 100 }, @@ -1979,7 +1977,7 @@ export const expectionColumns = [ { prop: 'id', label: '订单ID', width: '80' }, { prop: 'delivery_order_code', label: '发货单号', width: '170' }, { prop: 'wave_no', label: '波次号', width: '170' }, - { prop: 'sys_platform_name', label: '平台', width: '120' }, + { prop: 'sys_platform_name', label: '平台编码', width: '120' }, { prop: 'create_channel', label: '来源', width: '120' }, { prop: 'shop_nick', label: '店铺名称', width: '140' }, orderStoreRemarkColumn, diff --git a/src/views/order/orderManagement/form/ManualWaybillForm.vue b/src/views/order/orderManagement/form/ManualWaybillForm.vue index ed29c3da..1a0d27af 100644 --- a/src/views/order/orderManagement/form/ManualWaybillForm.vue +++ b/src/views/order/orderManagement/form/ManualWaybillForm.vue @@ -11,7 +11,7 @@ type="info" :closable="false" show-icon - title="为指定待处理订单创建运单记录(wms_order_express),仅允许步骤为 1~3 且出库状态非待出库的订单。" + title="为指定待处理订单创建运单记录(wms_order_express),仅允许步骤为 1~3 且数据归档状态非归档中的订单。" class="manual-waybill-alert" /> --> - - + +