Merge remote-tracking branch 'websoft/master'

src/views/business/components/master-order-dispatch.vue

@@ -175,7 +175,7 @@
             <strong>待提交 <em>{{ pending.length }}</em> 条 <span class="pending-summary-text">（{{ pendingSegmentSummary }}）</span></strong>
             <el-link type="primary" @click="pendingExpanded = !pendingExpanded">{{ pendingExpanded ? '收起待调度列表' : '展开待调度列表' }}</el-link>
           </div>
-          <div class="pending-actions"><el-button @click="$emit('back')">返回</el-button><el-button type="primary" :loading="submitting" @click="submit">确认调度</el-button></div>
+          <div class="pending-actions"><el-button @click="$emit('back')">取消</el-button><el-button type="primary" :loading="submitting" @click="submit">确认调度</el-button></div>
         </div>
         <div v-show="pendingExpanded" class="pending-list">
           <template v-for="(items, segmentNo) in pendingGroups" :key="segmentNo">
@@ -712,7 +712,7 @@ export default {
 .freight-form { :deep(.freight-unit-select) { width: 92px; flex: 0 0 92px; min-width: 0; } }
 .carrier-type-form { margin-top: 16px; }
 .carrier-form { padding-top: 8px; }
-.segment-actions { display: flex; justify-content: flex-end; gap: 12px; padding-top: 4px; }
+.segment-actions { display: flex; justify-content: flex-end; padding-top: 4px; }
 .dispatch-bottom { position: fixed; z-index: 10; bottom: 0; left: $sidebar_width; width: calc(100% - #{$sidebar_width}); border-top: 1px solid #eff1f7; background: #fff; box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.04); }
 :global(.avue--collapse) .dispatch-bottom { left: $sidebar_collapse; width: calc(100% - #{$sidebar_collapse}); }
 :global(.avue-layout--horizontal) .dispatch-bottom { left: 0; width: 100%; }
@@ -721,7 +721,7 @@ export default {
 .pending-summary, .pending-actions { display: flex; align-items: center; }
 .pending-summary { gap: 16px; }
 .pending-summary-text { color: #606266; font-weight: 400; }
-.pending-actions { gap: 12px; margin-left: auto; }
+.pending-actions { margin-left: auto; }
 .pending-list { max-height: min(420px, calc(100vh - 130px)); padding: 0 32px 16px; overflow: auto; h3 { margin: 14px 0 10px; font-size: 14px; } }
 .table-actions { display: flex; flex-wrap: wrap; gap: 8px; }
 @media screen and (max-width: 1200px) { .overview-content { grid-template-columns: 1fr; } .route-overview { justify-content: flex-start; } }