1.修改团队长代理人渠道管理树过滤方法问题

2.调整人员渠道管理查询问题

src/views/PeopleManage/Agent/AgentExamine.vue

@@ -483,8 +483,10 @@
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import peopleImage from "@/components/PeopleImage/index.vue"; //影像组件
-import mixin from '../mixin' 
-
+import mixa from '../mixin' 
+const mixin = new mixa({
+  treeTypeNum:2 //树分类过滤参数
+})
 export default {
   components: {
     tree,

src/views/PeopleManage/Agent/AgentManage.vue

@@ -439,8 +439,10 @@ import tree from "@/components/ztree.vue"; // 机构树组件
 import templateTable from "../../../components/TemplateTable/index.vue";
 import peopleImage from "@/components/PeopleImage/index.vue";
 import { validateSfz } from "../../../utils/validate.js";
-import mixin from '../mixin' 
-
+import mixa from '../mixin' 
+const mixin = new mixa({
+  treeTypeNum:2 //树分类过滤参数
+})
 export default {
   components: {
     KtButton,

src/views/PeopleManage/Player/PlayerManage.vue

@@ -198,7 +198,10 @@ import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import tree from "@/components/ztree.vue"; // 机构树组件
 import templateTable from "../../../components/TemplateTable/index.vue";
 import peopleImage from "@/components/PeopleImage/index.vue";
-import mixin from '../mixin' 
+import mixa from '../mixin' 
+const mixin = new mixa({
+  treeTypeNum:1
+})
 export default {
   components: {
     KtButton,

src/views/PeopleManage/Player/PlayerManageteam.vue

@@ -398,7 +398,10 @@ import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import tree from "@/components/ztree.vue"; // 机构树组件
 import templateTable from "../../../components/TemplateTable/index.vue";
 import peopleImage from "@/components/PeopleImage/index.vue";
-import mixin from '../mixin' 
+import mixa from '../mixin' 
+const mixin = new mixa({
+  treeTypeNum:1 //树分类过滤参数
+})
 export default {
   components: {
     KtButton,
@@ -549,7 +552,8 @@ export default {
     onZTreeClick: function (evt, treeId, treeNode) {
         // 点击事件
         this.currentTreeNode = evt;
-        this.pageData.deptId = this.currentTreeNode.id;
+        // this.pageData.deptId = this.currentTreeNode.id;
+        this.deptId = this.currentTreeNode.id
         this.pageData.pageNum =1;
         this.findPage();
         this.formData.deptId = [];

src/views/PeopleManage/TeamLeader/TeamLeaderExamine.vue

@@ -342,8 +342,10 @@
 <script>
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
-import mixin from '../mixin' 
-
+import mixa from '../mixin' 
+const mixin = new mixa({
+  treeTypeNum:2 //树分类过滤参数
+})
 export default {
   components: {
     tree,

src/views/PeopleManage/TeamLeader/TeamLeaderManage.vue

@@ -453,8 +453,10 @@ import KtButton from "@/views/Core/KtButton"; // 按钮权限组件
 import tree from "@/components/ztree.vue"; // 机构树组件
 import KtCommonTable from "@/views/Core/KtCommonTable.vue"; //表格组件
 import { validateSfz } from "../../../utils/validate.js";
-import mixin from '../mixin' 
-
+import mixa from '../mixin' 
+const mixin = new mixa({
+  treeTypeNum:2 //树分类过滤参数
+})
 export default {
   components: {
     KtButton,

src/views/PeopleManage/mixin.js

@@ -1,147 +1,151 @@
-export default { // 导出混入对象
+export default (params) => { // 导出混入对象
+  const { //树分类过滤参数
+    treeTypeNum=2
+  } = params;
+  return {
     data() {
       return {
         nationalList: [
-            "汉族",
-            "壮族",
-            "满族",
-            "回族",
-            "苗族",
-            "维吾尔族",
-            "土家族",
-            "彝族",
-            "蒙古族",
-            "藏族",
-            "布依族",
-            "侗族",
-            "瑶族",
-            "朝鲜族",
-            "白族",
-            "哈尼族",
-            "哈萨克族",
-            "黎族",
-            "傣族",
-            "畲族",
-            "傈僳族",
-            "仡佬族",
-            "东乡族",
-            "高山族",
-            "拉祜族",
-            "水族",
-            "佤族",
-            "纳西族",
-            "羌族",
-            "土族",
-            "仫佬族",
-            "锡伯族",
-            "柯尔克孜族",
-            "达斡尔族",
-            "景颇族",
-            "毛南族",
-            "撒拉族",
-            "布朗族",
-            "塔吉克族",
-            "阿昌族",
-            "普米族",
-            "鄂温克族",
-            "怒族",
-            "京族",
-            "基诺族",
-            "德昂族",
-            "保安族",
-            "俄罗斯族",
-            "裕固族",
-            "乌兹别克族",
-            "门巴族",
-            "鄂伦春族",
-            "独龙族",
-            "塔塔尔族",
-            "赫哲族",
-            "珞巴族",
-          ],
+          "汉族",
+          "壮族",
+          "满族",
+          "回族",
+          "苗族",
+          "维吾尔族",
+          "土家族",
+          "彝族",
+          "蒙古族",
+          "藏族",
+          "布依族",
+          "侗族",
+          "瑶族",
+          "朝鲜族",
+          "白族",
+          "哈尼族",
+          "哈萨克族",
+          "黎族",
+          "傣族",
+          "畲族",
+          "傈僳族",
+          "仡佬族",
+          "东乡族",
+          "高山族",
+          "拉祜族",
+          "水族",
+          "佤族",
+          "纳西族",
+          "羌族",
+          "土族",
+          "仫佬族",
+          "锡伯族",
+          "柯尔克孜族",
+          "达斡尔族",
+          "景颇族",
+          "毛南族",
+          "撒拉族",
+          "布朗族",
+          "塔吉克族",
+          "阿昌族",
+          "普米族",
+          "鄂温克族",
+          "怒族",
+          "京族",
+          "基诺族",
+          "德昂族",
+          "保安族",
+          "俄罗斯族",
+          "裕固族",
+          "乌兹别克族",
+          "门巴族",
+          "鄂伦春族",
+          "独龙族",
+          "塔塔尔族",
+          "赫哲族",
+          "珞巴族",
+        ],
         sexoptions: JSON.parse(localStorage.getItem("sexOptions")),
-        postOption:[],
-        bloodOption:[
-            {
-                label:'A型',
-                value:'A型'
-            }, {
-                label:'B型',
-                value:'B型'
-            }, {
-                label:'O型',
-                value:'O型'
-            }, {
-                label:'AB型',
-                value:'AB型'
-            }, 
+        postOption: [],
+        bloodOption: [
+          {
+            label: 'A型',
+            value: 'A型'
+          }, {
+            label: 'B型',
+            value: 'B型'
+          }, {
+            label: 'O型',
+            value: 'O型'
+          }, {
+            label: 'AB型',
+            value: 'AB型'
+          },
+        ],
+        educationOption: [
+          {
+            label: '小学',
+            value: '小学'
+          }, {
+            label: '初中',
+            value: '初中'
+          }, {
+            label: '高中',
+            value: '高中'
+          }, {
+            label: '专科',
+            value: '专科'
+          }, {
+            label: '本科',
+            value: '本科'
+          }, {
+            label: '硕士',
+            value: '硕士'
+          }, {
+            label: '博士',
+            value: '博士'
+          },
         ],
-        educationOption:[
+        healthOption: [
           {
-              label:'小学',
-              value:'小学'
-          }, {
-              label:'初中',
-              value:'初中'
-          }, {
-              label:'高中',
-              value:'高中'
-          }, {
-              label:'专科',
-              value:'专科'
-          },  {
-            label:'本科',
-            value:'本科'
-          }, {
-              label:'硕士',
-              value:'硕士'
-          }, {
-            label:'博士',
-            value:'博士'
-        }, 
-      ],
-      healthOption:[
-        {
-            label:'健康',
-            value:'健康'
-        }, {
-            label:'亚健康',
-            value:'亚健康'
-        }, {
-            label:'疾病',
-            value:'疾病'
-        }, 
-      ],
-      politicsStatusOption:[
-        {
-            label:'群众',
-            value:'群众'
-        }, {
-            label:'共青团员',
-            value:'共青团员'
-        }, {
-            label:'中共党员',
-            value:'中共党员'
-        }, 
-      ],
-      maritalStatusOption:[
-        {
-            label:'未婚',
-            value:'未婚'
-        }, {
-            label:'已婚',
-            value:'已婚'
-        }, {
-            label:'离异',
-            value:'离异'
-        }, {
-          label:'再婚',
-          value:'再婚'
-        }, 
-      ],
+            label: '健康',
+            value: '健康'
+          }, {
+            label: '亚健康',
+            value: '亚健康'
+          }, {
+            label: '疾病',
+            value: '疾病'
+          },
+        ],
+        politicsStatusOption: [
+          {
+            label: '群众',
+            value: '群众'
+          }, {
+            label: '共青团员',
+            value: '共青团员'
+          }, {
+            label: '中共党员',
+            value: '中共党员'
+          },
+        ],
+        maritalStatusOption: [
+          {
+            label: '未婚',
+            value: '未婚'
+          }, {
+            label: '已婚',
+            value: '已婚'
+          }, {
+            label: '离异',
+            value: '离异'
+          }, {
+            label: '再婚',
+            value: '再婚'
+          },
+        ],
         user_statusoptions: JSON.parse(
-            localStorage.getItem("user_statusoptions")
-          ),
+          localStorage.getItem("user_statusoptions")
+        ),
         roles: JSON.parse(localStorage.getItem("find_all")),
         /**Split 开始 */
         ztreeNodes: [],
@@ -164,24 +168,24 @@ export default { // 导出混入对象
         },
         currentTreeNode: null,
         //----ztreeLeft end---------
-        }
-      },
-      created() {
-        this.$api.role.postViewAll().then((res) => {
-          res.data.forEach(ele=>{
-            ele.postId=ele.postId+''
-          })
-          this.postOption = res.data
+      }
+    },
+    created() {
+      this.$api.role.postViewAll().then((res) => {
+        res.data.forEach(ele => {
+          ele.postId = ele.postId + ''
         })
-    this.findLeftTreeData(); // 获取机构树的数据
+        this.postOption = res.data
+      })
+      this.findLeftTreeData(); // 获取机构树的数据
 
-      },
-      mounted() {
-        //用像素初始化左边的split的宽度
-        this.changeTreeWidth(240); // 初始化树的宽度
-      },
-   methods:{
-    changeTreeWidth(widthVal) {
+    },
+    mounted() {
+      //用像素初始化左边的split的宽度
+      this.changeTreeWidth(240); // 初始化树的宽度
+    },
+    methods: {
+      changeTreeWidth(widthVal) {
         // 初始化树的宽度
         this.leftSplitWidth = Math.ceil(
           (widthVal / this.$refs.elMain.$el.clientWidth) * 100
@@ -190,17 +194,17 @@ export default { // 导出混入对象
       },
       findLeftTreeData: function () {
         this.$api.dept.findDeptTree().then((res) => {
-          this.treeDataRecursion(res.data, 2);
+          this.treeDataRecursion(res.data, treeTypeNum);
           this.ztreeNodes = res.data;
         });
       },
-       //树过滤五级机构递归
-       treeDataRecursion(data, num, one) {
+      //树过滤五级机构递归
+      treeDataRecursion(data, num, one) {
         data = data || this.ztreeNodes;
         one = one || 0;
         one++;
         for (let i = 0; i < data.length; i++) {
-          if (data[i].comlevel == 5 && data[i].managementSource != num) {
+          if (data[i].comlevel == 5 && (data[i].managementSource != num)) {
             data.splice(i, 1);
             i = i - 1;
           } else {
@@ -208,6 +212,7 @@ export default { // 导出混入对象
           }
         }
       },
-     
-   }
-  }
+
+    }
+  }
+}