diff --git a/src/api/mall/trade/order/index.ts b/src/api/mall/trade/order/index.ts
index 37fee8c7..21ef8de3 100644
--- a/src/api/mall/trade/order/index.ts
+++ b/src/api/mall/trade/order/index.ts
@@ -141,7 +141,7 @@ export const getExpressTrackList = async (id: number | null) => {
}
export interface DeliveryVO {
- id?: number // 订单编号
+ id: number // 订单编号
logisticsId: number | null // 物流公司编号
logisticsNo: string // 物流编号
}
@@ -151,6 +151,10 @@ export const deliveryOrder = async (data: DeliveryVO) => {
return await request.put({ url: `/trade/order/delivery`, data })
}
+//申通快递(快递100)订单创建
+export const deliveryOrder100 = async (data: { id: number }) => {
+ return await request.put({ url: `/trade/order/delivery-kuaidi100?id=${data.id}`, data })
+}
// 订单备注
export const updateOrderRemark = async (data: any) => {
return await request.put({ url: `/trade/order/update-remark`, data })
diff --git a/src/views/mall/trade/order/form/OrderDeliveryForm.vue b/src/views/mall/trade/order/form/OrderDeliveryForm.vue
index 3dcd899c..fca5a466 100644
--- a/src/views/mall/trade/order/form/OrderDeliveryForm.vue
+++ b/src/views/mall/trade/order/form/OrderDeliveryForm.vue
@@ -7,21 +7,6 @@
无需发货
-
-
-
-
-
-
-
-
-
-
确 定
@@ -30,9 +15,9 @@
diff --git a/src/views/mall/trade/order/index.vue b/src/views/mall/trade/order/index.vue
index 1217fb7e..ea571ff1 100644
--- a/src/views/mall/trade/order/index.vue
+++ b/src/views/mall/trade/order/index.vue
@@ -248,6 +248,7 @@ const queryFormRef = ref() // 搜索的表单
const queryParams = ref({
pageNo: 1, // 页数
pageSize: 10, // 每页显示数量
+ id:undefined, // 订单ID
status: undefined, // 订单状态
payChannelCode: undefined, // 支付方式
createTime: undefined, // 创建时间
@@ -287,6 +288,7 @@ const getList = async () => {
loading.value = true
try {
const data = await TradeOrderApi.getOrderPage(unref(queryParams))
+ console.log('订单列表', data.list)
list.value = data.list
total.value = data.total
} finally {
@@ -306,6 +308,7 @@ const resetQuery = () => {
queryParams.value = {
pageNo: 1, // 页数
pageSize: 10, // 每页显示数量
+ id: undefined, // 订单ID
status: undefined, // 订单状态
payChannelCode: undefined, // 支付方式
createTime: undefined, // 创建时间
@@ -333,7 +336,7 @@ const handleCommand = (command: string, row: TradeOrderApi.OrderVO) => {
updateRemarkForm.value?.open(row)
break
case 'delivery':
- deliveryFormRef.value?.open(row)
+ deliveryFormRef.value?.open(row.id) // 直接传递id而不是整个row对象
break
}
}