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),