修复bug，treeSelect改为全局导入

public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>favicon.png">
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>

src/main.js

@@ -11,7 +11,6 @@ import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
 import './assets/icons' // icon
 import './permission' // permission control
-import TreeSelect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
@@ -42,6 +41,8 @@ import DictTag from '@/components/DictTag'
 import VueMeta from 'vue-meta'
 // 字典数据组件
 import DictData from '@/components/DictData'
+// 下拉tree组件
+import TreeSelect from "@riophae/vue-treeselect";
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
@@ -70,8 +71,8 @@ Vue.component('Editor', Editor)
 Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
+Vue.component('TreeSelect', TreeSelect)
 
-Vue.use(TreeSelect)
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)

src/views/system/user/extend.vue

@@ -15,7 +15,7 @@
         <el-row>
           <el-col :xs="24" :sm="12" :md="8" :lg="6" >
             <el-form-item label="是否专职" prop="isFullTime">
-            
+
               <el-switch
                 v-model="formData.isFullTime"
                 active-text
@@ -40,7 +40,7 @@
         <el-row  >
           <el-col :xs="24" :sm="12" :md="8" :lg="6" >
             <el-form-item label="所属部门" prop="deptId">
-              <tree-select v-model="formData.deptId"  :options="deptList" :show-count="true" :normalizer="tenantIdnormalizer" placeholder="所属部门"> </tree-select>
+              <tree-select style="width:217px;" v-model="formData.deptId"  :options="deptList" :show-count="true" :normalizer="tenantIdnormalizer" placeholder="所属部门"> </tree-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="6" >
@@ -52,10 +52,10 @@
                 :label="dict.label"
                 :value="dict.value"
               />
-              </el-select> 
+              </el-select>
             </el-form-item>
           </el-col>
-          
+
           <el-col :xs="24" :sm="12" :md="8" :lg="6" >
             <el-form-item label="用工形式" prop="workType">
               <el-select v-model="formData.workType" placeholder="请选择">
@@ -65,7 +65,7 @@
                 :label="dict.label"
                 :value="dict.value"
               />
-              </el-select> 
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="6" >
@@ -77,7 +77,7 @@
                 :label="dict.label"
                 :value="dict.value"
               />
-              </el-select> 
+              </el-select>
               </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="6" >
@@ -89,20 +89,20 @@
                 :label="dict.label"
                 :value="dict.value"
               />
-              </el-select> 
-            
+              </el-select>
+
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-    
+
           <el-col :xs="24" :sm="12" :md="8" :lg="6" >
             <el-form-item label="初级以上相关专业技术职业资格" prop="professionalQualifications">
               <el-input v-model="formData.professionalQualifications" placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
-        
+
           <el-col :xs="24" :sm="12" :md="8" :lg="6" >
             <el-form-item label="持证上岗未通过原因" prop="certificateFailReason">
               <el-input v-model="formData.certificateFailReason" placeholder="请输入">
@@ -157,7 +157,7 @@
                 :label="dict.label"
                 :value="dict.value"
               />
-              </el-select> 
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -425,9 +425,9 @@ export default {
                 this.$message.success('保存成功！')
                 this.$router.go(-1)
             })
-          } 
+          }
         });
-    
+
     },
     getExtendInfo() {
       getExtendByOrgId(this.$route.params.id).then((data) => {
@@ -656,7 +656,7 @@ export default {
     //     responsibilitiesLeaderName: this.responsibilitiesLeaderName,
     //     responsibilitiesLeaderDuties: this.responsibilitiesLeaderDuties,
     //     qualificationCertificateUrl: this.qualificationCertificateUrl,
-      
+
     //     id: this.id,
     //   };
     //   if(this.extendId){

src/views/system/user/index.vue

@@ -275,12 +275,13 @@
 import OrgTree from '@/components/orgTree'
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
+import {deptTreeSelect} from "@/api/system/public";
 
 
 export default {
   name: "User",
   dicts: ['sys_normal_disable', 'sys_user_sex'],
-  components: { OrgTree,TreeSelect },
+  components: { OrgTree },
   data() {
     return {
       // 遮罩层
@@ -378,10 +379,12 @@ export default {
       },
       //默认选中节点
       defaultKeys:null,
+      //修改新增中的机构树
       deptOptions:[],
     };
   },
   created() {
+    this.getDeptTree();
     this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
     });
@@ -390,6 +393,12 @@ export default {
     console.log(this.queryParams,'aaaaaa')
   },
   methods: {
+    /** 查询机构树数据 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
     // 节点单击事件
     clickTreeNode(data) {
       this.queryParams.orgId = data.id;
@@ -400,7 +409,7 @@ export default {
       const userId = row.id;
       this.$router.push("/system/user-extend/extend/" + userId);
     },
-    //自定义数据
+    /** treeSelect组件自定义数据*/
     tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {
         delete node.children