orgTree

src/components/customerOrg/customerOrgTree.vue

@@ -1,15 +1,5 @@
 <template>
-<<<<<<< HEAD
   <el-tree :data="customerOrg.customerOrgTree" :props="customerOrg.treeprops" @node-click="treeclick"></el-tree>
-=======
-  <el-tree
-    :data="customerOrg.customerOrgTree"
-    :props="customerOrg.treeprops"
-    @node-click="treeclick"
-  >
-    </el-tree>
-  
->>>>>>> f9d318d580e990df8dcef97694425c64af480c32
 </template>
 <script>
 
@@ -20,14 +10,10 @@ export default {
   data() {
     return {};
   },
-<<<<<<< HEAD
   //<el-tree :data="$store.state.customerOrg.customerOrgTree" :props="$store.state.customerOrg.treeprops" @node-click="treeclick"></el-tree>
   computed:{
     ...mapState(['customerOrg']),
   },
-=======
-
->>>>>>> f9d318d580e990df8dcef97694425c64af480c32
   //创建组件后
   created() {},
 
@@ -38,10 +24,7 @@ export default {
   },
 
   methods: {
-<<<<<<< HEAD
     ...mapMutations(['setData']),
-=======
->>>>>>> f9d318d580e990df8dcef97694425c64af480c32
     //获取体检单位列表树信息
     getCustomerOrgTree() {
       let customerOrgTree = [
@@ -57,25 +40,12 @@ export default {
         },
       ];
       //console.log('this.data.customerOrgTree',this.data.customerOrgTree)
-<<<<<<< HEAD
       this.setData({ key: 'customerOrg.customerOrgTree', value: customerOrgTree})
-=======
-      this.$store.commit("setData", {
-        key: "customerOrg.customerOrgTree",
-        value: customerOrgTree,
-      });
-      
->>>>>>> f9d318d580e990df8dcef97694425c64af480c32
     },
 
     //点击树节点
     treeclick(data) {
-<<<<<<< HEAD
       this.$message.success(data.id + " 查询单位详情、体检次数、联系人等信息 " + data.displayName);//      
-=======
-      console.log(data);
-      this.$message.success("查询单位详情、体检次数、联系人等信息"); //
->>>>>>> f9d318d580e990df8dcef97694425c64af480c32
       getapi(`/api/app/item/in-item-type/${data.id}`).then((res) => {
         this.tableData = res.data;
         console.log(res.data, "ress");