diff --git a/src/modules/first-leg/views/FirstLegOrderCreateHubView.vue b/src/modules/first-leg/views/FirstLegOrderCreateHubView.vue index 6825425..90ed0b8 100644 --- a/src/modules/first-leg/views/FirstLegOrderCreateHubView.vue +++ b/src/modules/first-leg/views/FirstLegOrderCreateHubView.vue @@ -23,10 +23,6 @@ function selectMode(mode: 'standard' | 'quick') { diff --git a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs index 17584b8..222f461 100644 --- a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs +++ b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs @@ -372,7 +372,9 @@ test('collects the backend-required first-leg fields', () => { } assert.match(source, /form\.channelName = channel\?\.channelName/) assert.match(source, /v-model="item\.woodenProduct"/) - assert.match(source, /第 \{\{ woodenCargoLines\.join\('、'\) \}\} 条货物为木制品，请将“是否商检”选择为“是”/) + assert.match(source, /form\.customsInspection = form\.items\.some\(\(item\) => item\.woodenProduct\) \? true : null/) + assert.match(source, /木制品勾选后自动商检<\/small>/) + assert.doesNotMatch(source, /label="是否商检"/) assert.match(source, /第 \{\{ index \+ 1 \}\} 条须商检/) }) @@ -439,6 +441,7 @@ test('matches the prototype two-column create layout and reset action', () => { assert.match(editorShellSource, /submit-gradient 5s ease-in-out infinite/) assert.match(editorShellSource, /submit-shine 3\.2s ease-in-out infinite/) assert.match(editorShellSource, /@media \(prefers-reduced-motion: reduce\)/) + assert.doesNotMatch(createHubSource, /

头程下单<\/h1>|填写货物信息，创建新的头程运输订单/) }) test('shows an optional LX inbound order number for one-click dropship orders', () => { diff --git a/src/modules/first-leg/views/FirstLegOrdersView.vue b/src/modules/first-leg/views/FirstLegOrdersView.vue index f7836c3..90868a8 100644 --- a/src/modules/first-leg/views/FirstLegOrdersView.vue +++ b/src/modules/first-leg/views/FirstLegOrdersView.vue @@ -435,9 +435,6 @@ function quickOrderDraft() { const form = reactive(quickOrderDraft()) const serializedDraft = computed(() => JSON.stringify(form)) const editorDirty = computed(() => (editorOpen.value || isCreatePage.value) && serializedDraft.value !== editorBaseline.value) -const woodenCargoLines = computed(() => form.items - .map((item, index) => item.woodenProduct ? index + 1 : null) - .filter((index): index is number => index != null)) const unsavedRouteKey = props.createPage ? 'first-leg-order-create' : 'first-leg-orders' useUnsavedWorkRegistration({ @@ -1901,6 +1898,7 @@ function viewImportedDrafts() { } async function validateEditorForm() { + form.customsInspection = form.items.some((item) => item.woodenProduct) ? true : null try { const policy = await getMerchantInboundCodePolicy() inboundCodePolicy.value = policy @@ -2193,7 +2191,6 @@ async function searchOrders(model: QueryModel) { 买单退税 整柜散货 - 第 {{ woodenCargoLines.join('、') }} 条货物为木制品，请将“是否商检”选择为“是”。 @@ -2238,7 +2235,7 @@ async function searchOrders(model: QueryModel) { - + @@ -2249,7 +2246,7 @@ async function searchOrders(model: QueryModel) { - +
#SKU NO.{{ form.destinationType === 'FBA' || form.fulfillmentType === 'ONE_CLICK_DROPSHIP' ? '必填' : '选填' }}中文品名图片英文品名报关 HS CODE清关 HS CODE包装类型材质危险品木制品勾选后须商检SKU NO.{{ form.destinationType === 'FBA' || form.fulfillmentType === 'ONE_CLICK_DROPSHIP' ? '必填' : '选填' }}中文品名图片英文品名报关 HS CODE清关 HS CODE包装类型材质危险品木制品勾选后自动商检 箱规长 cm箱规宽 cm箱规高 cm每箱数量箱数总毛重总体积总数量总净重 清关申报单价 USD清关申报金额 USD用途型号品牌产品规格 长×宽×高货件编号货件编号必填跟踪编号跟踪编号必填UPC NO.备注操作
同箱
第 {{ index + 1 }} 条须商检
自动商检
 同上同上同上 同箱同箱同箱{{ item.pieces }}同箱