更新

src/components/FileUpload/index.vue

@@ -308,20 +308,13 @@ const uploadedSuccessfully = (res: any) => {
     emit('update:modelValue', listToString(fileList.value));
     proxy?.$modal.closeLoading();
   }
-<<<<<<< Updated upstream
-  if (props.autoUpload && props.limit === fileList.value.length) {
-    fileUploadRef.value?.clearFiles();
-    fileList.value = [];
-    emit('update:modelValue', ''); // 同步到外部 v-model
-  }
-=======
+
 
   // if (props.autoUpload && props.limit === fileList.value.length) {
   //   fileUploadRef.value?.clearFiles();
   //   fileList.value = [];
   //   emit('update:modelValue', ''); // 同步到外部 v-model
   // }
->>>>>>> Stashed changes
   props.onUploadSuccess?.(fileList.value, res);
 };
 

src/views/ctr/index.vue

@@ -7,8 +7,11 @@
         </el-steps>
         <div class="content">
             <template v-if="active == 0">
-                <el-button type="success" size="large" @click="checkContractType('income')">收入合同</el-button>
-                <el-button type="primary" size="large" @click="checkContractType('expenses')">支出合同</el-button>
+                <div>
+                    <el-button type="success" size="large" @click="checkContractType('income')">收入合同</el-button>
+                    <el-button type="primary" size="large" @click="checkContractType('expenses')">支出合同</el-button>
+                </div>
+
             </template>
             <template v-else-if="active == 1">
                 <template v-if="contractType == 'income'">