diff --git a/dist.tar.gz b/dist.tar.gz index ea6397df..f1e729a9 100644 Binary files a/dist.tar.gz and b/dist.tar.gz differ diff --git a/src/api/order.archiveorder/orderarchiveorder.ts b/src/api/order.archiveorder/orderarchiveorder.ts index f2a705c9..d3033f92 100644 --- a/src/api/order.archiveorder/orderarchiveorder.ts +++ b/src/api/order.archiveorder/orderarchiveorder.ts @@ -2,6 +2,8 @@ import request from '@/utils/request' const v = '1.0' +export type { OrderWorkbenchListResponse, OrderListPagination } from '@/api/order.index/orderindex' + export type OrderWhere = Record export type OrderSort = { sortField?: string diff --git a/src/api/order.deliveryOrder/orderdeliveryOrder.ts b/src/api/order.deliveryOrder/orderdeliveryOrder.ts index 7d40e0b1..1d0d5179 100644 --- a/src/api/order.deliveryOrder/orderdeliveryOrder.ts +++ b/src/api/order.deliveryOrder/orderdeliveryOrder.ts @@ -2,6 +2,8 @@ import request from '@/utils/request' const v = '1.0' +export type { OrderWorkbenchListResponse, OrderListPagination } from '@/api/order.index/orderindex' + export type OrderWhere = Record export type OrderSort = { sortField?: string diff --git a/src/api/order.deliveryexpectionorder/orderdeliveryexpectionorder.ts b/src/api/order.deliveryexpectionorder/orderdeliveryexpectionorder.ts index b3d94e62..93ea3202 100644 --- a/src/api/order.deliveryexpectionorder/orderdeliveryexpectionorder.ts +++ b/src/api/order.deliveryexpectionorder/orderdeliveryexpectionorder.ts @@ -2,6 +2,8 @@ import request from '@/utils/request' const v = '1.0' +export type { OrderWorkbenchListResponse, OrderListPagination } from '@/api/order.index/orderindex' + export type OrderWhere = Record export type OrderSort = { sortField?: string diff --git a/src/api/order.entrustorder/orderentrustorder.ts b/src/api/order.entrustorder/orderentrustorder.ts index 16bd4936..9b033400 100644 --- a/src/api/order.entrustorder/orderentrustorder.ts +++ b/src/api/order.entrustorder/orderentrustorder.ts @@ -2,6 +2,8 @@ import request from '@/utils/request' const v = '1.0' +export type { OrderWorkbenchListResponse, OrderListPagination } from '@/api/order.index/orderindex' + export type OrderWhere = Record export type OrderSort = { sortField?: string diff --git a/src/api/order.expectionorder/orderexpectionorder.ts b/src/api/order.expectionorder/orderexpectionorder.ts index bc9989f3..fcee9124 100644 --- a/src/api/order.expectionorder/orderexpectionorder.ts +++ b/src/api/order.expectionorder/orderexpectionorder.ts @@ -2,6 +2,8 @@ import request from '@/utils/request' const v = '1.0' +export type { OrderWorkbenchListResponse, OrderListPagination } from '@/api/order.index/orderindex' + export type OrderWhere = Record export type OrderSort = { sortField?: string diff --git a/src/api/order.index/orderindex.ts b/src/api/order.index/orderindex.ts index f5914d8c..f0f9c5ae 100644 --- a/src/api/order.index/orderindex.ts +++ b/src/api/order.index/orderindex.ts @@ -19,6 +19,23 @@ export type OrderListParams = { } } +export type OrderListPagination = { + page?: number + pageSize?: number + total?: number + totalPages?: number + hasPrevious?: boolean + hasNext?: boolean +} + +/** order.list 响应 data 结构 */ +export type OrderWorkbenchListResponse = { + list: any[] + pagination: OrderListPagination + /** 复核状态:none=未复核,fin=已复核 */ + recheck_status?: string +} + export type ManualOutboundParams = { warehouseId?: number warehouse_id?: number diff --git a/src/api/order.outboundOrder/orderoutboundOrder.ts b/src/api/order.outboundOrder/orderoutboundOrder.ts index 321ad0e4..810d3b3d 100644 --- a/src/api/order.outboundOrder/orderoutboundOrder.ts +++ b/src/api/order.outboundOrder/orderoutboundOrder.ts @@ -2,6 +2,8 @@ import request from '@/utils/request' const v = '1.0' +export type { OrderWorkbenchListResponse, OrderListPagination } from '@/api/order.index/orderindex' + export type OrderWhere = Record export type OrderSort = { sortField?: string diff --git a/src/api/order.pendingOrder/orderpendingOrder.ts b/src/api/order.pendingOrder/orderpendingOrder.ts index 82b103fc..99038de5 100644 --- a/src/api/order.pendingOrder/orderpendingOrder.ts +++ b/src/api/order.pendingOrder/orderpendingOrder.ts @@ -2,6 +2,8 @@ import request from "@/utils/request"; const v = "1.0"; +export type { OrderWorkbenchListResponse, OrderListPagination } from '@/api/order.index/orderindex' + // 啊大王大大 export type OrderWhere = Record; diff --git a/src/api/order.reviewOrder/orderreviewOrder.ts b/src/api/order.reviewOrder/orderreviewOrder.ts index ba2bf7e2..370ce3f1 100644 --- a/src/api/order.reviewOrder/orderreviewOrder.ts +++ b/src/api/order.reviewOrder/orderreviewOrder.ts @@ -2,6 +2,8 @@ import request from '@/utils/request' const v = '1.0' +export type { OrderWorkbenchListResponse, OrderListPagination } from '@/api/order.index/orderindex' + export type OrderWhere = Record export type OrderSort = { sortField?: string diff --git a/src/api/setting.expressinterface/expressInterface.ts b/src/api/setting.expressinterface/expressInterface.ts index 985d349b..13f356a2 100644 --- a/src/api/setting.expressinterface/expressInterface.ts +++ b/src/api/setting.expressinterface/expressInterface.ts @@ -89,7 +89,14 @@ export function expressInterfaceCreate(data: ExpressInterfaceCreateParams) { }) } -export function expressInterfaceUpdate(data: Record) { +export type ExpressInterfaceUpdateParams = { + id: number + shop_id?: number + /** 发件人详细地址,使用 index.getShopExpressList 返回的 detail 字段值 */ + address?: string +} + +export function expressInterfaceUpdate(data: ExpressInterfaceUpdateParams & Record) { return request({ url: '/system', method: 'post', diff --git a/src/views/order/orderManagement/archiveOrder.vue b/src/views/order/orderManagement/archiveOrder.vue index d37f693f..4822aff8 100644 --- a/src/views/order/orderManagement/archiveOrder.vue +++ b/src/views/order/orderManagement/archiveOrder.vue @@ -150,6 +150,7 @@ import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue' import log from './component/log.vue' import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue' import { createOrderPageExport } from './utils/order-page-export' +import { parseOrderListResponse } from './utils/order-index-helpers' import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane' import { createSimpleListToolbarController } from './utils/toolbar-actions' import { safeInvoke } from '@/utils/safe-invoke' @@ -245,9 +246,9 @@ async function loadData() { } const res: any = await orderArchiveOrder.list(params) if (res && (res.code === 200 || res.code === 1)) { - const responseData = res.data || {} - list.value = responseData.list || [] - pagination.total = responseData.pagination?.total ?? 0 + const data = parseOrderListResponse(res) + list.value = data.list + pagination.total = data.total } else { list.value = [] pagination.total = 0 diff --git a/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue b/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue index fc7fe6fb..017115fe 100644 --- a/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue +++ b/src/views/order/orderManagement/component/PendingOrderDetailPanel.vue @@ -20,8 +20,8 @@ - - {{ translateOrderField('inspection_status', detail.inspection_status) }} + + {{ translateOrderField('recheck_status', resolveOrderRecheckStatus(detail)) }} @@ -87,6 +87,7 @@ import { ref, watch } from 'vue' import { ElMessage } from 'element-plus' import { orderPendingOrder } from '@/api/order.pendingorder/orderpendingOrder' import { getTagType, translateOrderField } from '../config/order-common-config' +import { resolveOrderRecheckStatus } from '../utils/order-index-helpers' const props = defineProps<{ row: Record | null diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index ad8d9620..17ee6090 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -97,6 +97,10 @@ export const COMMON_TRANSLATIONS: Record> = { 'fin': '审核通过', 'reject': '审核驳回', 'error': '审核异常' + }, + recheck_status: { + 'none': '未复核', + 'fin': '已复核' } } @@ -181,6 +185,10 @@ export const COMMON_TAG_TYPES: Record> = { 'fin': 'success', 'reject': 'danger', 'error': 'danger' + }, + recheck_status: { + 'none': 'info', + 'fin': 'success' } } @@ -643,6 +651,11 @@ export const deliveryOrderToolbarButtons = simpleListToolbarButtons +export const recheckStatusFilterOptions = [ + { label: '未复核', value: 'none' }, + { label: '已复核', value: 'fin' } +] + // revieworder相关配置 export const reviewAvailableFields = [ { label: '货主', value: 'store_id', type: 'select', multiple: true, options: [] }, @@ -657,6 +670,7 @@ export const reviewAvailableFields = [ { label: '订单状态', value: 'status', type: 'select', options: [ { label: '待审核', value: 'pedding' }, { label: '已创建', value: 'created' }, { label: '错误', value: 'error' } ] }, { label: '是否紧急', value: 'is_urgency', type: 'select', options: [ { label: '是', value: 'Y' }, { label: '否', value: 'N' } ] }, { label: '同步状态', value: 'sync_status', type: 'select', options: [ { label: '待同步', value: 'padding' }, { label: '已完成', value: 'fin' }, { label: '错误', value: 'error' }, { label: '未同步', value: 'none' } ] }, + { label: '复核状态', value: 'recheck_status', type: 'select', options: recheckStatusFilterOptions }, { label: '创建时间', value: 'create_at', type: 'daterange' }, ] @@ -670,7 +684,7 @@ export const reviewColums = [ { prop: 'mobile', label: '手机号', width: '120' }, { prop: 'status', label: '订单状态', width: '100' }, { prop: 'sync_status', label: '同步状态', width: '100' }, - { prop: 'inspection_status', label: '复核', width: '100' }, + { prop: 'recheck_status', label: '复核', width: '100' }, { prop: 'is_urgency', label: '紧急', width: '80' }, { prop: 'logistics_name', label: '物流公司', width: '120' }, { prop: 'items_total', label: '商品总数', width: '100' }, @@ -836,6 +850,7 @@ export const pendingAvailableFields = [ { label: '已同步', value: 'fin' }, { label: '错误', value: 'error' } ] }, + { label: '复核状态', value: 'recheck_status', type: 'select', options: recheckStatusFilterOptions }, { label: '收货人', value: 'name', type: 'text' }, { label: '手机号', value: 'mobile', type: 'text' }, { label: '省份', value: 'province', type: 'text' }, diff --git a/src/views/order/orderManagement/deliveryException.vue b/src/views/order/orderManagement/deliveryException.vue index 7db2be76..b6ad4e09 100644 --- a/src/views/order/orderManagement/deliveryException.vue +++ b/src/views/order/orderManagement/deliveryException.vue @@ -150,6 +150,7 @@ import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue' import log from './component/log.vue' import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue' import { createOrderPageExport } from './utils/order-page-export' +import { parseOrderListResponse } from './utils/order-index-helpers' import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane' import { createSimpleListToolbarController } from './utils/toolbar-actions' import { safeInvoke } from '@/utils/safe-invoke' @@ -245,9 +246,9 @@ async function loadData() { } const res: any = await orderDeliveryExpectionOrder.list(params) if (res && (res.code === 200 || res.code === 1)) { - const responseData = res.data || {} - list.value = responseData.list || [] - pagination.total = responseData.pagination?.total || responseData.total || (responseData.list ? responseData.list.length : 0) + const data = parseOrderListResponse(res) + list.value = data.list + pagination.total = data.total } else { list.value = [] pagination.total = 0 diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index 9b2a160e..67122573 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -197,6 +197,7 @@ import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue' import log from './component/log.vue' import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue' import { createOrderPageExport } from './utils/order-page-export' +import { parseOrderListResponse } from './utils/order-index-helpers' import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane' import { createSimpleListToolbarController } from './utils/toolbar-actions' import { safeInvoke } from '@/utils/safe-invoke' @@ -337,9 +338,9 @@ async function loadData() { } const res: any = await orderDeliveryOrder.list(params) if (res && (res.code === 200 || res.code === 1)) { - const responseData = res.data || {} - list.value = responseData.list || [] - pagination.total = responseData.pagination?.total || responseData.total || (responseData.list ? responseData.list.length : 0) + const data = parseOrderListResponse(res) + list.value = data.list + pagination.total = data.total } else { list.value = [] pagination.total = 0 diff --git a/src/views/order/orderManagement/entrustWarehouse.vue b/src/views/order/orderManagement/entrustWarehouse.vue index 3ce33938..c2d9dcbd 100644 --- a/src/views/order/orderManagement/entrustWarehouse.vue +++ b/src/views/order/orderManagement/entrustWarehouse.vue @@ -150,6 +150,7 @@ import OrderItemsDetailPanel from './component/OrderItemsDetailPanel.vue' import log from './component/log.vue' import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue' import { createOrderPageExport } from './utils/order-page-export' +import { parseOrderListResponse } from './utils/order-index-helpers' import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane' import { createSimpleListToolbarController } from './utils/toolbar-actions' import { safeInvoke } from '@/utils/safe-invoke' @@ -245,9 +246,9 @@ async function loadData() { } const res: any = await orderEntrustOrder.list(params) if (res && (res.code === 200 || res.code === 1)) { - const responseData = res.data || {} - list.value = responseData.list || [] - pagination.total = responseData.pagination?.total || responseData.total || (responseData.list ? responseData.list.length : 0) + const data = parseOrderListResponse(res) + list.value = data.list + pagination.total = data.total } else { list.value = [] pagination.total = 0 diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index 5736d034..7a35f9c4 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -374,6 +374,7 @@ import UpdateOrderMetaForm from './form/UpdateOrderMetaForm.vue' import CloneOrderForm from './form/CloneOrderForm.vue' import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue' import { createOrderPageExport } from './utils/order-page-export' +import { parseOrderListResponse } from './utils/order-index-helpers' import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane' import { createPendingToolbarController } from './utils/toolbar-actions' import { safeInvoke } from '@/utils/safe-invoke' @@ -613,9 +614,9 @@ async function loadData() { } const res: any = await orderExpectionOrder.list(params) if (res && (res.code === 200 || res.code === 1)) { - const responseData = res.data || {} - list.value = responseData.list || [] - pagination.total = responseData.pagination?.total || responseData.total || (responseData.list ? responseData.list.length : 0) + const data = parseOrderListResponse(res) + list.value = data.list + pagination.total = data.total } else { list.value = [] pagination.total = 0 diff --git a/src/views/order/orderManagement/outboundOrder.vue b/src/views/order/orderManagement/outboundOrder.vue index 5de9eb46..04dfc92a 100644 --- a/src/views/order/orderManagement/outboundOrder.vue +++ b/src/views/order/orderManagement/outboundOrder.vue @@ -210,6 +210,7 @@ import OutboundManualOutboundForm from './component/OutboundManualOutboundForm.v import ExpressWaybillPanel from './component/ExpressWaybillPanel.vue' import OrderExportProgressDialog from './component/OrderExportProgressDialog.vue' import { createOrderPageExport } from './utils/order-page-export' +import { parseOrderListResponse } from './utils/order-index-helpers' import { useVerticalSplitPane } from '@/composables/useVerticalSplitPane' import { createSimpleListToolbarController } from './utils/toolbar-actions' import { safeInvoke } from '@/utils/safe-invoke' @@ -345,9 +346,10 @@ async function loadData() { sortOrder: 'DESC' } }) - if (res && (res.code === 1 || res.code === 200) && res.data) { - list.value = res.data.list || [] - pagination.total = res.data.pagination?.total ?? res.data.total ?? 0 + if (res && (res.code === 1 || res.code === 200)) { + const data = parseOrderListResponse(res) + list.value = data.list + pagination.total = data.total } else { list.value = [] pagination.total = 0 diff --git a/src/views/order/orderManagement/pendingOrder.vue b/src/views/order/orderManagement/pendingOrder.vue index e92c01b1..fa172dd0 100644 --- a/src/views/order/orderManagement/pendingOrder.vue +++ b/src/views/order/orderManagement/pendingOrder.vue @@ -149,9 +149,9 @@ - - + + + +
拣货车编码
+ + + + +
+ + + + 至 + + + +
+
+ + + + + 位数 {{ batchForm.code.pad_width }},不足时左侧补 0 + + + + + +
拣货车名称
+ + + + + + + + + + 启用 + 停用 + + + +
+
将生成 {{ batchPreviewCount }} 条拣货车
+ + + + + + 请完善编码前缀与数字范围 +
+
+
+ +
+