Merge branch 'master' into dev
Showing
1 changed file
with
3 additions
and
3 deletions
| ... | @@ -81,8 +81,8 @@ | ... | @@ -81,8 +81,8 @@ | 
| 81 | <btn nativeType="cz" @click="resetForm">重置</btn> | 81 | <btn nativeType="cz" @click="resetForm">重置</btn> | 
| 82 | <btn nativeType="cx" @click="handleSearch">查询</btn> | 82 | <btn nativeType="cx" @click="handleSearch">查询</btn> | 
| 83 | <el-upload ref="upload" style="display:inline-block;margin-left: 10px" action="" :auto-upload="false" | 83 | <el-upload ref="upload" style="display:inline-block;margin-left: 10px" action="" :auto-upload="false" | 
| 84 | :limit="1" accept=".xml" :show-file-list="false" | 84 | accept=".xml" :show-file-list="false" | 
| 85 | :file-list="fileList" :before-upload="uploadRecord" :on-change="fileChange"> | 85 | :before-upload="uploadRecord" :on-change="fileChange"> | 
| 86 | <btn nativeType="cx">xml导入</btn> | 86 | <btn nativeType="cx">xml导入</btn> | 
| 87 | </el-upload> | 87 | </el-upload> | 
| 88 | </el-form-item> | 88 | </el-form-item> | 
| ... | @@ -123,7 +123,6 @@ | ... | @@ -123,7 +123,6 @@ | 
| 123 | }, | 123 | }, | 
| 124 | data () { | 124 | data () { | 
| 125 | return { | 125 | return { | 
| 126 | fileList: [], | ||
| 127 | pickerOptionsStart: { | 126 | pickerOptionsStart: { | 
| 128 | disabledDate: (time) => { | 127 | disabledDate: (time) => { | 
| 129 | let endDateVal = this.form.receiveEndTime; | 128 | let endDateVal = this.form.receiveEndTime; | 
| ... | @@ -235,6 +234,7 @@ | ... | @@ -235,6 +234,7 @@ | 
| 235 | }, | 234 | }, | 
| 236 | methods: { | 235 | methods: { | 
| 237 | uploadRecord (file) { | 236 | uploadRecord (file) { | 
| 237 | console.log(file, 'eee11111111111111'); | ||
| 238 | this.requested = true | 238 | this.requested = true | 
| 239 | this.files = file; | 239 | this.files = file; | 
| 240 | const extension = file.name.split('.')[1] === 'xml' | 240 | const extension = file.name.split('.')[1] === 'xml' | ... | ... | 
- 
Please register or sign in to post a comment