diff --git a/src/api/index/index.ts b/src/api/index/index.ts index 04260d99..0cde4752 100644 --- a/src/api/index/index.ts +++ b/src/api/index/index.ts @@ -123,7 +123,7 @@ export function putI18nCollect(data:any){ } as any) } -export function getExpressList(){ +export function getExpressList(data?: { systemOnly?: boolean }){ return request({ url: '/system', method: 'post', @@ -132,6 +132,36 @@ export function getExpressList(){ v: '1.0', timestamp: new Date().getTime() }, + data: data ?? {}, + isSystemApi: true + } as any) +} + +export function getPlatformList(data?: { systemOnly?: boolean }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'index.getPlatformList', + v: '1.0', + timestamp: new Date().getTime() + }, + data: data ?? {}, + isSystemApi: true + } as any) +} + +/** 快递公司产品类型列表(可选按快递公司编码筛选) */ +export function getExpressProductTypeList(data?: { express_code?: string }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'index.getExpressProductTypeList', + v: '1.0', + timestamp: new Date().getTime() + }, + data: data ?? {}, isSystemApi: true } as any) } diff --git a/src/api/order/order.ts b/src/api/order/order.ts index 27fcf193..b0dceae7 100644 --- a/src/api/order/order.ts +++ b/src/api/order/order.ts @@ -107,6 +107,7 @@ export const orderList = (data: any): Promise => { } // 查询订单详情(接口文档:order.detail) +// 已停用:deliveryOrder 页面已改为使用 order.deliveryOrder.list 返回数据进行详情展示,不再依赖该接口。 export const orderDetail = (data: any): Promise => { return request({ url: '/system', diff --git a/src/api/print/print.ts b/src/api/print/print.ts index ffed4457..701653e0 100644 --- a/src/api/print/print.ts +++ b/src/api/print/print.ts @@ -118,7 +118,7 @@ export function getComputer() { }) } -export function getExpressList() { +export function getExpressList(data?: { systemOnly?: boolean }) { return request({ url: '/system', method: 'post', @@ -127,7 +127,10 @@ export function getExpressList() { v, timestamp: new Date().getTime() }, - data:{}, + data: { + systemOnly: true, + ...(data || {}) + }, }) } diff --git a/src/api/setting.express/express.ts b/src/api/setting.express/express.ts new file mode 100644 index 00000000..1cf84414 --- /dev/null +++ b/src/api/setting.express/express.ts @@ -0,0 +1,68 @@ +import request from '@/utils/request' + +const v = '1.0' + +export function expressList(data: any) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.express.list', + v, + timestamp: new Date().getTime() + }, + data: data || {} + }) +} + +export function expressListBase() { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.express.listBase', + v, + timestamp: new Date().getTime() + }, + data: {} + }) +} + +export function expressCreate(data: { code: string, name: string, platform?: string }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.express.create', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export function expressCheckCodeUnique(data: { id?: number, code: string }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.express.checkCodeUnique', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export function expressUpdate(data: any) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.express.update', + v, + timestamp: new Date().getTime() + }, + data + }) +} diff --git a/src/api/setting.expressInterface/expressInterface.ts b/src/api/setting.expressInterface/expressInterface.ts new file mode 100644 index 00000000..e32c67b6 --- /dev/null +++ b/src/api/setting.expressInterface/expressInterface.ts @@ -0,0 +1,55 @@ +import request from '@/utils/request' + +const v = '1.0' + +export function expressInterfaceList(data?: { page?: number; page_size?: number; keyword?: string }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.expressInterface.list', + v, + timestamp: new Date().getTime() + }, + data: data || {} + }) +} + +export function expressInterfaceCreate(data: Record) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.expressInterface.create', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export function expressInterfaceUpdate(data: Record) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.expressInterface.update', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export function expressInterfaceDelete(data: { id: number }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.expressInterface.delete', + v, + timestamp: new Date().getTime() + }, + data + }) +} diff --git a/src/api/setting.platform/platform.ts b/src/api/setting.platform/platform.ts new file mode 100644 index 00000000..faa79557 --- /dev/null +++ b/src/api/setting.platform/platform.ts @@ -0,0 +1,64 @@ +import request from '@/utils/request' + +const v = '1.0' + +export function settingPlatformList(data?: { page?: number; page_size?: number; keyword?: string }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.platform.list', + v, + timestamp: new Date().getTime() + }, + data: data || {} + }) +} + +export function settingPlatformCreate(data: { + code: string + name: string + platform_code: string +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.platform.create', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export function settingPlatformUpdate(data: { + id: number + code: string + name: string + platform_code: string +}) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.platform.update', + v, + timestamp: new Date().getTime() + }, + data + }) +} + +export function settingPlatformDelete(data: { id: number }) { + return request({ + url: '/system', + method: 'post', + params: { + method: 'setting.platform.delete', + v, + timestamp: new Date().getTime() + }, + data + }) +} diff --git a/src/lang/en-US.ts b/src/lang/en-US.ts index d3fbeefb..1654c8f6 100644 --- a/src/lang/en-US.ts +++ b/src/lang/en-US.ts @@ -57,6 +57,7 @@ export default { 'Role':'Role', 'Validity period':'Validity period', // 'StoreIndex':'Store', + 'expressinterface':'Express Interface', }, "login": { "title": "Login", diff --git a/src/lang/zh-CN.ts b/src/lang/zh-CN.ts index 19ab8e78..19dfc25b 100644 --- a/src/lang/zh-CN.ts +++ b/src/lang/zh-CN.ts @@ -57,7 +57,7 @@ export default { 'Role':'角色管理', 'Validity period':'效期预警', // 'StoreIndex':'货主', - + 'expressinterface':'快递接口', }, "login": { "title": "登录", diff --git a/src/router/map.ts b/src/router/map.ts index e163f977..ee86ac94 100644 --- a/src/router/map.ts +++ b/src/router/map.ts @@ -22,4 +22,6 @@ export const componentMap: Record = { 'system/print/station': () => import('@/views/system/setting/printStation/index.vue'), 'storage/log': () => import('@/views/storage/log/index.vue'), 'storage/validityperiod':() =>import('@/views/storage/validityperiod/index.vue'), + 'system/setting/expressinterface/index':() => import('@/views/system/setting/expressinterface/index.vue'), + 'system/setting/encoding/index':() => import('@/views/system/setting/encoding/index.vue'), }; \ No newline at end of file diff --git a/src/views/order/orderManagement/archiveOrder.vue b/src/views/order/orderManagement/archiveOrder.vue index 46b0e6f2..5e051bbf 100644 --- a/src/views/order/orderManagement/archiveOrder.vue +++ b/src/views/order/orderManagement/archiveOrder.vue @@ -110,6 +110,7 @@ import { } from './config/order-common-config' import detail from './component/detail.vue' import log from './component/log.vue' +import { exportUpperTableRows } from './utils/export' const scanBox = ref(null) const upperTable = ref(null) @@ -266,11 +267,24 @@ function onQuickSearch() { } async function handleExport() { + if (!selectionRows.value.length) { + ElMessage.warning('请先勾选要导出的订单') + return + } exportLoading.value = true - setTimeout(() => { + try { + exportUpperTableRows({ + rows: selectionRows.value, + columns: columns.value, + fileName: `归档订单-${Date.now()}.xlsx`, + transformCell: (prop, value) => translateOrderField(prop, value) + }) + ElMessage.success('导出完成') + } catch (error) { + ElMessage.error('导出失败') + } finally { exportLoading.value = false - ElMessage.success('导出成功') - }, 1000) + } } diff --git a/src/views/order/orderManagement/component/OutboundManualOutboundForm.vue b/src/views/order/orderManagement/component/OutboundManualOutboundForm.vue new file mode 100644 index 00000000..964ddf08 --- /dev/null +++ b/src/views/order/orderManagement/component/OutboundManualOutboundForm.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 45dd4c19..7d468459 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -39,6 +39,11 @@ export const COMMON_TRANSLATIONS: Record> = { 'padding': '拣货中', 'fin': '已完成' }, + pack_status: { + 'none': '未打包', + 'padding': '打包中', + 'fin': '已完成' + }, intercept_status: { 'none': '无', 'pending': '待拦截', @@ -126,53 +131,53 @@ function orderTimeFormatter(_row: any, _column: any, cellValue: unknown) { // deliveryOrder相关配置 export const deliveryAvailableFields = [ { label: '货主', value: 'store_id', type: 'select', options: [] }, + { label: '订单号', value: 'delivery_order_code', type: 'text' }, + { label: '店铺名称', value: 'shop_nick', type: 'text' }, + { label: '来源平台', value: 'source_platform_name', type: 'text' }, + { label: '收货人', value: 'name', type: 'text' }, + { label: '手机号', value: 'mobile', type: 'text' }, + { label: '物流公司', value: 'logistics_name', type: 'text' }, + { label: '物流单号', value: 'express_code', type: 'text' }, { label: '紧急订单', value: 'is_urgency', type: 'select', options: [ { label: '是', value: 'Y' }, { label: '否', value: 'N' }, ]}, - { label: '快递', value: '', type: 'input' }, - { label: '来源平台', value: '', type: 'input' }, - { label: '同步状态', value: '', type: 'input' }, - { label: '出库单号', value: '', type: 'text' }, - { label: '前置单号', value: '', type: 'input' }, - { label: '物流单号', value: '', type: 'text' }, - { label: '移动电话', value: '', type: 'text' }, - { label: '固定电话', value: '', type: 'text' }, - // { label: '', value: '', type: 'text' }, - // { label: '', value: '', type: 'text' }, - // { label: '', value: '', type: 'text' }, - // { label: '', value: '', type: 'text' }, - // { label: '', value: '', type: 'text' }, - // { label: '', value: '', type: 'text' }, - // { label: '', value: '', type: 'text' }, - { label: '审核时间', value: '', type: 'daterange' }, - { label: '系统创建时间', value: '', type: 'daterange' }, - { label: '下单时间', value: '', type: 'daterange' }, - { label: '支付时间', value: '', type: 'daterange' }, - // { label: '', value: '', type: 'daterange' }, - // { label: '', value: '', type: 'daterange' }, - // { label: '', value: '', type: 'daterange' }, - // { label: '', value: '', type: 'daterange' }, + { label: '同步状态', value: 'sync_status', type: 'select', options: [ + { label: '待同步', value: 'padding' }, + { label: '已同步', value: 'fin' }, + { label: '错误', value: 'error' } + ]}, + { label: '出库状态', value: 'outbound_status', type: 'select', options: [ + { label: '未出库', value: 'none' }, + { label: '待出库', value: 'padding' }, + { label: '已出库', value: 'fin' } + ]}, + { label: '创建时间', value: 'create_at', type: 'daterange' }, + { label: '支付时间', value: 'pay_time', type: 'daterange' }, ] export const deliveryColumns = [ - { prop: 'delivery_order_code', label: '出库单号', width: '160' }, - { prop: 'pre_delivery_order_code', label: '前置单号', width: '160' }, - { prop: 'shop_nick', label: '店铺名称', width: '120' }, - { prop: 'buyer_nick', label: '买家昵称', width: '120' }, - { prop: 'name', label: '收件人', width: '100' }, - { prop: 'mobile', label: '移动电话', width: '120' }, - { prop: 'province', label: '省', width: '100' }, - { prop: 'city', label: '市', width: '100' }, - { prop: 'dispatch_lane', label: '道口', width: '80' }, - { prop: 'status', label: '审核状态', width: '100' }, + { prop: 'delivery_order_code', label: '配送单号', width: '170' }, + { prop: 'shop_nick', label: '店铺名称', width: '140' }, + { prop: 'source_platform_code', label: '平台来源', width: '100' }, + { prop: 'name', label: '收货人', width: '100' }, + { prop: 'mobile', label: '手机号', width: '120' }, + { prop: 'status', label: '订单状态', width: '100' }, + { prop: 'outbound_status', label: '出库状态', width: '100' }, { prop: 'sync_status', label: '同步状态', width: '100' }, - { prop: 'total_amount', label: '总金额', width: '100' }, + { prop: 'storage_status', label: '分配状态', width: '100' }, + { prop: 'post_status', label: '快递状态', width: '100' }, + { prop: 'pick_status', label: '拣货状态', width: '100' }, + { prop: 'pack_status', label: '打包状态', width: '100' }, + { prop: 'logistics_name', label: '物流公司', width: '120' }, + { prop: 'express_code', label: '物流单号', width: '160' }, + { prop: 'is_urgency', label: '紧急', width: '80' }, + { prop: 'dispatch_lane', label: '道口', width: '80' }, { prop: 'items_count', label: '商品种类', width: '100' }, { prop: 'items_total', label: '商品总数', width: '100' }, - { prop: 'create_at', label: '创建日期', width: '160' }, - { prop: 'place_order_time', label: '下单时间', width: '160' }, - { prop: 'source_platform_name', label: '平台来源', width: '120' }, + { prop: 'total_amount', label: '订单金额', width: '110' }, + { prop: 'delivery_time', label: '配送时间', width: '165', formatter: orderTimeFormatter }, + { prop: 'create_at', label: '创建时间', width: '165', formatter: orderTimeFormatter }, ] export const deliverydetail = [ @@ -440,6 +445,9 @@ export const pendingOrderbuttonList: any[] = [ } ] +export const outboundAvailableFields = pendingAvailableFields +export const outboundColumns = pendingCloums + // orderWorkbench相关配置 export const workbenchStatusOptions = [ { label: '待处理', value: 'pedding' }, diff --git a/src/views/order/orderManagement/deliveryException.vue b/src/views/order/orderManagement/deliveryException.vue index 9d0135cb..6b8c526c 100644 --- a/src/views/order/orderManagement/deliveryException.vue +++ b/src/views/order/orderManagement/deliveryException.vue @@ -110,6 +110,7 @@ import { } from './config/order-common-config' import detail from './component/detail.vue' import log from './component/log.vue' +import { exportUpperTableRows } from './utils/export' const scanBox = ref(null) const upperTable = ref(null) @@ -259,11 +260,24 @@ function onQuickSearch() { } async function handleExport() { + if (!selectionRows.value.length) { + ElMessage.warning('请先勾选要导出的订单') + return + } exportLoading.value = true - setTimeout(() => { + try { + exportUpperTableRows({ + rows: selectionRows.value, + columns: columns.value, + fileName: `配送异常-${Date.now()}.xlsx`, + transformCell: (prop, value) => translateOrderField(prop, value) + }) + ElMessage.success('导出完成') + } catch (error) { + ElMessage.error('导出失败') + } finally { exportLoading.value = false - ElMessage.success('导出成功') - }, 1000) + } } diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index 9cb481c9..5f9a66a3 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -1,9 +1,22 @@