diff --git a/apps/web-antd/src/views/mall/trade/order/modules/delivery-form.vue b/apps/web-antd/src/views/mall/trade/order/modules/delivery-form.vue index a500032fa..727856c03 100644 --- a/apps/web-antd/src/views/mall/trade/order/modules/delivery-form.vue +++ b/apps/web-antd/src/views/mall/trade/order/modules/delivery-form.vue @@ -18,7 +18,7 @@ const emit = defineEmits(['success']); const formData = ref({ id: 0, expressType: 'express', - logisticsId: 0, + logisticsId: undefined, logisticsNo: '', }); @@ -70,11 +70,8 @@ const [Modal, modalApi] = useVbenModal({ } modalApi.lock(); try { - formData.value.id = data.id; - // 根据当前物流信息判断发货方式 + formData.value = data as any; formData.value.expressType = data.logisticsId === 0 ? 'none' : 'express'; - formData.value.logisticsId = data.logisticsId || 0; - formData.value.logisticsNo = data.logisticsNo || ''; // 设置到 values await formApi.setValues(formData.value); } finally { diff --git a/apps/web-ele/src/api/mall/trade/order/index.ts b/apps/web-ele/src/api/mall/trade/order/index.ts index e0229783b..07f4b173e 100644 --- a/apps/web-ele/src/api/mall/trade/order/index.ts +++ b/apps/web-ele/src/api/mall/trade/order/index.ts @@ -121,7 +121,7 @@ export namespace MallOrderApi { /** 配送模板编号 */ deliveryTemplateId?: null | number; /** 发货物流公司编号 */ - logisticsId?: null | number; + logisticsId?: number; /** 发货物流单号 */ logisticsNo?: string; /** 发货时间 */