sc

src/views/OKR/Management/Components/AllTarget.vue

@@ -72,12 +72,16 @@ const isCurrentLeafNode = ref(false)
 
 function handleSearchPeroid() {
   getAllNodeTree().then((resp) => {
-    peroidList.value = listToTree(resp.tree, {
+    if (resp.nodeId) {
-      id: 'nodeId',
+      peroidList.value = listToTree(resp.tree, {
-      pid: 'parentId',
+        id: 'nodeId',
-      children: 'children'
+        pid: 'parentId',
-    })
+        children: 'children'
-    nodeChange(resp.nodeId)
+      })
+      nodeChange(resp.nodeId)
+    } else {
+      message.warning('请先创建节点数据')
+    }
   })
 }
 

src/views/OKR/Management/Components/DialogOkr.vue

@@ -339,9 +339,19 @@ import { useUserStore } from '@/store/modules/user'
 const message = useMessage()
 const userStore = useUserStore()
 const currentUserId = userStore.getUser.id
-const emit = defineEmits(['edit'])
+const emit = defineEmits(['edit', 'close'])
 
 const show = ref(false)
+
+watch(
+  () => show.value,
+  (newValue, oldValue) => {
+    if (oldValue && !newValue) {
+      emit('close', nodeInfo.value)
+    }
+  }
+)
+
 const canEdit = ref(false)
 
 const toolbarConfig = {