merge release test changes and preserve local frontend updates

src/modules/overseas-warehouse/views/warehouseTransferForm.test.mjs

@@ -14,14 +14,14 @@ test('仓储转运先选择入仓方式并按方式切换地址信息', () => {
 })
 
 test('仓储转运支持无目的地、FBA 仓和私人仓并显式选择是否换标', () => {
-  assert.match(view, /是否有目的去向/)
+  assert.match(view, />目的去向</)
   assert.match(view, /value="NONE">暂未确定/)
   assert.match(view, /value="FBA">FBA 仓/)
   assert.match(view, /value="PRIVATE">私人仓/)
   assert.match(view, /transferDestinationType === 'PRIVATE'.*私人仓地址.*邮编.*私人仓联系人.*联系电话/s)
-  assert.match(view, /是否需要换标/)
-  assert.match(view, /:value="false">不需要换标/)
-  assert.match(view, /:value="true">需要换标/)
+  assert.match(view, />换标服务</)
+  assert.match(view, /:value="false">不需要/)
+  assert.match(view, /:value="true">需要/)
   assert.match(api, /fbaWarehouseCode\?: string/)
   assert.match(api, /privateDestinationAddress\?: string; privateDestinationPostalCode\?: string/)
   assert.match(api, /fbaShipmentNo\?: string/)
@@ -30,13 +30,11 @@ test('仓储转运支持无目的地、FBA 仓和私人仓并显式选择是否
 })
 
 test('仓储转运换标整票只允许一个目的仓', () => {
-  assert.match(view, /props\.service === 'transfer' && transferDestinationType === 'FBA'[^\n]+未换标货物目的 FBA 仓/)
-  assert.match(view, /此处只表示不换标箱子的去向/)
+  assert.match(view, /props\.service === 'transfer' && transferDestinationType === 'FBA'[^\n]+FBA 目的仓/)
   assert.match(view, /FBA 货件编号<\/span><el-input v-model="form\.fbaShipmentNo" placeholder="选填，可后续补充"/)
   assert.match(view, /transferDestinationType\.value === 'FBA' && !form\.destination/)
   assert.match(view, /transferDestinationType\.value === 'PRIVATE'.*!form\.privateDestinationPostalCode/)
   assert.match(view, /整票换标货物目的 FBA 仓/)
-  assert.match(view, /暂不支持一票多个目的仓/)
   assert.match(view, /if \(!transferRelabelDefaultDestination\.value\) \{ ElMessage\.warning\('请选择整票换标货物的 FBA 目的仓'\)/)
   assert.match(view, /destinationWarehouseCode: transferRelabelDefaultDestination\.value \|\| undefined/)
   const transferRelabelSection = view.split('warehouse-transfer-relabel">')[1]?.split('warehouse-transfer-submit-bar')[0] || ''
@@ -56,15 +54,14 @@ test('仓储转运不要求客户填写内部入仓号和我方箱唛，但换
   assert.doesNotMatch(transferConfig, /进仓编号/)
   assert.doesNotMatch(transferSubmit, /inboundCode|sourceLastlegOrderIds/)
   assert.match(view, /货物明细/)
-  assert.match(view, /客户只填写自己的箱唛，我方箱唛由系统生成/)
+  assert.match(view, /客户箱唛号 \*/)
   assert.match(view, /downloadTransferCartonMarkTemplate/)
   assert.match(view, /importTransferCartonMarks/)
-  assert.match(view, /下载 SKU 关联模板/)
-  assert.match(view, /上传 SKU 关联/)
-  assert.match(view, /下载箱号关联模板/)
-  assert.match(view, /上传箱号关联/)
-  assert.match(view, /下载 SKU 混箱模板/)
-  assert.match(view, /上传 SKU 混箱/)
+  assert.match(view, /<strong>SKU 关联<\/strong>/)
+  assert.match(view, /<strong>箱号关联<\/strong>/)
+  assert.match(view, /<strong>SKU 混箱<\/strong>/)
+  assert.match(view, />下载模板<\/el-button>/)
+  assert.match(view, />上传文件<\/el-button>/)
   assert.match(view, /换标类型/)
   assert.match(view, /v-if="labelingMode === 'carton'"/)
   assert.match(view, /v-else-if="labelingMode === 'sku'"/)
@@ -80,9 +77,29 @@ test('仓储转运不要求客户填写内部入仓号和我方箱唛，但换
   assert.doesNotMatch(view, /<th v-if="props\.service === 'transfer'">FNSKU \/ 箱唛<\/th>/)
 })
 
+test('仓储转运货物明细可按 SKU 和箱数打印客户预贴箱唛', () => {
+  assert.match(view, /printTransferDraftCartonMarks/)
+  assert.match(view, /请先填写商品 SKU 和对应的整数箱数/)
+  assert.match(view, /Array\.from\(\{ length: Number\(row\.quantity\) \}/)
+  assert.match(view, /row\.customerCartonMarks = marks\.join\('\\n'\)/)
+  assert.match(view, /仓储转运客户箱唛/)
+  assert.match(view, /@click="printTransferDraftCartonMarks"/)
+  assert.match(view, /打印唛头/)
+  assert.match(view, /单次最多打印 500 张箱唛/)
+})
+
+test('仓储转运换标资料按步骤分组展示', () => {
+  assert.match(view, /<span v-if="props\.service === 'transfer'" class="warehouse-step-number">1<\/span>货物明细/)
+  assert.match(view, /<span class="warehouse-step-number">2<\/span>换标申请/)
+  assert.match(view, /<span>3<\/span>明细关联模板/)
+  assert.match(view, /<span class="warehouse-step-number">4<\/span>绑定明细/)
+  assert.match(view, /warehouse-transfer-template-group/)
+  assert.match(view, /warehouse-transfer-relabel/)
+})
+
 test('上门提货不提交物流号，需要换标时随转运单登记申请', () => {
   assert.match(view, /trackingNo:\s*form\.deliveryMethod === 'CUSTOMER_DELIVERY'\s*\?[^:]+:\s*undefined/)
-  assert.match(view, /本次提交将同时登记换标申请/)
+  assert.match(view, /relabelItems: form\.relabel/)
   assert.match(view, /form\.deliveryMethod === 'CUSTOMER_DELIVERY'.*物流跟踪号/s)
   assert.match(view, /提货联系人/)
   assert.match(view, /联系人电话/)
@@ -109,7 +126,7 @@ test('仓储转运列表操作仓使用海外仓接口数据', () => {
 test('仓储转运预计发货时间可选并只读展示实际发货时间', () => {
   assert.match(view, /预计发货时间/)
   assert.match(view, /v-model="form\.estimatedShipAt"/)
-  assert.match(view, /选填，可线下确认后补充/)
+  assert.match(view, /v-model="form\.estimatedShipAt"[^>]+placeholder="选填"/)
   assert.doesNotMatch(view, /!form\.estimatedShipAt && '预计发货时间'/)
   assert.match(view, /estimatedShipAt: form\.estimatedShipAt/)
   assert.match(view, /实际发货时间由仓库出库或 PDA 完成后回填/)