diff --git a/src/components/customerOrg/customerOrgTree.vue b/src/components/customerOrg/customerOrgTree.vue
index 4ea43f0..8acd920 100644
--- a/src/components/customerOrg/customerOrgTree.vue
+++ b/src/components/customerOrg/customerOrgTree.vue
@@ -6,7 +6,7 @@
     <div>
       <el-tree :data="customerOrg.customerOrgTree" :props="treeprops" node-key="id" :filter-node-method="filterNode"
         :style="'overflow: scroll;width:200px;height:' + (window.pageHeight < 600 ? 465 : window.pageHeight - 135) + 'px;'"
-        :default-expanded-keys="customerOrg.defaultExpandedKeys" @node-contextmenu="nodeContextmenu"
+        :default-expanded-keys="customerOrg.defaultExpandedKeys" 
         @node-click="treeclick" highlight-current ref="customerOrgTree">
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <div>
@@ -115,13 +115,7 @@ export default {
       this.dataTransOpts.refresh.contact_person.M++
 
     },
-
-    // 节点右击事件
-    nodeContextmenu(event, data, node, ids) {
-      console.log('event,data,node,ids', event, data, node, ids)
-      
-    },
-
+    
     //树过滤
     filterNode(value, data) {
       //console.log(value,data)
diff --git a/src/components/patientRegister/customerOrgTreeAll.vue b/src/components/patientRegister/customerOrgTreeAll.vue
index e300863..7333850 100644
--- a/src/components/patientRegister/customerOrgTreeAll.vue
+++ b/src/components/patientRegister/customerOrgTreeAll.vue
@@ -4,8 +4,9 @@
       <el-input placeholder="输入关键字进行过滤" v-model="filterText" size="small" />
     </div>
     <div>
-      <el-tree :style="'overflow: scroll;height:' + (window.pageHeight < 600 ? 465 : window.pageHeight - 135) + 'px;width:200px;'"
-        :data="patientRegister.customerOrgTreeAll" :props="treeprops" node-key="id"
+      <el-tree
+        :style="'overflow: scroll;height:' + (window.pageHeight < 600 ? 465 : window.pageHeight - 135) + 'px;width:200px;'"
+        :data="patientRegister.customerOrgTreeAll" :props="treeprops" node-key="id" @node-contextmenu="nodeContextmenu"
         :filter-node-method="filterNode" @node-click="treeclick" highlight-current ref="customerOrgTree">
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <div>
@@ -28,7 +29,7 @@
 <script>
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { tcdate,deepCopy,reMadeOrgTree } from "../../utlis/proFunc";
+import { tcdate, deepCopy, reMadeOrgTree } from "../../utlis/proFunc";
 export default {
   components: {},
   data() {
@@ -42,21 +43,21 @@ export default {
       }, //树形组件的数据结构
       LocalConfig: {
         patientRegister: {
-          dispCustomerOrgCode:'N', // 人员登记列表--单位树是否显示 customerOrgCode
+          dispCustomerOrgCode: 'N', // 人员登记列表--单位树是否显示 customerOrgCode
         }
       }
     };
   },
   //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
   computed: {
-    ...mapState(["window", "dict","dataTransOpts","customerOrg", "patientRegister"]),
+    ...mapState(["window", "dict", "dataTransOpts", "customerOrg", "patientRegister"]),
   },
   //创建组件后
   created() {
     try {
       let LocalConfig = JSON.parse(window.localStorage.getItem('LocalConfig'))
       if (LocalConfig && LocalConfig.patientRegister) {
-        if (LocalConfig.patientRegister.dispCustomerOrgCode) this.LocalConfig.patientRegister.dispCustomerOrgCode = LocalConfig.patientRegister.dispCustomerOrgCode       
+        if (LocalConfig.patientRegister.dispCustomerOrgCode) this.LocalConfig.patientRegister.dispCustomerOrgCode = LocalConfig.patientRegister.dispCustomerOrgCode
       }
     } catch (error) {
       console.log("window.localStorage.getItem('LocalConfig')", error)
@@ -74,10 +75,10 @@ export default {
     getCustomerOrgTree() {
       getapi("/api/app/customerorg/getbycodeall").then((res) => {
         // console.log("res.data", res.data);
-        if (res.code > -1){
-          this.patientRegister.customerOrgTreeAll = reMadeOrgTree(deepCopy(res.data),this.LocalConfig.patientRegister.dispCustomerOrgCode);
+        if (res.code > -1) {
+          this.patientRegister.customerOrgTreeAll = reMadeOrgTree(deepCopy(res.data), this.LocalConfig.patientRegister.dispCustomerOrgCode);
           // tcdate(this.patientRegister.customerOrgTreeAll)
-        }        
+        }
       });
     },
 
@@ -95,15 +96,61 @@ export default {
     //   });
     // },
 
+    // 节点右击事件
+    nodeContextmenu(event, data, node, ids) {
+      // console.log('event,data,node,ids', event, data, node, ids)
+      if (data.id == this.dict.personOrgId) return
+
+      let items = [
+        {
+          label: "置顶",
+          onClick: () => {
+            this.treeSort(data, 1);
+          },
+        },
+        {
+          label: "置底",
+          onClick: () => {
+            this.treeSort(data, 2);
+          },
+        }
+      ] //菜单项
+      this.$contextmenu({
+        items,
+        event,
+        //x: event.clientX,
+        //y: event.clientY,
+        customClass: "custom-class",
+        zIndex: 3,
+        minWidth: 80,
+      });
+      return false;
+
+    },
+
+    // 树节点排序
+    treeSort(data, sortType) {
+      // if (data.parentId) {
+      //   this.$message.warning({ showClose: true, message: "请选择一级单位" })
+      //   return
+      // }
+      // console.log('data,sortType',data,sortType)
+      putapi(`/api/app/customerorg/updatemanysort?id=${data.id}&SortType=${sortType}`).then(res => {
+        if (res.code > -1) {
+          this.getCustomerOrgTree()
+        }
+      })
+    },
+
     //树过滤
     filterNode(value, data) {
       //console.log(value,data)
       if (!value) return true;
       return data['displayName'].indexOf(value) > -1 || data['simpleCode'].indexOf(value.toUpperCase()) > -1
-      || data['shortName'].indexOf(value.toUpperCase()) > -1 || data['customerOrgCode'].indexOf(value.toUpperCase()) > -1
-      ;
+        || data['shortName'].indexOf(value.toUpperCase()) > -1 || data['customerOrgCode'].indexOf(value.toUpperCase()) > -1
+        ;
     },
-    
+
     //点击树节点
     treeclick(data) {
       // console.log('data',data)
@@ -130,7 +177,8 @@ export default {
   font-size: 20px;
   margin-right: 5px;
 }
-:deep .el-tree-node>.el-tree-node__children{
+
+:deep .el-tree-node>.el-tree-node__children {
   overflow: visible;
 }
 </style>
diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js
index 67d4178..1298378 100644
--- a/src/utlis/proFunc.js
+++ b/src/utlis/proFunc.js
@@ -19,11 +19,11 @@ function reMadeOrgTree(treeData,dispCustomerOrgCode){
     }else{
       e.label = e.displayName
     }            
-    if (e.treeChildren.length == 0) {
-      delete e.treeChildren
+    if (e.treeChildren && Array.isArray(e.treeChildren) && e.treeChildren.length > 0) {
+      e.treeChildren = reMadeOrgTree(e.treeChildren,dispCustomerOrgCode)
     }else{
-      e.treeChildren = reMadeOrgTree(e.treeChildren)
-    }      
+      delete e.treeChildren
+    }
   })
   return treeData
 };