From 2f35b37455acd46c50658a3c56e45db03eaa480a Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 15 五月 2024 10:54:23 +0800
Subject: [PATCH] 合并冲突

---
 src/components/view/a6-personnel-detail.vue |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/src/components/view/a6-personnel-detail.vue b/src/components/view/a6-personnel-detail.vue
index d4ffde8..3778dec 100644
--- a/src/components/view/a6-personnel-detail.vue
+++ b/src/components/view/a6-personnel-detail.vue
@@ -177,6 +177,46 @@
 		},
 		data() {
 			return {
+        datathirdParty:[{
+          id: 1,
+          label: '涓�绾� 1',
+          children: [{
+            id: 4,
+            label: '浜岀骇 1-1',
+            children: [{
+              id: 9,
+              label: '涓夌骇 1-1-1'
+            }, {
+              id: 10,
+              label: '涓夌骇 1-1-2'
+            }]
+          }]
+        }, {
+          id: 2,
+          label: '涓�绾� 2',
+          children: [{
+            id: 5,
+            label: '浜岀骇 2-1'
+          }, {
+            id: 6,
+            label: '浜岀骇 2-2'
+          }]
+        }, {
+          id: 3,
+          label: '涓�绾� 3',
+          children: [{
+            id: 7,
+            label: '浜岀骇 3-1'
+          }, {
+            id: 8,
+            label: '浜岀骇 3-2'
+          }]
+        }],
+        defaultProps: {
+          children: 'children',
+          label: 'label'
+        },
+        addthirdParty:false,
 				search: null,
 				list: [],
 				selectTree: '',
@@ -218,6 +258,7 @@
 			this.selectTreeList()
 		},
 		methods: {
+
 			filterNode(value, data) {
 				if (!value) return true;
 				return data.name.indexOf(value) !== -1;

--
Gitblit v1.9.3