Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/business/contract-manage-change.vue

src/views/settlement/components/pre-settlement-editor.vue

@@ -292,19 +292,6 @@
       <section-card title="附件">
         <div class="pre-settlement-editor__attachment">
           <div class="pre-settlement-editor__attachment-actions">
-            <vehicle-attachment-upload
-              ref="attachmentUploadRef"
-              v-model="attachments"
-              :readonly="!editable"
-              :multiple="true"
-              :limit="20"
-              :max-size="500"
-              :file-types="attachmentFileTypes"
-              :show-tip="false"
-              :show-file-list="false"
-              button-text="上传附件"
-              @change="handleAttachmentChange"
-            />
             <el-button type="primary" :disabled="!attachments.length" @click="downloadAttachments">
               批量下载
             </el-button>
@@ -341,6 +328,20 @@
               </template>
             </el-table-column>
           </el-table>
+          <div class="pre-settlement-editor__attachment-upload">
+            <vehicle-attachment-upload
+              ref="attachmentUploadRef"
+              v-model="attachments"
+              :readonly="!editable"
+              :multiple="true"
+              :limit="20"
+              :max-size="500"
+              :file-types="attachmentFileTypes"
+              :show-file-list="false"
+              button-text="上传附件"
+              @change="handleAttachmentChange"
+            />
+          </div>
         </div>
       </section-card>
 
@@ -1559,10 +1560,25 @@ export default {
   &__attachment-actions {
     display: flex;
     align-items: center;
+    justify-content: flex-end;
     gap: 8px;
     margin-bottom: 12px;
   }
 
+  &__attachment-upload {
+    display: flex;
+    justify-content: flex-start;
+    margin-top: 12px;
+
+    :deep(.vehicle-attachment-upload) {
+      width: auto;
+    }
+
+    :deep(.el-upload) {
+      display: inline-flex;
+    }
+  }
+
   &__summary-total {
     padding: 12px 16px 0;
     text-align: right;