Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/components/orgTree/index.vue

@@ -59,12 +59,22 @@ export default {
     hangsheTree:{
       type:Boolean,
       default:false,
+    },
+    defaultProps:{
+      type:Object,
+      default:{
+        children: "children",
+        label: "name"
+      },
     }
   },
   watch: {
     // 根据名称筛选机构树
     deptName(val) {
       this.$refs.tree.filter(val);
+    },
+    defaultProps(val) {
+      this.defaultProps={...val};
     }
   },
   created() {

src/views/system/dept/index.vue

@@ -381,7 +381,7 @@ export default {
       checked: false,
       defaultProps: {
         children: "children",
-        label: "name",
+        label: "shortName",
       },
       // 查询参数
       queryParams: {

src/views/system/user/index.vue

@@ -4,7 +4,7 @@
       <!--机构数据-->
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-          @click="clickTreeNode"></org-tree>
+          @click="clickTreeNode" :defaultProps="defaultProps"></org-tree>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
@@ -256,6 +256,10 @@ export default {
   mixins: [tableList],
   data() {
     return {
+      defaultProps: {
+        children: "children",
+        label: "shortName",
+      },
       // 遮罩层
       loading: true,
       // 选中数组