diff --git a/src/api/afterSale/index.ts b/src/api/afterSale/index.ts index 6dd241ae..401e5675 100644 --- a/src/api/afterSale/index.ts +++ b/src/api/afterSale/index.ts @@ -12,7 +12,7 @@ const v = '1.0' export type AfterSaleType = 'order' | 'receiving' | 'entry' | 'stockout' /** 售后状态 */ -export type AfterSaleStatus = 'pending' | 'processing' | 'completed' | 'closed' | 'cancelled' +export type AfterSaleStatus = 'pending' | 'pending_feedback' | 'processing' | 'completed' | 'closed' | 'cancelled' /** 角色组 */ export type AfterSaleRoleGroup = 'customer_service' | 'warehouse' | 'finance' @@ -291,6 +291,16 @@ export interface AfterSaleHandleWorkOrderParams { attachment_ids?: number[] } +/** afterSale.handleWorkOrder 响应 */ +export interface AfterSaleHandleWorkOrderResponse { + /** 本次写入的步骤ID(wms_after_sale_detail.id) */ + detail_id: number + /** 售后工单ID */ + after_sale_id: number + /** 处理备注发送到的货主售后群数量(未填写备注或未找到货主售后群时为0) */ + notified_groups?: number +} + /** 登记理赔参数 */ export interface AfterSaleRegisterClaimParams { id: number @@ -439,7 +449,9 @@ export function afterSaleTransfer(data: AfterSaleTransferParams) { } /** 2.7 处理工单 afterSale.handleWorkOrder */ -export function afterSaleHandleWorkOrder(data: AfterSaleHandleWorkOrderParams) { +export function afterSaleHandleWorkOrder( + data: AfterSaleHandleWorkOrderParams +): Promise { return request({ url: '/system', method: 'post', diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index 48d13244..c9724a2e 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -968,6 +968,7 @@ export type WaveSingleFetchByIdsResponse = { fetched_order_ids: Array fetched_order_count: number excluded_existing_wave_order_ids?: Array + excluded_locked_order_ids?: Array skipped_order_ids?: Array not_found_order_ids?: Array } diff --git a/src/api/setting.expressinterface/expressInterface.ts b/src/api/setting.expressinterface/expressInterface.ts index 38b7a510..aba907ec 100644 --- a/src/api/setting.expressinterface/expressInterface.ts +++ b/src/api/setting.expressinterface/expressInterface.ts @@ -96,6 +96,10 @@ export type ExpressInterfaceUpdateParams = { is_enabled?: number /** 发件人详细地址,使用 index.getShopExpressList 返回的 detail 字段值 */ address?: string + province_name?: string + city_name?: string + district_name?: string + town_name?: string } export function expressInterfaceUpdate(data: ExpressInterfaceUpdateParams & Record) { diff --git a/src/api/storeWarehouse.store/storeWarehouse.ts b/src/api/storeWarehouse.store/storeWarehouse.ts index 4d45c6d7..d9e7442d 100644 --- a/src/api/storeWarehouse.store/storeWarehouse.ts +++ b/src/api/storeWarehouse.store/storeWarehouse.ts @@ -79,10 +79,52 @@ export function storeWarehouseSign(data: { } as any) } -/** 货主确认签约 */ -export function storeWarehouseConfirmSign(data: { +/** storeWarehouse.store.confirmSign 响应中的签约关系精简对象 */ +export interface StoreWarehouseConfirmSignContract { + /** 签约关系主键 ID */ id: number -}) { + /** 货主方主体 ID */ + store_id: number + /** 仓库方主体 ID */ + warehouse_id: number + /** 对方主体名称 */ + counterparty_name: string + /** 当前主体视角的签约备注名 */ + remask: string + /** 当前主体启用状态:0=禁用 1=启用 */ + use_status: number + /** 签约状态:1=申请中 2=已通过 3=已拒绝 4=已解除 5=已过期 */ + auth_status: number + /** 签约状态中文标签 */ + auth_status_label: string + /** 授权结束时间 */ + auth_end: string | null + /** 面单余额数量 */ + print_quantity: number + /** 是否已配置奇门 */ + has_qimen_config: boolean +} + +/** storeWarehouse.store.confirmSign 响应数据 */ +export interface StoreWarehouseConfirmSignData { + /** 确认模式标识,固定为 confirm */ + mode: string + /** 签约关系精简对象 */ + contract: StoreWarehouseConfirmSignContract +} + +/** storeWarehouse.store.confirmSign 响应(含请求封装层) */ +export interface StoreWarehouseConfirmSignResponse { + flag?: string + code?: number + message?: string + data?: StoreWarehouseConfirmSignData +} + +/** 货主确认签约 */ +export function storeWarehouseConfirmSign( + data: { id: number } +): Promise { return request({ url: '/system', method: 'post', diff --git a/src/api/storewarehouse.warehouse/storeWarehouse.ts b/src/api/storewarehouse.warehouse/storeWarehouse.ts index 81f7089f..64355029 100644 --- a/src/api/storewarehouse.warehouse/storeWarehouse.ts +++ b/src/api/storewarehouse.warehouse/storeWarehouse.ts @@ -21,3 +21,40 @@ export function storeWarehouseWarehouseList(data: { isSystemApi: true } as any) } + +/** + * 仓库侧发起签约(当前仓库在 store_id 方,对方在 warehouse_id 方,支持签约外部合作仓库) + * - counterparty_id:对方主体 ID(必传,兼容 warehouse_id / store_id) + */ +export function storeWarehouseWarehouseSign(data: { + counterparty_id: number +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storeWarehouse.warehouse.sign', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + +/** 仓库侧确认签约:作为对方主体确认待签约申请,签约状态从 1(申请中)变为 2(已通过) */ +export function storeWarehouseWarehouseConfirmSign(data: { + id: number +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'storeWarehouse.warehouse.confirmSign', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} diff --git a/src/cloc-2.10.exe b/src/cloc-2.10.exe new file mode 100644 index 00000000..1a1c6935 Binary files /dev/null and b/src/cloc-2.10.exe differ diff --git a/src/views/dashboard/components/WelcomCard.vue b/src/views/dashboard/components/WelcomCard.vue index 94c2f43a..b8bd8eff 100644 --- a/src/views/dashboard/components/WelcomCard.vue +++ b/src/views/dashboard/components/WelcomCard.vue @@ -77,6 +77,7 @@ :close-on-click-modal="false" width="50%" @close="handleDialogClose" + align-center >
- + diff --git a/src/views/express/waybill/config/template-config.ts b/src/views/express/waybill/config/template-config.ts index 97449ad0..9334a2c7 100644 --- a/src/views/express/waybill/config/template-config.ts +++ b/src/views/express/waybill/config/template-config.ts @@ -52,7 +52,7 @@ export interface FieldDefinition { key: string label: string scanBox: { - type: 'text' | 'select' | 'daterange' | 'number' + type: 'text' | 'select' | 'daterange' | 'datetimerange' | 'number' group?: string options?: { label: string; value: any }[] multiple?: boolean diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index ce237206..f017ad0d 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -121,8 +121,11 @@ export const COMMON_TRANSLATIONS: Record> = { 'error': '错误' }, lock_status: { + N: '未锁定', + Y: '已锁定', none: '未锁定', - warehouse: '仓库锁定' + warehouse: '已锁定', + store: '已锁定' }, claim_status: { none: '未认领', @@ -241,8 +244,11 @@ export const COMMON_TAG_TYPES: Record> = { 'error': 'danger' }, lock_status: { + N: 'info', + Y: 'warning', none: 'info', - warehouse: 'warning' + warehouse: 'warning', + store: 'warning' }, claim_status: { none: 'info', @@ -1554,6 +1560,7 @@ export const reviewAvailableFields = [ // 流程状态 { ...syncStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...lockStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...orderStatusScanField(reviewOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, // 收货信息 { ...receiverNameScanField, group: SCAN_RECEIVING_INFO_GROUP }, @@ -1577,6 +1584,7 @@ export const reviewColums = applyOrderListCopyActions([ { prop: 'name', label: '收件人', width: '110' }, { prop: 'sync_status', label: '同步状态', width: '100' }, { prop: 'recheck_status', label: '复核状态', width: '100' }, + { prop: 'lock_status', label: '锁定状态', width: '100' }, { prop: 'is_urgency', label: '是否紧急', width: '80' }, { prop: 'logistics_name', label: '快递', width: '120' }, { prop: 'items_total', label: '商品总数', width: '100' }, @@ -1717,6 +1725,7 @@ export const pendingAvailableFields = [ { ...pickStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...packStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...printStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...lockStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...orderStatusScanField(pendingOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, // 收货信息 { ...receiverNameScanField, group: SCAN_RECEIVING_INFO_GROUP }, @@ -1750,6 +1759,7 @@ export const pendingCloums = [ { prop: 'pick_status', label: '拣货状态', width: '100' }, { prop: 'pack_status', label: '打包状态', width: '100' }, { prop: 'intercept_status', label: '拦截状态', width: '100', tag: true }, + { prop: 'lock_status', label: '锁定状态', width: '100' }, { prop: 'express_numbers', label: '快递单号', width: '160', formatter: waybillCodesFormatter }, { prop: 'items_count', label: '商品种类', width: '100' }, { prop: 'items_total', label: '商品总数', width: '100' }, @@ -2082,6 +2092,7 @@ export const expectionOrderAvailableFields = [ { ...interceptStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...recheckStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...printStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, + { ...lockStatusScanField, group: SCAN_PROCESS_STATUS_GROUP }, { ...orderStatusScanField(exceptionOrderStatusFilterOptions), group: SCAN_PROCESS_STATUS_GROUP }, // 收货信息 { ...buyerMessageHasScanField, group: SCAN_RECEIVING_INFO_GROUP }, @@ -2105,6 +2116,7 @@ export const expectionColumns = [ { prop: 'pick_status', label: '拣货状态', width: '100' }, { prop: 'pack_status', label: '打包状态', width: '100' }, { prop: 'intercept_status', label: '拦截状态', width: '100', tag: true }, + { prop: 'lock_status', label: '锁定状态', width: '100' }, { prop: 'express_numbers', label: '运单号', width: '160', formatter: waybillCodesFormatter }, { prop: 'name', label: '收件人', width: '110' }, { prop: 'mobile', label: '电话', width: '120' }, diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index 0b5fd566..6d35073e 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -110,6 +110,12 @@ + + + + + +
+ + @@ -128,6 +138,7 @@ import { useRoute } from 'vue-router' import { ElMessage, ElMessageBox } from 'element-plus' import ScanBox from '@/components/ScanBox/index.vue' import UpperTable from '@/components/UpperTable/index.vue' +import BatchReceivingPrintDialog from '@/components/BatchReceivingPrintDialog.vue' import OrderToolbarButtonGroup from '@/views/order/orderManagement/component/OrderToolbarButtonGroup.vue' import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config' import { safeInvoke } from '@/utils/safe-invoke' @@ -142,6 +153,7 @@ import { syncStatusConfig, stockoutToolbarButtons, formatStockoutData, + formatStockoutListItems, } from './stockout-config' import stockoutdetail from './component/stockoutdetail.vue' @@ -207,6 +219,7 @@ const columns = ref(entryColums) const selectionRows = ref([]) const hasSelection = ref(false) const selectedStockoutId = ref(null) +const printDialogVisible = ref(false) // ── 工具栏状态 ── const buttonLoadingMap = computed(() => ({ @@ -253,6 +266,7 @@ const toolbarActionMap: Record void> = { toggleDetailVisible: () => toggleDetailVisible(), handleCreateStockout: () => handleCreateStockout(), handleImport: () => handleImport(), + handleOpenPrintDialog: () => { void handleOpenPrintDialog() }, confirmBatchCancel: () => { void confirmBatchCancel() } } @@ -403,6 +417,74 @@ function onSelectionChange(rows: any[]) { hasSelection.value = selectionRows.value.length > 0 } +// ── 打印出库单 ── +async function handleOpenPrintDialog() { + if (!selectionRows.value.length) { + ElMessage.warning('请先选择要打印的出库单') + return + } + + // 仅“已完成”状态的出库单可打印 + const invalidRows = selectionRows.value.filter( + row => String(row.order_status || '').toUpperCase() !== 'COMPLETED' + ) + if (invalidRows.length > 0) { + ElMessage.warning(`只有“已完成”状态的单据才能打印。当前选中包含 ${invalidRows.length} 个非已完成单据。`) + return + } + + printDialogVisible.value = true +} + +async function fetchPrintData(row: any, _index: number) { + const formData: any = { + stockout_order_code: row.stockout_order_code || '', + express_code: row.express_code || '', + express_codes: row.express_codes || '', + order_type: row.order_type || '', + source_type: row.source_type || '', + order_status: row.order_status || '', + sync_status: row.sync_status || '', + store_name: row.store_name || row['store.remask'] || row['store.store_remask'] || '', + total_order_lines: row.total_order_lines ?? '', + remark: row.remark || '', + order_create_time: row.order_create_time || '', + created_at: row.created_at || '', + updated_at: row.updated_at || '', + details: [] + } + + try { + const res: any = await stockoutApi.stockoutListItems({ id: Number(row.id) }) + if (res && (res.code === 200 || res.code === 1 || res.flag === 'success')) { + const payload = res.data || res + const order = payload.order || {} + const rows = Array.isArray(payload.list) + ? payload.list + : Array.isArray(payload.items) + ? payload.items + : [] + formData.details = formatStockoutListItems(rows) + Object.assign(formData, { + stockout_order_code: order.stockout_order_code || formData.stockout_order_code, + express_code: order.express_code ?? formData.express_code, + express_codes: order.express_codes ?? formData.express_codes, + order_type: order.order_type ?? formData.order_type, + source_type: order.source_type ?? formData.source_type, + order_status: order.order_status ?? formData.order_status, + store_name: order.store_name ?? formData.store_name, + total_order_lines: order.total_order_lines ?? formData.total_order_lines, + remark: order.remark ?? formData.remark, + order_create_time: order.order_create_time ?? formData.order_create_time + }) + } + } catch (e) { + console.error('加载出库单打印明细失败', e) + } + + return formData +} + // 将 scan-box 返回的条件标准化为后端推荐结构:{ operator, value, type } function normalizeToWhere(condition: any) { if (!condition) return {} diff --git a/src/views/storage/stockout/stockout-config.ts b/src/views/storage/stockout/stockout-config.ts index 2d9d30b6..823dbb58 100644 --- a/src/views/storage/stockout/stockout-config.ts +++ b/src/views/storage/stockout/stockout-config.ts @@ -42,6 +42,14 @@ export const stockoutToolbarButtons: ToolbarButtonConfig[] = [ size: 'small', action: 'handleImport' }, + { + key: 'print', + label: '打印出库单', + category: 'action', + size: 'small', + disabledKey: 'hasNoSelection', + action: 'handleOpenPrintDialog' + }, { key: 'batchCancel', label: '批量作废', @@ -145,9 +153,14 @@ export const entryColums = [ { prop: 'stockout_order_code', label: '出库单号', width: '220', fixed: 'left', copyAction: 'copy' as const }, { prop: 'order_status', label: '出库状态', width: '100' }, { prop: 'sync_status', label: '同步状态', width: '100' }, + { prop: 'sync_message', label: '同步消息', minWidth: '140', showOverflowTooltip: true }, { prop: 'order_type', label: '单据类型', width: '100' }, { prop: 'source_type', label: '来源类型', width: '100' }, - { prop: 'express_code', label: '运单号', width: '120' }, + { prop: 'qimen_owner_code', label: '奇门货主编码', width: '140' }, + { prop: 'qimen_warehouse_code', label: '奇门仓库编码', width: '140' }, + { prop: 'express_codes', label: '运单号', width: '140' }, + { prop: 'express_code', label: '快递编码', width: '110' }, + { prop: 'express_name', label: '快递名称', width: '110' }, { prop: 'total_order_lines', label: '订单行数', width: '90' }, { prop: 'remark', label: '备注', minWidth: '150' }, { prop: 'order_create_time', label: '下单时间', width: '160', sortable: true, formatter: (row: any) => formatDateTime(row.order_create_time) }, diff --git a/src/views/store/shipperSigning/index.vue b/src/views/store/shipperSigning/index.vue index 7b0a6a43..c459b6e3 100644 --- a/src/views/store/shipperSigning/index.vue +++ b/src/views/store/shipperSigning/index.vue @@ -461,8 +461,8 @@ async function handleConfirmSign(row: any) { ) } catch { return } try { - const res = await storeWarehouseConfirmSign({ id: row.id }) as any - if (res?.flag === 'success' || res?.code === 200) { + const res = await storeWarehouseConfirmSign({ id: row.id }) + if (res?.flag === 'success' || res?.code === 200 || res?.data?.mode === 'confirm') { ElMessage.success('签约已确认') loadList() } else { diff --git a/src/views/store/stores/index.vue b/src/views/store/stores/index.vue index affbb6b2..f5c37852 100644 --- a/src/views/store/stores/index.vue +++ b/src/views/store/stores/index.vue @@ -72,7 +72,7 @@