Merge remote-tracking branch 'websoft/master'

src/views/business/components/business-crud-page.vue

@@ -2072,6 +2072,12 @@
             查看过程配置
           </el-link>
         </div>
+        <el-button
+          v-if="isStandaloneFormPage && !showTransportPlanCreateActions"
+          @click="closeCrudDialog"
+        >
+          关闭
+        </el-button>
         <el-button
           v-if="config.enableDraftSave && !dialogReadonly"
           type="primary"
@@ -2106,12 +2112,6 @@
             确认创建
           </el-button>
         </div>
-        <el-button
-          v-if="isStandaloneFormPage && !showTransportPlanCreateActions"
-          @click="closeCrudDialog"
-        >
-          关闭
-        </el-button>
       </template>
 
       <template #menu="{ row, index }">
@@ -13386,7 +13386,7 @@ export default {
 
   &__dispatch-shipping-form {
     :deep(.el-form-item) {
-      margin-bottom: 16px;
+      margin-bottom: 14px;
     }
   }
 
@@ -13900,7 +13900,7 @@ export default {
     width: 100%;
 
     :deep(.el-form-item) {
-      margin-bottom: 16px;
+      margin-bottom: 14px;
     }
 
     :deep(.el-select),

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

@@ -704,7 +704,7 @@ export default {
 .route-overview__line { flex: 0 1 56px; min-width: 24px; height: 32px; margin-top: 0; border-bottom: 6px solid #e4e7ed; }
 .segment-header { min-height: 46px; padding: 0 20px; border-bottom: 1px solid #eff1f7; font-weight: 600; em { color: #409eff; font-style: normal; } }
 .segment-content { padding: 16px 24px; }
-.dispatch-form { :deep(.el-form-item) { margin-bottom: 16px; } :deep(.el-input), :deep(.el-select), :deep(.el-date-editor), :deep(.el-input-number) { width: 100%; } :deep(.el-input-group__append .el-select) { width: auto; } }
+.dispatch-form { :deep(.el-form-item) { margin-bottom: 14px; } :deep(.el-input), :deep(.el-select), :deep(.el-date-editor), :deep(.el-input-number) { width: 100%; } :deep(.el-input-group__append .el-select) { width: auto; } }
 .transport-type-field :deep(.el-input) { width: 240px; }
 .goods-heading { display: flex; align-items: center; justify-content: space-between; margin: 0 -24px 12px; padding: 14px 24px; border-top: 1px solid #eff1f7; border-bottom: 1px solid #eff1f7; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } span { color: #909399; font-size: 13px; } }
 .freight-heading { margin: 16px 0 12px; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } }

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

@@ -532,10 +532,10 @@
       </template>
     </el-dialog>
     <footer>
-      <el-button @click="$emit('back')">返回</el-button
-      ><el-button @click="saveDraft">暂存</el-button
-      ><el-button type="primary" @click="confirmCreate">确认创建</el-button
-      ><el-button type="primary" @click="createAndDispatch">创建并调度</el-button>
+      <el-button @click="$emit('back')">返回</el-button>
+      <el-button type="primary" plain @click="saveDraft">暂存</el-button>
+      <el-button type="primary" plain @click="confirmCreate">确认创建</el-button>
+      <el-button type="primary" @click="createAndDispatch">创建并调度</el-button>
     </footer>
   </div>
 </template>
@@ -2050,7 +2050,22 @@ export default {
 footer {
   display: flex;
   justify-content: flex-end;
-  gap: 8px;
-  padding: 16px 0;
+  gap: 12px;
+  padding: 12px 24px;
+  position: fixed;
+  right: 0;
+  left: 230px;
+  bottom: 0;
+  margin: 0;
+  z-index: 10;
+  background: #fff;
+  border-top: 1px solid #eff1f7;
+  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.06);
+}
+:global(.avue--collapse footer) {
+  left: 60px;
+}
+:global(.avue-layout--horizontal footer) {
+  left: 0;
 }
 </style>