Merge branch 'master' into dev

@@ -81,8 +81,8 @@
               <btn nativeType="cz" @click="resetForm">重置</btn>
               <btn nativeType="cx" @click="handleSearch">查询</btn>
               <el-upload ref="upload" style="display:inline-block;margin-left: 10px" action="" :auto-upload="false"
-                :limit="1" accept=".xml" :show-file-list="false"
-                :file-list="fileList" :before-upload="uploadRecord" :on-change="fileChange">
+                accept=".xml" :show-file-list="false"
+                :before-upload="uploadRecord" :on-change="fileChange">
                 <btn nativeType="cx">xml导入</btn>
               </el-upload>
             </el-form-item>
@@ -123,7 +123,6 @@
     },
     data () {
       return {
-        fileList: [],
         pickerOptionsStart: {
           disabledDate: (time) => {
             let endDateVal = this.form.receiveEndTime;
@@ -235,6 +234,7 @@
     },
     methods: {
       uploadRecord (file) {
+        console.log(file, 'eee11111111111111');
         this.requested = true
         this.files = file;
         const extension = file.name.split('.')[1] === 'xml'