批量导入

operationSupport/src/assets/css/main.scss

@@ -746,3 +746,13 @@ div.box-40 {
         }
     }
 }
+.re-uplod-style .avatar-uploader .el-upload--text,.upload_div .el-upload--text
+{
+    display: block;
+    border: none;
+    width: inherit;
+    height: inherit;
+    background-color: transparent;
+    color: unset;
+    font-size: unset;
+}

operationSupport/src/components/common/XKUpload.vue

@@ -29,7 +29,7 @@ export default {
     actionUrl: {
       type: String,
       default() {
-        return "/import/importExcel";
+        return "/excel/import/excel";
       }
     },
     params: {

operationSupport/src/components/common/organTree.vue

@@ -1,8 +1,8 @@
 <template>
-    <div class="organ-tree aside-box">
+    <div class="organ-tree">
         <el-input v-model="filterText" placeholder="请输入机构名称"><i slot="suffix" class="el-icon-search"></i></el-input>
         <div class="tree-style-box">
-            <el-scrollbar style="height: 100%">
+            <el-scrollbar>
                 <el-tree
                     class="tree-style"
                     :data="organList"
@@ -74,6 +74,10 @@ export default {
     box-sizing: border-box;
     float: left;
     height: 100%;
+    overflow: auto;
+    &::-webkit-scrollbar {
+        display: none;
+    }
     .tree-style-box {
         margin-top: 20px;
     }

operationSupport/src/views/ownerManagement/index.vue

@@ -35,11 +35,13 @@
                             <span class="iconfont">&#xe641;</span>
                             <el-dropdown-menu slot="dropdown" hide-on-click="false" class="device-search-dropdown">
                                 <el-dropdown-item command="add">单个添加</el-dropdown-item>
-                                <!-- <el-dropdown-item command="batchAdd">
-                                    <xk-upload @callback="mixins_search" :params="{ importType: 7 }">
-                                        <span slot="content">批量添加</span>
-                                    </xk-upload>
-                                </el-dropdown-item> -->
+                                <el-dropdown-item command="batchAdd">
+                                    <div class="upload_div">
+                                        <xk-upload class="upload_class" @callback="mixins_search" :params="{ importType: 'RESIDENT' }">
+                                            <span slot="content">批量添加</span>
+                                        </xk-upload>
+                                    </div>
+                                </el-dropdown-item>
                                 <el-dropdown-item command="template">下载模板</el-dropdown-item>
                             </el-dropdown-menu>
                         </el-dropdown>
@@ -314,3 +316,10 @@ export default {
     }
 };
 </script>
+<style lang='scss' scoped >
+@import './style.scss';
+.content.main {
+    height: 100%;
+    overflow: hidden;
+}
+</style>

operationSupport/src/views/ownerManagement/style.scss

@@ -1,4 +1,8 @@
 @import "@assets/css/public-style.scss";
+.content.main {
+  height: 100%;
+  overflow: auto;
+}
 .formContent {
   display: flex;
   justify-content: space-between;
@@ -116,7 +120,7 @@
     margin-top: 10px;
     font-size: 12px;
     color: #747d87;
-    span{
+    span {
       margin-right: 40px;
     }
   }