Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/system/organization/components/org-user-list.vue

@@ -22,6 +22,7 @@
           >
             添加
           </el-button>
+          <el-button type="primary" size="mini" icon="el-icon-upload2" plain @click="uploadFile">导入</el-button>
         </org-user-search>
       </template>
       <!-- 角色列 -->
@@ -86,12 +87,16 @@
       :organization-id="organizationId"
       @done="reload"
     />
+
+    <importDialog :defModule="moudleName" ref="importDialogRef" @success="reload" />
   </div>
 </template>
 
 <script>
   import OrgUserSearch from './org-user-search.vue';
   import OrgUserEdit from './org-user-edit.vue';
+  import importDialog from "@/components/upload/import-dialog.vue";
+
   import {
     getUserPage,
     removePersonnel,
@@ -99,7 +104,7 @@
   } from '@/api/system/organization';
 
   export default {
-    components: { OrgUserSearch, OrgUserEdit },
+    components: {importDialog, OrgUserSearch, OrgUserEdit},
     props: {
       // 机构id
       organizationId: [Number, String],
@@ -109,6 +114,8 @@
     },
     data() {
       return {
+        moudleName : "mainUser",
+
         // 表格列配置
         columns: [
           {
@@ -259,6 +266,9 @@
             row.status = !row.status ? 1 : 0;
             // this.$message.error(e.message);
           });
+      },
+      uploadFile () {
+        this.$refs.importDialogRef.open();
       }
     },
     watch: {