Merge branch 'dev' of http://git.buggoglobal.com/html/client-web into dev

src/modules/first-leg/api/firstLeg.ts

@@ -125,6 +125,7 @@ export interface ProductImageUploadResult {
 export interface FirstLegOrderSaveRequest {
   inboundCode?: string
   customerName: string
+  fulfillmentType?: 'STANDARD' | 'ONE_CLICK_DROPSHIP'
   transportMode: ApiTransportMode
   tradeTerm?: string
   destinationCountryCode: string
@@ -214,6 +215,7 @@ export interface MerchantFirstLegOrder {
   orderNo: string | null
   customerId: number | string | null
   customerName: string
+  fulfillmentType?: 'STANDARD' | 'ONE_CLICK_DROPSHIP' | null
   status: ApiFirstLegStatus
   transportMode?: ApiTransportMode
   tradeTerm: string | null

src/modules/first-leg/store/firstLegOrders.ts

@@ -72,6 +72,7 @@ function savePayload(draft: FirstLegOrderDraft, warehouse: ClientWarehouse, cust
   return {
     inboundCode: draft.inboundCode?.trim() || undefined,
     customerName: customerName.trim(),
+    fulfillmentType: draft.fulfillmentType ?? 'STANDARD',
     transportMode: apiTransport(draft),
     tradeTerm: draft.tradeTerm || undefined,
     destinationCountryCode: draft.destinationCountryCode.trim().toUpperCase(),
@@ -277,7 +278,7 @@ function mapOrder(order: MerchantFirstLegOrder, warehouses: PlatformReceivingWar
   return {
     id: String(order.id ?? order.orderId ?? ''), orderNo: order.orderNo, referenceNo: order.referenceId ?? '',
     transportMode: order.transportMode ? clientTransport(order) : null,
-    businessType: 'EXPORT', origin: shipper?.city ?? '', destination: order.destinationWarehouseName || order.destinationCountryCode || '',
+    businessType: 'EXPORT', fulfillmentType: order.fulfillmentType ?? 'STANDARD', origin: shipper?.city ?? '', destination: order.destinationWarehouseName || order.destinationCountryCode || '',
     receivingWarehouseId: String(order.receivingWarehouseId), receivingWarehouseName: order.receivingWarehouseName,
     receivingWarehouseSnapshot: orderWarehouseSnapshot(order, warehouse), expectedDepartureDate: order.expectedShipDate ?? '', etd: '', eta: '',
     shipperPartyId: shipper?.id ?? '', shipperPartySnapshot: shipper, shipper: shipper?.name ?? '',

src/modules/first-leg/types/firstLegOrder.ts

@@ -99,6 +99,7 @@ export interface FirstLegOrder {
   referenceNo: string
   transportMode: FirstLegTransportMode | null
   businessType: FirstLegBusinessType
+  fulfillmentType?: 'STANDARD' | 'ONE_CLICK_DROPSHIP'
   origin: string
   destination: string
   receivingWarehouseId: string
@@ -157,6 +158,7 @@ export type FirstLegOrderDraft = Omit<Pick<
   | 'referenceNo'
   | 'transportMode'
   | 'businessType'
+  | 'fulfillmentType'
   | 'origin'
   | 'destination'
   | 'receivingWarehouseId'

src/modules/first-leg/utils/firstLegOrder.ts

@@ -124,7 +124,7 @@ export function validateFirstLegOrderDraft(draft: FirstLegOrderDraft) {
     const line = `第 ${index + 1} 条货物`
     if (!item.cargoNameCn.trim()) errors.push(`${line}缺少中文品名`)
     if (!item.packageType.trim()) errors.push(`${line}缺少包装类型`)
-    if (draft.destinationType === 'FBA' && !item.sku.trim()) errors.push(`${line}缺少客户 SKU`)
+    if ((draft.destinationType === 'FBA' || draft.fulfillmentType === 'ONE_CLICK_DROPSHIP') && !item.sku.trim()) errors.push(`${line}缺少客户 SKU`)
     if (draft.destinationType === 'FBA' && !item.shipmentId.trim()) errors.push(`${line}缺少货件编号`)
     if (draft.destinationType === 'FBA' && !item.referenceId.trim()) errors.push(`${line}缺少跟踪编号`)
     if (!Number.isInteger(item.pieces) || item.pieces <= 0) errors.push(`${line}件数必须为正整数`)

src/modules/first-leg/views/FirstLegOrdersView.vue

@@ -335,6 +335,7 @@ function emptyDraft(): FirstLegOrderDraft {
     referenceNo: '',
     transportMode: 'FCL',
     businessType: 'EXPORT',
+    fulfillmentType: 'STANDARD',
     origin: '',
     destination: '',
     receivingWarehouseId: '',
@@ -1860,6 +1861,7 @@ async function searchOrders(model: QueryModel) {
         <section class="order-form-section prototype-section">
           <div class="order-section-heading"><div><h3>客户下单</h3><p>先选择货物如何送到国内收货仓，并填写本次运输安排。</p></div></div>
           <div class="prototype-form-flow shipping-form-flow">
+            <el-form-item label="履约类型" prop="fulfillmentType" required class="prototype-form-row prototype-form-row--tabs"><el-radio-group v-model="form.fulfillmentType" class="segmented-options"><el-radio-button value="STANDARD">普通头程</el-radio-button><el-radio-button value="ONE_CLICK_DROPSHIP">一件代发</el-radio-button></el-radio-group><small v-if="form.fulfillmentType === 'ONE_CLICK_DROPSHIP'" class="field-guidance">测量完成后不办理国内库存入库，将直接推送 PDA 合托。</small></el-form-item>
             <el-form-item label="取货方式" prop="pickupMethod" required class="prototype-form-row prototype-form-row--tabs"><el-radio-group v-model="form.pickupMethod" class="segmented-options" @change="changePickupMethod"><el-radio-button value="SELF_EXPRESS">快递自送</el-radio-button><el-radio-button value="PICKUP">我司提货</el-radio-button><el-radio-button value="SELF_TRUCK">卡车自送</el-radio-button></el-radio-group></el-form-item>
             <template v-if="form.pickupMethod === 'PICKUP' && form.shipperPartySnapshot">
               <el-form-item label="企业提货地址簿" prop="senderAddressId" required :rules="requiredSelectRules('请选择企业提货地址')" class="prototype-form-row prototype-form-row--wide address-book-row">