Merge branch 'release/test' of http://8.163.30.128:10082/html/client-web into release/test

src/modules/first-leg/components/FirstLegOrderEditorShell.vue

@@ -47,7 +47,7 @@ const emit = defineEmits<{
 .editor-page-nav span { color: var(--muted); font-size: 12px; }
 .editor-page-body { padding: 26px 32px 34px; }
 .editor-page-footer { position: sticky; z-index: 3; bottom: 0; display: flex; justify-content: center; padding: 12px 24px; border-top: 1px solid #edf0f5; background: rgba(255, 255, 255, 0.96); box-shadow: 0 -6px 18px rgba(15, 31, 58, .06); backdrop-filter: blur(10px); }
-.editor-page-footer :deep(.editor-actions) { width: min(100%, 900px); justify-content: flex-start; }
+.editor-page-footer :deep(.editor-actions) { width: min(100%, 900px); justify-content: center; }
 .editor-page-footer :deep(.editor-actions > .el-button) { min-width: 132px; min-height: 42px; }
 .editor-page-footer :deep(.editor-actions > .el-button:last-child) { min-width: 172px; }
 :global(.first-leg-editor-dialog.el-dialog) { display: flex; max-width: 1500px; height: 94vh; margin-bottom: 0; flex-direction: column; overflow: hidden; border-radius: 6px; }

src/modules/first-leg/views/FirstLegOrdersView.test.mjs

@@ -26,6 +26,7 @@ test('opens order creation as a dedicated protected page while keeping draft edi
   assert.match(editorShellSource, /width="94vw"/)
   assert.doesNotMatch(editorShellSource, /<el-drawer/)
   assert.match(editorShellSource, /返回订单列表/)
+  assert.match(editorShellSource, /\.editor-page-footer :deep\(\.editor-actions\) \{[^}]*justify-content: center;/)
 })
 
 test('exposes real list, draft, submit, and detail workflow entries without cancellation', () => {
@@ -330,6 +331,7 @@ test('collects the backend-required first-leg fields', () => {
 
 test('distills order creation into the confirmed prototype sections with server pricing', () => {
   const cargoTableSource = source.slice(source.indexOf('<table class="cargo-edit-table">'), source.indexOf('</table>', source.indexOf('<table class="cargo-edit-table">')))
+  const cargoToolbarSource = source.slice(source.indexOf('<div class="cargo-table-toolbar">'), source.indexOf('<div class="cargo-table-wrap">', source.indexOf('<div class="cargo-table-toolbar">')))
   assert.match(source, /<h3>目的地信息<\/h3>/)
   assert.match(source, /<h3>客户下单<\/h3>/)
   assert.match(source, /<h3>货物明细<\/h3>/)
@@ -339,11 +341,16 @@ test('distills order creation into the confirmed prototype sections with server
   assert.match(source, /class="prototype-form-row prototype-form-row--tabs"/)
   assert.match(source, /<table class="cargo-edit-table">/)
   assert.match(source, /auth\.hasPermission\('order:first-leg:create'\)[\s\S]*批量导入订单/)
-  assert.doesNotMatch(source, /create-batch-import-entry|需要一次创建多条订单|页面上方“Excel 批量导入”/)
+  assert.doesNotMatch(source, /create-batch-import-entry/)
+  assert.match(cargoToolbarSource, /isCreatePage && !routeDraftId && canCreateOrder/)
+  assert.match(cargoToolbarSource, /downloadBatchTemplate[\s\S]*下载 Excel 模板/)
+  assert.match(cargoToolbarSource, /openBatchImport[\s\S]*Excel 批量导入/)
+  assert.match(cargoToolbarSource, /Excel 导入用于一次创建多条订单草稿/)
   assert.match(source, /导入成功的数据只创建草稿，不会直接提交审核/)
   assert.match(source, /下载正式模板[\s\S]*选择 Excel/)
   assert.match(source, /仅支持 \.xlsx，文件不超过 5MB、最多 50 行/)
-  assert.match(source, /cargo\.woodenProduct（true\/false）[\s\S]*customsInspection 必须填写 true/)
+  assert.match(source, /直接选择模板内的中文下拉项，不需要填写英文代码或内部编号/)
+  assert.match(source, /选择木制品时，模板会要求同步选择需要商检/)
   assert.match(source, /下载 Excel 错误报告/)
   assert.match(source, /batchImportError[\s\S]*requestId[\s\S]*traceId/)
   assert.match(source, /添加行[\s\S]*删除所选行/)

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

@@ -1931,7 +1931,12 @@ async function searchOrders(model: QueryModel) {
         <section class="order-form-section prototype-section cargo-section">
           <div class="order-section-heading cargo-table-heading"><div><h3>货物明细</h3></div></div>
           <div class="cargo-table-toolbar">
-            <span class="cargo-table-hint">可逐行维护货物明细；批量订单请返回订单列表使用正式 Excel 导入。</span>
+            <div v-if="isCreatePage && !routeDraftId && canCreateOrder" class="cargo-import-actions">
+              <el-button class="cargo-download-button" :loading="batchTemplateDownloading" @click="downloadBatchTemplate"><Download :size="16" />下载 Excel 模板</el-button>
+              <el-button class="cargo-upload-button" type="primary" plain @click="openBatchImport"><Upload :size="16" />Excel 批量导入</el-button>
+              <span class="cargo-table-hint">Excel 导入用于一次创建多条订单草稿。</span>
+            </div>
+            <span v-else class="cargo-table-hint">可逐行维护货物明细。</span>
             <div class="cargo-table-actions"><el-button @click="addCargoItem"><Plus :size="16" />添加行</el-button><el-button type="danger" plain :disabled="!selectedCargoIds.length" @click="removeSelectedCargoItems"><Trash2 :size="15" />删除所选行</el-button></div>
           </div>
           <div class="cargo-table-wrap">
@@ -2001,7 +2006,7 @@ async function searchOrders(model: QueryModel) {
 
     <el-dialog v-model="batchImportOpen" title="Excel 批量创建订单草稿" width="680px" destroy-on-close append-to-body>
       <div class="batch-import-dialog">
-        <el-alert title="使用服务端正式模板创建订单草稿" description="仅支持 .xlsx，文件不超过 5MB、最多 50 行；导入成功的数据只创建草稿，不会直接提交审核。模板包含 cargo.woodenProduct（true/false）；任一货物填写 true 时，customsInspection 必须填写 true。" type="info" :closable="false" show-icon />
+        <el-alert title="使用中文模板创建订单草稿" description="仅支持 .xlsx，文件不超过 5MB、最多 50 行；请直接选择模板内的中文下拉项，不需要填写英文代码或内部编号。导入成功的数据只创建草稿，不会直接提交审核；选择木制品时，模板会要求同步选择需要商检。" type="info" :closable="false" show-icon />
         <el-alert v-if="batchImportError" title="批量导入处理失败" :description="batchImportError" type="error" :closable="false" show-icon />
         <div class="batch-import-actions">
           <input ref="batchImportInput" class="cargo-import-input" type="file" accept=".xlsx,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" @change="selectBatchImportFile" />