Merge branch 'master' of http://192.168.2.241:3000/zx/kxc_web

src/views/kxcSystem/PublicHouseManage/HouseDataImp/index.vue

@@ -27,12 +27,11 @@
         <div class="btn" v-if="enableOpt">
           <el-upload
             class="upload-demo"
-            action=""
+            ref="fileUpload"
+            action="#"
             accept=".xls, .xlsx"
-            :before-upload="beforeUpload"
             :on-change="handleChange"
-            :on-preview="handlePreview"
-            :on-remove="handleRemove"
+            :http-request="httpRequest"
             :limit="1"
             :on-exceed="handleExceed">
             <el-button size="small" type="primary">数据上传</el-button>

src/views/kxcSystem/PublicHouseManage/HouseDataImp/template.js

@@ -398,27 +398,18 @@ export default {
             })
         },
 
+        handleChange(file, fileList) {
+
+        },
         /**
-         * 上传之前文件类型限制
+         * 上传动作
          */
-        beforeUpload(file) {
-            // const isJPG = file.type === 'image/jpeg';
-            // const isLt2M = file.size / 1024 / 1024 < 10;
-            // if (!isJPG) {
-            //   this.$message.error('上传头像图片只能是 JPG 格式!');
-            // }
-            // if (!isLt2M) {
-            //   this.$message.error('上传头像图片大小不能超过 10MB!');
-            // }
-            // return isJPG && isLt2M;
-        },
-
-        handleChange(file, fileList) {
-            const name = file.name.split('.')[1];
-            const uploadFile = file.raw;
+        httpRequest(fileObj) {
+            console.log('-->文件', fileObj)
+            const uploadFile = fileObj.file;
             const sid = this.treeNodeData.sid;
             if (uploadFile == null) {
-                this.$message('请选择需要上传的文件');
+                this.$message.error('请选择需要上传的文件！');
                 return;
             }
             let uploadForm = new FormData();
@@ -427,25 +418,17 @@ export default {
             this.loading = true;
             impHouseModule(uploadForm).then(response => {
                 if (response !== undefined) {
-                    this.$message('info', '上传成功！');
+                    this.getHouseList();
+                    this.$message.success('公房导入成功！');
                 }
             }).catch(msg => {
 
             }).finally(() => {
                 this.loading = false;
+                this.$refs.fileUpload.clearFiles()
             });
         },
 
-        handleRemove(file, fileList) {
-            // console.log(file, fileList,"删除");
-        },
-        handlePreview(file) {
-            //  console.log(file,"已上传的文件时的钩子");
-        },
-        handleExceed(files, fileList) {
-            this.message = "只允许上传一个文件";
-        },
-
         /**
          * 退出
          */