From ea35a12f8b6e9dc68381ceba98ce644c83cbf7c1 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Tue, 29 Sep 2026 03:58:14 +0100
Subject: [PATCH] fix(admin): separate sailing search and actions

---
 .../pages/SailingCalendarView.vue                | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/modules/sailing-calendar/pages/SailingCalendarView.vue b/src/modules/sailing-calendar/pages/SailingCalendarView.vue
index 3e955347..0babdce1 100644
--- a/src/modules/sailing-calendar/pages/SailingCalendarView.vue
+++ b/src/modules/sailing-calendar/pages/SailingCalendarView.vue
@@ -396,12 +396,6 @@ onMounted(() => void load())
   <AdminPage as="div" class="sailing-calendar-page admin-density">
     <div class="calendar-toolbar surface-panel">
       <div class="toolbar-content">
-        <div class="toolbar-actions">
-          <el-button @click="resetFilters">重置</el-button>
-          <el-button v-if="canManageTemplates" @click="openManagement('channels')">渠道与周模板</el-button>
-          <el-button v-if="canManageTemplates" plain @click="openManagement('templates')">按周批量生成</el-button>
-          <el-button v-if="canCreate" type="primary" @click="openCreate"><Plus :size="16" />新增单个船次</el-button>
-        </div>
         <div class="toolbar-filters">
           <el-select v-model="query.warehouseId" clearable filterable placeholder="全部收货仓" class="filter-select"><el-option v-for="option in filters.warehouses" :key="option.value" :label="option.label" :value="option.value" /></el-select>
           <el-select v-model="query.channelCode" clearable filterable placeholder="全部渠道" class="filter-select"><el-option v-for="option in filters.channels" :key="option.value" :label="option.label" :value="option.value" /></el-select>
@@ -410,6 +404,12 @@ onMounted(() => void load())
           <el-select v-model="query.status" clearable placeholder="全部状态" class="filter-select"><el-option label="开放收货" value="OPEN" /><el-option label="已截止" value="CLOSED" /><el-option label="已开船" value="DEPARTED" /><el-option label="已取消" value="CANCELLED" /></el-select>
           <el-input v-model="query.keyword" clearable placeholder="渠道 / 船名 / 航次 / 船期编号" class="filter-keyword" @keyup.enter="load" />
         </div>
+        <div class="toolbar-actions">
+          <el-button @click="resetFilters">重置</el-button>
+          <el-button v-if="canManageTemplates" @click="openManagement('channels')">渠道与周模板</el-button>
+          <el-button v-if="canManageTemplates" plain @click="openManagement('templates')">按周批量生成</el-button>
+          <el-button v-if="canCreate" type="primary" @click="openCreate"><Plus :size="16" />新增单个船次</el-button>
+        </div>
       </div>
     </div>
     <LoadErrorState v-if="error" title="船期日历加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
@@ -431,7 +431,5 @@ onMounted(() => void load())
 </template>
 
 <style scoped>
-.sailing-calendar-page{min-width:0}.calendar-toolbar{display:grid;align-items:center;padding:12px 16px;margin-bottom:12px}.toolbar-title{display:flex;align-items:flex-start;gap:12px;color:var(--cc-primary)}.toolbar-title h1{margin:0;color:var(--cc-text);font-size:21px;line-height:1.3}.toolbar-title p{max-width:180px;margin:6px 0 0;color:var(--cc-text-secondary);font-size:12px;line-height:1.5}.toolbar-content{display:grid;grid-template-columns:auto minmax(0,1fr);align-items:center;gap:12px;min-width:0}.toolbar-filters{display:grid;grid-template-columns:repeat(5,minmax(100px,1fr)) minmax(200px,1.35fr);gap:8px;min-width:0}.filter-select,.filter-keyword{width:100%}.toolbar-actions{display:flex;align-items:center;justify-content:flex-start;gap:8px;white-space:nowrap}.toolbar-actions .el-button{margin:0}.filter-keyword{max-width:none}.calendar-layout{display:grid;grid-template-columns:minmax(0,1fr) 390px;gap:12px;align-items:start}.calendar-panel{overflow:hidden}.calendar-head{display:flex;align-items:center;justify-content:space-between;padding:12px 16px;border-bottom:1px solid var(--cc-border)}.month-switch{display:flex;align-items:center;gap:8px}.month-switch strong{min-width:120px;text-align:center;font-size:20px}.calendar-note{color:var(--cc-text-secondary);font-size:12px}.week-head,.calendar-grid{display:grid;grid-template-columns:repeat(7,minmax(0,1fr))}.week-head{background:#f7f8fc;border-bottom:1px solid var(--cc-border)}.week-head span{padding:10px;text-align:center;color:var(--cc-text-secondary);font-size:12px}.calendar-cell{min-height:116px;padding:10px 9px;border:0;border-right:1px solid var(--cc-border);border-bottom:1px solid var(--cc-border);background:var(--cc-surface);text-align:left;cursor:pointer;transition:background .15s ease}.calendar-cell:nth-child(7n){border-right:0}.calendar-cell:hover,.calendar-cell.selected{background:#f0f5ff}.calendar-cell.muted{background:#fafafa;color:#b3bac8}.day-number{font-weight:600;color:var(--cc-text)}.calendar-cell.selected .day-number{display:inline-flex;align-items:center;justify-content:center;width:26px;height:26px;border-radius:50%;background:var(--cc-primary);color:#fff}.cell-records{display:flex;flex-direction:column;gap:5px;margin-top:10px}.cell-count{color:#3b6eea;font-size:12px;font-weight:600}.cell-count i{display:inline-block;width:7px;height:7px;margin-right:4px;border-radius:50%;background:#5b84ef}.cell-route{overflow:hidden;color:var(--cc-text-secondary);font-size:11px;text-overflow:ellipsis;white-space:nowrap}.cell-route em{font-style:normal}.cell-warning{color:#d58518;font-size:11px}.detail-panel{min-height:420px}.detail-header{display:flex;align-items:flex-start;justify-content:space-between;padding:14px 16px;border-bottom:1px solid var(--cc-border)}.detail-header h2{margin:0;font-size:20px}.detail-header p{margin:5px 0 0;color:var(--cc-text-secondary);font-size:12px}.empty-detail{padding:48px 20px;color:var(--cc-text-secondary);text-align:center}.sailing-list{display:flex;flex-direction:column;gap:10px;padding:14px}.sailing-card{width:100%;padding:14px;border:1px solid var(--cc-border);border-radius:10px;background:#fff;text-align:left;cursor:pointer}.sailing-card:hover,.sailing-card.active{border-color:var(--cc-primary);box-shadow:0 3px 12px rgba(65,95,180,.12)}.sailing-card-head{display:flex;align-items:center;justify-content:space-between;gap:8px}.sailing-card-head strong{font-size:15px;color:var(--cc-text)}.voyage,.cutoff-line{margin-top:5px;color:var(--cc-text-secondary);font-size:12px}.route-line{margin-top:12px;color:var(--cc-text);font-size:13px}.route-line b{margin:0 5px;color:var(--cc-primary)}.volume-line{display:flex;justify-content:space-between;margin-top:12px;padding-top:10px;border-top:1px solid #edf0f5;color:var(--cc-text-secondary);font-size:12px}.volume-line b{color:var(--cc-text)}.detail-actions{display:flex;flex-wrap:wrap;gap:8px;padding:14px;border-top:1px solid var(--cc-border)}.detail-actions .el-button{margin:0}.sailing-form{padding-top:4px}.sailing-form .el-collapse{width:100%;margin-bottom:12px}.form-readonly-value{width:100%;line-height:32px}.cutoff-config{display:flex;flex-direction:column;gap:10px;width:100%}.cutoff-mode-group{display:flex;width:100%}.cutoff-mode-group .el-radio-button{flex:1}.cutoff-mode-group .el-radio-button__inner{display:block;width:100%;padding:9px 10px}.cutoff-rule-panel{display:flex;flex-direction:column;gap:10px;padding:12px;border:1px solid var(--cc-border);border-radius:8px;background:#fafbfe}.cutoff-rule-row,.cutoff-time-row{display:flex;align-items:center;gap:10px;min-width:0}.cutoff-control-label{flex:0 0 64px;color:var(--cc-text-secondary);font-size:12px}.cutoff-presets{display:flex;flex:1;min-width:0}.cutoff-presets .el-radio-button{flex:1;min-width:0}.cutoff-presets .el-radio-button__inner{display:block;width:100%;padding:8px 4px}.cutoff-days-input{width:92px;flex:0 0 92px}.cutoff-time-picker{width:auto!important;flex:1}.cutoff-calculated{display:flex;align-items:baseline;gap:8px;padding:9px 10px;border-radius:6px;background:#f0f4fc;color:var(--cc-text-secondary);font-size:12px}.cutoff-calculated strong{color:var(--cc-text);font-size:13px;font-weight:600}.cutoff-calculated small{color:var(--cc-text-secondary);font-size:11px}.template-cutoff-controls{display:flex;align-items:center;gap:8px}.template-cutoff-controls .el-radio-group{display:flex;flex:1}.template-cutoff-controls .el-radio-button{flex:1}.template-cutoff-controls .el-radio-button__inner{width:100%;padding-left:8px;padding-right:8px}.template-cutoff-controls .el-input-number{width:110px}.detail-summary,.advice-highlight{display:flex;gap:12px;flex-wrap:wrap;margin-bottom:14px}.detail-summary span,.advice-highlight span{padding:10px 12px;border-radius:8px;background:#f5f7fb;color:var(--cc-text-secondary);font-size:12px}.detail-summary b,.advice-highlight b{display:block;margin-top:4px;color:var(--cc-text);font-size:16px}.advice-note{margin:0 0 12px;color:var(--cc-text-secondary);font-size:12px}.management-toolbar{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:12px;color:var(--cc-text-secondary);font-size:12px}.management-error{margin-bottom:12px}.generation-shortcuts{display:flex;align-items:center;gap:8px;margin:-2px 0 10px;color:var(--cc-text-secondary);font-size:12px}.generation-shortcuts .el-button{margin:0}.preview-table{margin-top:14px}.preview-table h4{margin:0 0 8px;color:var(--cc-text);font-size:14px}.form-hint{display:block;margin-top:6px;color:var(--cc-text-secondary);font-size:12px}.exception-note{margin-bottom:12px;color:var(--cc-text-secondary);font-size:12px}.merge-reference{margin-top:18px;padding-top:16px;border-top:1px solid var(--cc-border)}.merge-reference-head{display:flex;align-items:center;justify-content:space-between;margin-bottom:10px}.merge-reference-head strong{color:var(--cc-text);font-size:14px}.merge-reference-head span{color:var(--cc-text-secondary);font-size:12px}.merge-reference-current{display:flex;gap:8px;flex-wrap:wrap;margin-bottom:10px}.merge-reference-current span{padding:8px 10px;border-radius:8px;background:#f5f7fb;color:var(--cc-text-secondary);font-size:12px}.merge-reference-current b{margin-left:3px;color:var(--cc-text)}.merge-reference-sub{margin-top:3px;color:var(--cc-text-secondary);font-size:11px}.merge-reference-note{margin-top:10px}@media(max-width:1280px){.toolbar-content{grid-template-columns:1fr;gap:8px}.toolbar-actions{order:1}.toolbar-filters{order:2;grid-template-columns:repeat(3,minmax(120px,1fr))}.toolbar-title p{max-width:none}.calendar-layout{grid-template-columns:minmax(0,1fr) 340px}}@media(max-width:900px){.calendar-layout{grid-template-columns:1fr}.detail-panel{min-height:0}.calendar-cell{min-height:96px}}@media(max-width:560px){.toolbar-filters{grid-template-columns:1fr 1fr}.toolbar-actions{align-items:stretch;flex-wrap:wrap}.toolbar-actions>*{flex:1}.filter-select,.filter-keyword{width:100%}.calendar-cell{min-height:80px;padding:7px 5px}.cell-route,.cutoff-line{display:none}}
+.sailing-calendar-page{min-width:0}.calendar-toolbar{display:grid;align-items:center;padding:12px 16px;margin-bottom:12px}.toolbar-title{display:flex;align-items:flex-start;gap:12px;color:var(--cc-primary)}.toolbar-title h1{margin:0;color:var(--cc-text);font-size:21px;line-height:1.3}.toolbar-title p{max-width:180px;margin:6px 0 0;color:var(--cc-text-secondary);font-size:12px;line-height:1.5}.toolbar-content{display:flex;flex-direction:column;gap:8px;min-width:0}.toolbar-filters{display:grid;grid-template-columns:repeat(5,minmax(100px,1fr)) minmax(200px,1.35fr);gap:8px;min-width:0}.filter-select,.filter-keyword{width:100%}.toolbar-actions{display:flex;align-items:center;justify-content:flex-start;gap:8px;white-space:nowrap}.toolbar-actions .el-button{margin:0}.filter-keyword{max-width:none}.calendar-layout{display:grid;grid-template-columns:minmax(0,1fr) 390px;gap:12px;align-items:start}.calendar-panel{overflow:hidden}.calendar-head{display:flex;align-items:center;justify-content:space-between;padding:12px 16px;border-bottom:1px solid var(--cc-border)}.month-switch{display:flex;align-items:center;gap:8px}.month-switch strong{min-width:120px;text-align:center;font-size:20px}.calendar-note{color:var(--cc-text-secondary);font-size:12px}.week-head,.calendar-grid{display:grid;grid-template-columns:repeat(7,minmax(0,1fr))}.week-head{background:#f7f8fc;border-bottom:1px solid var(--cc-border)}.week-head span{padding:10px;text-align:center;color:var(--cc-text-secondary);font-size:12px}.calendar-cell{min-height:116px;padding:10px 9px;border:0;border-right:1px solid var(--cc-border);border-bottom:1px solid var(--cc-border);background:var(--cc-surface);text-align:left;cursor:pointer;transition:background .15s ease}.calendar-cell:nth-child(7n){border-right:0}.calendar-cell:hover,.calendar-cell.selected{background:#f0f5ff}.calendar-cell.muted{background:#fafafa;color:#b3bac8}.day-number{font-weight:600;color:var(--cc-text)}.calendar-cell.selected .day-number{display:inline-flex;align-items:center;justify-content:center;width:26px;height:26px;border-radius:50%;background:var(--cc-primary);color:#fff}.cell-records{display:flex;flex-direction:column;gap:5px;margin-top:10px}.cell-count{color:#3b6eea;font-size:12px;font-weight:600}.cell-count i{display:inline-block;width:7px;height:7px;margin-right:4px;border-radius:50%;background:#5b84ef}.cell-route{overflow:hidden;color:var(--cc-text-secondary);font-size:11px;text-overflow:ellipsis;white-space:nowrap}.cell-route em{font-style:normal}.cell-warning{color:#d58518;font-size:11px}.detail-panel{min-height:420px}.detail-header{display:flex;align-items:flex-start;justify-content:space-between;padding:14px 16px;border-bottom:1px solid var(--cc-border)}.detail-header h2{margin:0;font-size:20px}.detail-header p{margin:5px 0 0;color:var(--cc-text-secondary);font-size:12px}.empty-detail{padding:48px 20px;color:var(--cc-text-secondary);text-align:center}.sailing-list{display:flex;flex-direction:column;gap:10px;padding:14px}.sailing-card{width:100%;padding:14px;border:1px solid var(--cc-border);border-radius:10px;background:#fff;text-align:left;cursor:pointer}.sailing-card:hover,.sailing-card.active{border-color:var(--cc-primary);box-shadow:0 3px 12px rgba(65,95,180,.12)}.sailing-card-head{display:flex;align-items:center;justify-content:space-between;gap:8px}.sailing-card-head strong{font-size:15px;color:var(--cc-text)}.voyage,.cutoff-line{margin-top:5px;color:var(--cc-text-secondary);font-size:12px}.route-line{margin-top:12px;color:var(--cc-text);font-size:13px}.route-line b{margin:0 5px;color:var(--cc-primary)}.volume-line{display:flex;justify-content:space-between;margin-top:12px;padding-top:10px;border-top:1px solid #edf0f5;color:var(--cc-text-secondary);font-size:12px}.volume-line b{color:var(--cc-text)}.detail-actions{display:flex;flex-wrap:wrap;gap:8px;padding:14px;border-top:1px solid var(--cc-border)}.detail-actions .el-button{margin:0}.sailing-form{padding-top:4px}.sailing-form .el-collapse{width:100%;margin-bottom:12px}.form-readonly-value{width:100%;line-height:32px}.cutoff-config{display:flex;flex-direction:column;gap:10px;width:100%}.cutoff-mode-group{display:flex;width:100%}.cutoff-mode-group .el-radio-button{flex:1}.cutoff-mode-group .el-radio-button__inner{display:block;width:100%;padding:9px 10px}.cutoff-rule-panel{display:flex;flex-direction:column;gap:10px;padding:12px;border:1px solid var(--cc-border);border-radius:8px;background:#fafbfe}.cutoff-rule-row,.cutoff-time-row{display:flex;align-items:center;gap:10px;min-width:0}.cutoff-control-label{flex:0 0 64px;color:var(--cc-text-secondary);font-size:12px}.cutoff-presets{display:flex;flex:1;min-width:0}.cutoff-presets .el-radio-button{flex:1;min-width:0}.cutoff-presets .el-radio-button__inner{display:block;width:100%;padding:8px 4px}.cutoff-days-input{width:92px;flex:0 0 92px}.cutoff-time-picker{width:auto!important;flex:1}.cutoff-calculated{display:flex;align-items:baseline;gap:8px;padding:9px 10px;border-radius:6px;background:#f0f4fc;color:var(--cc-text-secondary);font-size:12px}.cutoff-calculated strong{color:var(--cc-text);font-size:13px;font-weight:600}.cutoff-calculated small{color:var(--cc-text-secondary);font-size:11px}.template-cutoff-controls{display:flex;align-items:center;gap:8px}.template-cutoff-controls .el-radio-group{display:flex;flex:1}.template-cutoff-controls .el-radio-button{flex:1}.template-cutoff-controls .el-radio-button__inner{width:100%;padding-left:8px;padding-right:8px}.template-cutoff-controls .el-input-number{width:110px}.detail-summary,.advice-highlight{display:flex;gap:12px;flex-wrap:wrap;margin-bottom:14px}.detail-summary span,.advice-highlight span{padding:10px 12px;border-radius:8px;background:#f5f7fb;color:var(--cc-text-secondary);font-size:12px}.detail-summary b,.advice-highlight b{display:block;margin-top:4px;color:var(--cc-text);font-size:16px}.advice-note{margin:0 0 12px;color:var(--cc-text-secondary);font-size:12px}.management-toolbar{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:12px;color:var(--cc-text-secondary);font-size:12px}.management-error{margin-bottom:12px}.generation-shortcuts{display:flex;align-items:center;gap:8px;margin:-2px 0 10px;color:var(--cc-text-secondary);font-size:12px}.generation-shortcuts .el-button{margin:0}.preview-table{margin-top:14px}.preview-table h4{margin:0 0 8px;color:var(--cc-text);font-size:14px}.form-hint{display:block;margin-top:6px;color:var(--cc-text-secondary);font-size:12px}.exception-note{margin-bottom:12px;color:var(--cc-text-secondary);font-size:12px}.merge-reference{margin-top:18px;padding-top:16px;border-top:1px solid var(--cc-border)}.merge-reference-head{display:flex;align-items:center;justify-content:space-between;margin-bottom:10px}.merge-reference-head strong{color:var(--cc-text);font-size:14px}.merge-reference-head span{color:var(--cc-text-secondary);font-size:12px}.merge-reference-current{display:flex;gap:8px;flex-wrap:wrap;margin-bottom:10px}.merge-reference-current span{padding:8px 10px;border-radius:8px;background:#f5f7fb;color:var(--cc-text-secondary);font-size:12px}.merge-reference-current b{margin-left:3px;color:var(--cc-text)}.merge-reference-sub{margin-top:3px;color:var(--cc-text-secondary);font-size:11px}.merge-reference-note{margin-top:10px}@media(max-width:1280px){.toolbar-filters{grid-template-columns:repeat(3,minmax(120px,1fr))}.toolbar-title p{max-width:none}.calendar-layout{grid-template-columns:minmax(0,1fr) 340px}}@media(max-width:900px){.calendar-layout{grid-template-columns:1fr}.detail-panel{min-height:0}.calendar-cell{min-height:96px}}@media(max-width:560px){.toolbar-filters{grid-template-columns:1fr 1fr}.toolbar-actions{align-items:stretch;flex-wrap:wrap}.toolbar-actions>*{flex:1}.filter-select,.filter-keyword{width:100%}.calendar-cell{min-height:80px;padding:7px 5px}.cell-route,.cutoff-line{display:none}}
 </style>
-
-\n
\ No newline at end of file