From b7ff47cf54e2e722f07e48cb55e8c722c2140491 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Sat, 17 Jan 2026 18:11:25 +0800
Subject: [PATCH] seo

---
 .../customerOrg/customerOrgTree.vue           |   9 +-
 .../patientRegister/PatientRegisterList.vue   |  60 +++--
 .../patientRegister/customerOrgTreeAll.vue    |  12 +-
 src/components/report/CusOrgOCX.vue           |   9 +-
 .../report/PatientRegisterListNobtn.vue       |  79 +++++-
 src/components/report/TurnoverReportS.vue     |  27 +-
 src/utlis/tree.js                             | 245 ++++++++++--------
 7 files changed, 277 insertions(+), 164 deletions(-)

diff --git a/src/components/customerOrg/customerOrgTree.vue b/src/components/customerOrg/customerOrgTree.vue
index 1eb312c..9d54d6d 100644
--- a/src/components/customerOrg/customerOrgTree.vue
+++ b/src/components/customerOrg/customerOrgTree.vue
@@ -32,7 +32,7 @@
 import { mapState, mapMutations } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { tcdate, deepCopy, reMadeOrgTree } from "../../utlis/proFunc";
-import { getTreePids, getTreeNode } from "../../utlis/tree";
+import { getTreePids, getTreeNode,filterTreeNode } from "../../utlis/tree";
 import { setDBCom, getDBCom } from "../../utlis/indexedDB";
 
 
@@ -186,9 +186,10 @@ export default {
     filterParentNode(value) {
       // console.log(value, data)
       if (value){
-        let org = this.customerOrgTreeAll.filter(e => {
-          return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1
-        })
+        // let org = this.customerOrgTreeAll.filter(e => {
+        //   return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1
+        // })
+        let org = filterTreeNode(this.customerOrgTreeAll,"treeChildren",['label','simpleCode'],[value,value.toUpperCase()])
         this.customerOrgTreeSeo = org.slice(0,100)
       }else{
         this.customerOrgTreeSeo = this.customerOrgTreeAll.slice(0,100)
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 270c2ab..2aa6e76 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -711,6 +711,8 @@ export default {
         routeUrlorPageName: "patientRegister", //当前页面归属路由或归属页面权限名称
         privs: [], // 页面权限
       },
+      patient_register_query_idno: 'Y', // 身份证排他
+      patient_register_query_name: 'N', // 姓名排他
       peisid: null,
       startPoint: -1, // 多选起点 -1 表示选择
       endPoint: -1, // 多选终点 -1 表示未选择
@@ -1034,6 +1036,25 @@ export default {
         this.qrCode.url = res.data || "https://ccjktj.cn:5081/";
       }
     });
+
+    // 获取系统参数 -- 身份证排他
+    postapi("/api/app/SysParmValue/GetSysParmValueBySysParmId",
+      { sysParmId: "patient_register_query_idno" }
+    ).then((res) => {
+      if (res.code > -1) {
+        this.patient_register_query_idno = res.data || "Y";
+      }
+    });
+
+    // 获取系统参数 -- 姓名排他
+    postapi("/api/app/SysParmValue/GetSysParmValueBySysParmId",
+      { sysParmId: "patient_register_query_name" }
+    ).then((res) => {
+      if (res.code > -1) {
+        this.patient_register_query_name = res.data || "N";
+      }
+    });
+
   },
 
   //挂载完成
@@ -1807,9 +1828,6 @@ export default {
       if (this.patientRegister.query.sex)
         body.sexId = this.patientRegister.query.sex;
 
-      if (this.patientRegister.query.patientName)
-        body.patientName = this.patientRegister.query.patientName;
-
       if (
         this.patientRegister.query.medicalTypeIds &&
         this.patientRegister.query.medicalTypeIds.length > 0
@@ -1855,26 +1873,28 @@ export default {
       if (this.patientRegister.query.phone)
         body.phone = this.patientRegister.query.phone;
 
+      // 姓名排他判断
+      if (this.patientRegister.query.patientName) {
+        body.patientName = this.patientRegister.query.patientName;
+        if(this.patient_register_query_name == 'Y'){
+          body = {
+              patientName: this.patientRegister.query.patientName,
+              skipCount: this.loadOpts.skipCount,
+              maxResultCount: this.loadOpts.maxResultCount,
+            };
+        }
+      }
+
+      // 身份证排他判断
       if (this.patientRegister.query.idCardNo) {
         body.idNo = this.patientRegister.query.idCardNo;
-
-        try {
-          let sysParmId = "patient_register_query_idno";
-          let sysParam = await postapi(
-            "/api/app/SysParmValue/GetSysParmValueBySysParmId",
-            { sysParmId }
-          );
-          // console.log('sysParam', sysParam)
-          if (sysParam.data != "N") {
-            body = {
+        if(this.patient_register_query_idno == 'Y'){
+          body = {
               idNo: this.patientRegister.query.idCardNo,
               skipCount: this.loadOpts.skipCount,
               maxResultCount: this.loadOpts.maxResultCount,
             };
-          }
-        } catch (error) {
-          console.log(error);
-        }
+        }        
       }
 
       if (this.patientRegister.query.patientNo)
@@ -1937,13 +1957,13 @@ export default {
             this.patientRegister.query.isSeries,
             this.patientRegister.query.patientRegisterNo
           );
-          if (this.patientRegister.query.isSeries == "Y" && this.patientRegister.query.patientRegisterNo){
+          if (this.patientRegister.query.isSeries == "Y" && this.patientRegister.query.patientRegisterNo) {
             // 如果已经存在列表中，则不在添加
             for (let index = curLoad.length - 1; index > -1; index--) {
               const e = curLoad[index];
-              if(arrayExistObj(this.tableData,'id',e.id) > -1) curLoad.splice(index,1)
+              if (arrayExistObj(this.tableData, 'id', e.id) > -1) curLoad.splice(index, 1)
             }
-          }else{
+          } else {
             if (body.skipCount == 0) {
               //查询
               this.tableData = [];
diff --git a/src/components/patientRegister/customerOrgTreeAll.vue b/src/components/patientRegister/customerOrgTreeAll.vue
index 0aaf911..b0a9273 100644
--- a/src/components/patientRegister/customerOrgTreeAll.vue
+++ b/src/components/patientRegister/customerOrgTreeAll.vue
@@ -57,6 +57,7 @@
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { tcdate, deepCopy, reMadeOrgTree, arrayExistObj } from "../../utlis/proFunc";
+import { filterTreeNode } from "../../utlis/tree";
 import { setDBCom, getDBCom } from "../../utlis/indexedDB";
 
 
@@ -341,16 +342,19 @@ export default {
       // return data['displayName'].indexOf(value) > -1 || data['simpleCode'].indexOf(value.toUpperCase()) > -1 || data['shortName'].indexOf(value) > -1 || data['customerOrgCode'].indexOf(value) > -1;
       let org = []
       if (value) {
-        org = this.customerOrgTreeAll.filter(e => {
-          return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1
-        })
+        // org = this.customerOrgTreeAll.filter(e => {
+        //   return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1
+        // })
+        org = filterTreeNode(this.customerOrgTreeAll,"treeChildren",['label','simpleCode'],[value,value.toUpperCase()])
         this.customerOrgTreeSeo = org.slice(0, 100)
       } else {
         this.customerOrgTreeSeo = this.customerOrgTreeAll.slice(0, 100)
       }
-
     },
 
+    // 根节点找到，则包含子级点， 子节点找到，则只包含上级节点
+    // label: "label", children: "treeChildren", simpleCode
+    // filterTree(treeData,ChildrenName,keys,value,type)
 
     //全树过滤
     /*
diff --git a/src/components/report/CusOrgOCX.vue b/src/components/report/CusOrgOCX.vue
index a3bcaef..cedd05d 100644
--- a/src/components/report/CusOrgOCX.vue
+++ b/src/components/report/CusOrgOCX.vue
@@ -114,7 +114,7 @@ import moment from "moment";
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayExistObj, deepCopy, reMadeOrgTree } from "../../utlis/proFunc";
-import { getTreePids, getTreeAllChildIdsById } from "../../utlis/tree";
+import { getTreePids, getTreeAllChildIdsById,filterTreeNode } from "../../utlis/tree";
 import { setDBCom, getDBCom } from "../../utlis/indexedDB";
 
 export default {
@@ -203,9 +203,10 @@ export default {
       // return data['displayName'].indexOf(value) > -1 || data['simpleCode'].indexOf(value.toUpperCase()) > -1 || data['shortName'].indexOf(value) > -1 || data['customerOrgCode'].indexOf(value) > -1;
       //console.log(this.patientRegister.customerOrgs)
       if(value){
-        let org = this.customerOrgTreeAll.filter(e => {
-          return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1
-        })
+        // let org = this.customerOrgTreeAll.filter(e => {
+        //   return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1
+        // })
+        let org = filterTreeNode(this.customerOrgTreeAll,"treeChildren",['label','simpleCode'],[value,value.toUpperCase()])
         this.customerOrgTreeSeo = org.slice(0,100)
       }else{
         this.customerOrgTreeSeo = this.customerOrgTreeAll.slice(0,100)
diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue
index 510efab..bc33b99 100644
--- a/src/components/report/PatientRegisterListNobtn.vue
+++ b/src/components/report/PatientRegisterListNobtn.vue
@@ -3,7 +3,9 @@
     <div @contextmenu.prevent="onContextmenu">
       <u-table :data="patientRegister.prList" border ref="info" id="info"
         :height="(window.pageHeight < 600) ? 230 : (window.pageHeight - 370)" highlight-current-row
-        @row-click="rowClick" size="small" row-key="patientRegisterId" @selection-change="handleSelectionChange" @row-contextmenu="rowContextmenu" @table-body-scroll="scrollFull" use-virtual :row-height="35" big-data-checkbox :data-changes-scroll-top="false">
+        @row-click="rowClick" size="small" row-key="patientRegisterId" @selection-change="handleSelectionChange"
+        @row-contextmenu="rowContextmenu" @table-body-scroll="scrollFull" use-virtual :row-height="35" big-data-checkbox
+        :data-changes-scroll-top="false">
         <u-table-column :type="dragCol[0].type" width="40" align="center" />
         <!--列可拖拽 key值很关键  -->
         <u-table-column v-for="(item, index) in dragCol" v-if="index != 0" :key="`${item.label + index}`"
@@ -13,7 +15,7 @@
           :show-overflow-tooltip="dragCol[index].showTooltip">
 
           <template slot-scope="scope">
-            <div v-if="dragCol[index].prop == 'sn'"> 
+            <div v-if="dragCol[index].prop == 'sn'">
               {{ scope.$index + 1 }}
             </div>
             <div v-else-if="dragCol[index].prop == 'completeFlag'"
@@ -79,7 +81,8 @@ export default {
   props: ['fromType'],
   data() {
     return {
-
+      patient_register_query_idno: 'Y', //身份证排他
+      patient_register_query_name: 'N', //姓名排他
       dialogVisible: false,
       dialogCamera: false,
       dialogGuide: false,
@@ -182,6 +185,24 @@ export default {
         }
       })
 
+    // 获取系统参数 -- 身份证排他
+    postapi("/api/app/SysParmValue/GetSysParmValueBySysParmId",
+      { sysParmId: "patient_register_query_idno" }
+    ).then((res) => {
+      if (res.code > -1) {
+        this.patient_register_query_idno = res.data || "Y";
+      }
+    });
+
+    // 获取系统参数 -- 姓名排他
+    postapi("/api/app/SysParmValue/GetSysParmValueBySysParmId",
+      { sysParmId: "patient_register_query_name" }
+    ).then((res) => {
+      if (res.code > -1) {
+        this.patient_register_query_name = res.data || "N";
+      }
+    });
+
   },
 
   //挂载完成
@@ -437,7 +458,7 @@ export default {
       postapi('/api/app/PeisReport/GetPatientRegisterReportWithCharge', body)
         .then((res) => {
           if (res.code != -1) {
-            this.patientRegister.prList = this.prListTrans(res.data.items);            
+            this.patientRegister.prList = this.prListTrans(res.data.items);
           }
         })
     },
@@ -508,11 +529,8 @@ export default {
         })
       }
 
+
       body.customerOrgs = customerOrgs
-      if (this.patientRegister.query.patientRegisterNo) body.patientRegisterNo = this.patientRegister.query.patientRegisterNo
-      if (this.patientRegister.query.patientNo) body.patientNo = this.patientRegister.query.patientNo
-      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
-      if (this.patientRegister.query.idCardNo) body.idNo = this.patientRegister.query.idCardNo
       if (this.patientRegister.query.phone) body.phone = this.patientRegister.query.phone
       if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
       if (this.patientRegister.query.isAudit) body.isAudit = this.patientRegister.query.isAudit
@@ -522,6 +540,46 @@ export default {
       if (this.patientRegister.query.personnelTypeId) body.personnelTypeId = this.patientRegister.query.personnelTypeId
       if (this.patientRegister.query.medicalConclusionId && this.patientRegister.query.medicalConclusionId.length > 0) body.medicalConclusionIds = this.patientRegister.query.medicalConclusionId
 
+      // 判断姓名是否排他
+      if (this.patientRegister.query.patientName) {
+        body.patientName = this.patientRegister.query.patientName
+        if (this.patient_register_query_name == 'Y') {
+          body = {
+            patientName: this.patientRegister.query.patientName,
+            skipCount: this.loadOpts.skipCount,
+            maxResultCount: this.loadOpts.maxResultCount
+          }
+        }
+      }
+      // 判断身份证是否排他
+      if (this.patientRegister.query.idCardNo) {
+        body.idNo = this.patientRegister.query.idCardNo
+        if (this.patient_register_query_idno == 'Y') {
+          body = {
+            idNo: this.patientRegister.query.idCardNo,
+            skipCount: this.loadOpts.skipCount,
+            maxResultCount: this.loadOpts.maxResultCount
+          }
+        }
+      }
+      // 档案号排他
+      if (this.patientRegister.query.patientNo) {
+        body = {
+          patientNo: this.patientRegister.query.patientNo,
+          skipCount: this.loadOpts.skipCount,
+          maxResultCount: this.loadOpts.maxResultCount
+        }
+      }
+
+      // 条码号排他
+      if (this.patientRegister.query.patientRegisterNo) {
+        body = {
+          patientRegisterNo: this.patientRegister.query.patientRegisterNo,
+          skipCount: this.loadOpts.skipCount,
+          maxResultCount: this.loadOpts.maxResultCount
+        }
+      }
+
       //console.log('/api/app/peisreport/getpatientregisterreport',body)
       // 带收费信息 /api/app/PeisReport/GetPatientRegisterReportWithCharge
       // 不带收费信息 /api/app/patientregister/getlistinfilter
@@ -530,8 +588,8 @@ export default {
           this.lazyLoading = false
           // 连续扫码
           // console.log('this.patientRegister.query',this.patientRegister.query)
-          if (this.patientRegister.query.isSeries == 'Y' && this.patientRegister.query.patientRegisterNo ) {
-            
+          if (this.patientRegister.query.isSeries == 'Y' && this.patientRegister.query.patientRegisterNo) {
+
             if (res.data.items.length > 0 && arrayExistObj(this.patientRegister.prList, 'patientRegisterId', res.data.items[0].patientRegisterId) == -1) {
               this.patientRegister.prList = this.patientRegister.prList.concat(this.prListTrans(res.data.items))
             }
@@ -609,6 +667,7 @@ export default {
 </script>
 <style scoped>
 @import "../../assets/css/global_table.css";
+
 .box {
   display: flex;
 }
diff --git a/src/components/report/TurnoverReportS.vue b/src/components/report/TurnoverReportS.vue
index ce4279b..3e748ab 100644
--- a/src/components/report/TurnoverReportS.vue
+++ b/src/components/report/TurnoverReportS.vue
@@ -37,7 +37,10 @@
           </div>
           <div class="query">
             <span class="spanClass">业务员</span>
-            <el-input v-model="salesmans" placeholder="请输入业务员姓名" size="small" style="width: 150px; margin-left: 10px" />
+            <el-select v-model="query.salesmans" placeholder="请输入业务员姓名" 
+              default-first-option clearable filterable style="margin-left: 10px" size="small" multiple collapse-tags>
+              <el-option v-for="item in dictSalesman" :key="item.id" :label="item.surname" :value="item.surname" />
+            </el-select>
           </div>
           <div class="query">
             <span class="spanClass">是否包含预登记</span>
@@ -90,6 +93,7 @@ export default {
       customerOrg: [],
       customerOrgAll: [],
       medicalType: [],
+      dictSalesman: [],
       query: {
         dateType: "1",
         startDate: "",
@@ -99,7 +103,7 @@ export default {
         // isMedicalTypeId: 'Y',
         isPreRegistration: "N",
       },
-      salesmans: "",
+      
       tableData: [],
 
       pickerOptions: {
@@ -165,13 +169,13 @@ export default {
       //   }
       // });
 
-      //体检类别
-      getapi("/api/app/medical-type/in-filter").then((res) => {
-        if (res.code > -1) {
-          this.dict.medicalType = res.data;
-          this.medicalType = res.data;
-        }
-      });
+      // 业务员 {
+      postapi('/api/identity/users/GetUserListBySaleRole')
+        .then(res => {
+          if (res.code > -1) {
+            this.dictSalesman = res.data
+          }
+        })
     },
 
     //通用导出
@@ -201,10 +205,7 @@ export default {
 
     // 查询
     btnQuery() {
-      this.query.salesmans = [];
-      if (this.salesmans.replace(/\s+/g, '') != '') {
-        this.query.salesmans.push(this.salesmans.replace(/\s+/g, ''));
-      }
+      
       postapi(
         "/api/app/CustomerReport/GetSalesPersonPhysicalExaminationStatistics",
         this.query
diff --git a/src/utlis/tree.js b/src/utlis/tree.js
index 902a948..fb99aa7 100644
--- a/src/utlis/tree.js
+++ b/src/utlis/tree.js
@@ -1,5 +1,7 @@
 //树对象相关操作 目前只支持单主键操作
 
+const { deepCopy } = require("./proFunc");
+
 //将list数据，生成tree
 // dataSource:列表数据资源
 // childNodeName：子节点名称
@@ -7,112 +9,137 @@
 // idName：id列名
 // pidVal：父id初始值
 function madeTree(dataSource, childNodeName, pidName, idName, pidVal) {
-    if (!dataSource || dataSource.length < 1) return [];
-    let trees = []
-    let lchildNodeName = childNodeName || 'children';
-    let lpidName = pidName || 'pid';
-    let lidName = idName || 'id';
- 
-    dataSource.forEach(e => {
-       let tree = {}, ret = null;
-       if (pidVal) {  //根节点有具体的值
-          if (e[lpidName] == pidVal) {
-             tree = e;
-             ret = madeTree(dataSource, lchildNodeName, lpidName, lidName, e[lidName]);
-             if (ret && ret.length > 0) tree[lchildNodeName] = ret;
-             trees.push(tree);
-          }
-       } else {
-          if (!e[lpidName]) {  //根节点为0,空或null
-             tree = e;
-             ret = madeTree(dataSource, lchildNodeName, lpidName, lidName, e[lidName]);
-             if (ret && ret.length > 0) tree[lchildNodeName] = ret;
-             trees.push(tree);
-          }
-       }
-    })
-    return trees;
- }
- 
- //通过ID值，找出所有父节点值
- function getTreePids(tree, childNodeName, pidName, idName, idVal) {
-    let pids = [],treeNode = null;
-    if (!tree || tree.length < 1) return [];
-    if (!idVal) return [];
-    let lchildNodeName = childNodeName || 'children';
-    let lpidName = pidName || 'pid';
-    let lidName = idName || 'id';
- 
-    treeNode = getTreeNode(tree,lchildNodeName,lidName, idVal);  
-    //console.log('treeNode',treeNode); 
-    if(treeNode){      
-       pids.push(treeNode[lpidName]);      
-       getTreePids(tree, lchildNodeName, lpidName, lidName, treeNode[lpidName]).forEach(e =>{
-          pids.unshift(e);
-       });      
-    }
- 
-    return pids;   
- }
- 
- 
- //通过node值，找出所有子节点值
- function getTreeAllChildIdsByNode(treeNode, childNodeName, idName) {
-    let childIds = [];
-    let lchildNodeName = childNodeName || 'children';
-    let lidName = idName || 'id';
- 
-    if (!treeNode) return [];
-    if (!treeNode[lchildNodeName] || treeNode[lchildNodeName].length < 1) return [];
- 
-    treeNode[lchildNodeName].forEach(e => {
-       childIds.push(e[lidName]);
-       getTreeAllChildIdsByNode(e, lchildNodeName, lidName).forEach(e2 =>{
-          childIds.push(e2);
-       });
-    });
-    return childIds;
- }
- 
- //通过ID值，找出所有子节点值
- function getTreeAllChildIdsById(tree, childNodeName, idName, idVal) {
-    let childIds = [], treeNode = null;
-    let lchildNodeName = childNodeName || 'children';
-    let lidName = idName || 'id';
- 
-    if (!tree || tree.length < 1) return [];
-    treeNode = getTreeNode(tree, lchildNodeName, lidName, idVal);
-    childIds = getTreeAllChildIdsByNode(treeNode, lchildNodeName, lidName);
- 
-    return childIds;
- }
- 
- //获取节点本身
- function getTreeNode(tree, childNodeName, idName, idVal) {
-    let treeNode = null;
-    let lchildNodeName = childNodeName || 'children';
-    let lidName = idName || 'id';
- 
-    if (!tree || tree.length < 1) return treeNode;
- 
-    for (let i = 0; i < tree.length; i++) {
-       if (tree[i][lidName] == idVal) {
-          treeNode = tree[i];
-          break;
-       } else {
-          if (tree[i][lchildNodeName] && tree[i][lchildNodeName].length > 0) {
-             treeNode = getTreeNode(tree[i][lchildNodeName], lchildNodeName, lidName, idVal);
-          }
-          if (treeNode) break;
-       }
-    }
-    return treeNode;
- }
- 
- 
- module.exports = {
-    madeTree,
-    getTreePids, getTreeAllChildIdsByNode,getTreeAllChildIdsById, getTreeNode,
- }
- 
- 
\ No newline at end of file
+   if (!dataSource || dataSource.length < 1) return [];
+   let trees = []
+   let lchildNodeName = childNodeName || 'children';
+   let lpidName = pidName || 'pid';
+   let lidName = idName || 'id';
+
+   dataSource.forEach(e => {
+      let tree = {}, ret = null;
+      if (pidVal) {  //根节点有具体的值
+         if (e[lpidName] == pidVal) {
+            tree = e;
+            ret = madeTree(dataSource, lchildNodeName, lpidName, lidName, e[lidName]);
+            if (ret && ret.length > 0) tree[lchildNodeName] = ret;
+            trees.push(tree);
+         }
+      } else {
+         if (!e[lpidName]) {  //根节点为0,空或null
+            tree = e;
+            ret = madeTree(dataSource, lchildNodeName, lpidName, lidName, e[lidName]);
+            if (ret && ret.length > 0) tree[lchildNodeName] = ret;
+            trees.push(tree);
+         }
+      }
+   })
+   return trees;
+}
+
+//通过ID值，找出所有父节点值
+function getTreePids(tree, childNodeName, pidName, idName, idVal) {
+   let pids = [], treeNode = null;
+   if (!tree || tree.length < 1) return [];
+   if (!idVal) return [];
+   let lchildNodeName = childNodeName || 'children';
+   let lpidName = pidName || 'pid';
+   let lidName = idName || 'id';
+
+   treeNode = getTreeNode(tree, lchildNodeName, lidName, idVal);
+   //console.log('treeNode',treeNode); 
+   if (treeNode) {
+      pids.push(treeNode[lpidName]);
+      getTreePids(tree, lchildNodeName, lpidName, lidName, treeNode[lpidName]).forEach(e => {
+         pids.unshift(e);
+      });
+   }
+
+   return pids;
+}
+
+
+//通过node值，找出所有子节点值
+function getTreeAllChildIdsByNode(treeNode, childNodeName, idName) {
+   let childIds = [];
+   let lchildNodeName = childNodeName || 'children';
+   let lidName = idName || 'id';
+
+   if (!treeNode) return [];
+   if (!treeNode[lchildNodeName] || treeNode[lchildNodeName].length < 1) return [];
+
+   treeNode[lchildNodeName].forEach(e => {
+      childIds.push(e[lidName]);
+      getTreeAllChildIdsByNode(e, lchildNodeName, lidName).forEach(e2 => {
+         childIds.push(e2);
+      });
+   });
+   return childIds;
+}
+
+//通过ID值，找出所有子节点值
+function getTreeAllChildIdsById(tree, childNodeName, idName, idVal) {
+   let childIds = [], treeNode = null;
+   let lchildNodeName = childNodeName || 'children';
+   let lidName = idName || 'id';
+
+   if (!tree || tree.length < 1) return [];
+   treeNode = getTreeNode(tree, lchildNodeName, lidName, idVal);
+   childIds = getTreeAllChildIdsByNode(treeNode, lchildNodeName, lidName);
+
+   return childIds;
+}
+
+//获取节点本身
+function getTreeNode(tree, childNodeName, idName, idVal) {
+   let treeNode = null;
+   let lchildNodeName = childNodeName || 'children';
+   let lidName = idName || 'id';
+
+   if (!tree || tree.length < 1) return treeNode;
+
+   for (let i = 0; i < tree.length; i++) {
+      if (tree[i][lidName] == idVal) {
+         treeNode = tree[i];
+         break;
+      } else {
+         if (tree[i][lchildNodeName] && tree[i][lchildNodeName].length > 0) {
+            treeNode = getTreeNode(tree[i][lchildNodeName], lchildNodeName, lidName, idVal);
+         }
+         if (treeNode) break;
+      }
+   }
+   return treeNode;
+}
+
+// 根节点找到，则包含子级点， 子节点找到，则只包含上级节点
+function filterTreeNode(treeData, childNodeName, keys, vals) {
+   let newTree = []
+   let find = false
+   if (Array.isArray(treeData) && treeData.length > 0) {
+      treeData.forEach(e => {
+         find = false
+         keys.forEach((key, i) => {
+            if (e[key].indexOf(vals[i]) > -1) find = true
+         });
+
+         // 当前级找到
+         if (find) {
+            newTree.push(e)
+         } else {
+            let childTree = filterTreeNode(e[childNodeName], childNodeName, keys, vals)
+            if (childTree.length > 0) {
+               let temp = deepCopy(e)
+               temp[childNodeName] = childTree
+               newTree.push(temp)
+            }
+         }
+      });
+   }
+   return newTree
+}
+
+module.exports = {
+   madeTree,
+   getTreePids, getTreeAllChildIdsByNode, getTreeAllChildIdsById, getTreeNode,filterTreeNode,
+}
+