From 8f20e04701a20d57faf9eec462aac7f53c2405d1 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 29 Apr 2025 18:46:16 +0800
Subject: [PATCH] sc

---
 .../OKR/Management/Components/DialogOkr.vue   | 69 ++++++++++---------
 .../Management/Components/DialogOkrInfo.vue   |  5 +-
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/src/views/OKR/Management/Components/DialogOkr.vue b/src/views/OKR/Management/Components/DialogOkr.vue
index ab86975..cabb65c 100644
--- a/src/views/OKR/Management/Components/DialogOkr.vue
+++ b/src/views/OKR/Management/Components/DialogOkr.vue
@@ -99,7 +99,7 @@
         </div>
         <div class="dialog-okr-side pl-10px">
           <el-tabs v-model="sideIndex" style="flex: 1; height: 100%">
-            <el-tab-pane label="子节点" name="subNode">
+            <el-tab-pane label="子节点" name="subNode" key=" ">
               <div class="overflow-y-auto" style="height: calc(100% - 50px)">
                 <div
                   v-for="item in childNodeList"
@@ -143,42 +143,43 @@
                 </div>
               </div>
             </el-tab-pane>
-            <el-tab-pane label="评论" name="conclusion">
+            <el-tab-pane label="评论" name="conclusion" key="conclusion">
               <div class="relative overflow-y-auto" style="height: calc(100% - 50px)">
-                <div class="flex justify-between items-center">
-                  <el-select
-                    v-if="addNewComment"
-                    v-model="form.commentType"
-                    filterable
-                    size="small"
-                    style="width: 120px"
-                    @change="getCommentTemplate"
-                  >
-                    <el-option
-                      v-for="it in commentTypeOptions"
-                      :label="it.label"
-                      :value="it.id"
-                      :key="it.id"
-                    />
-                  </el-select>
+                <div v-if="addNewComment">
+                  <div class="flex justify-between items-center">
+                    <el-select
+                      v-model="form.commentType"
+                      filterable
+                      size="small"
+                      style="width: 120px"
+                      @change="getCommentTemplate"
+                    >
+                      <el-option
+                        v-for="it in commentTypeOptions"
+                        :label="it.label"
+                        :value="it.id"
+                        :key="it.id"
+                      />
+                    </el-select>
 
-                  <div v-if="addNewComment">
-                    <el-button size="small" @click="addNewComment = false"> 取消 </el-button>
-                    <el-button type="primary" size="small" @click="handleSaveComment">
-                      发布
-                    </el-button>
+                    <div>
+                      <el-button size="small" @click="addNewComment = false"> 取消 </el-button>
+                      <el-button type="primary" size="small" @click="handleSaveComment">
+                        发布
+                      </el-button>
+                    </div>
+                  </div>
+                  <div class="mt-10px" v-if="addNewComment">
+                    <Editor
+                      v-model:modelValue="form.commentValue"
+                      height="300px"
+                      :toolbarConfig="toolbarConfig"
+                    />
                   </div>
-                  <el-button v-else type="primary" size="small" @click="handleInsertComment">
-                    新增评论
-                  </el-button>
-                </div>
-                <div class="mt-10px" v-if="addNewComment">
-                  <Editor
-                    v-model:modelValue="form.commentValue"
-                    height="300px"
-                    :toolbarConfig="toolbarConfig"
-                  />
                 </div>
+                <el-button v-else type="primary" size="small" @click="handleInsertComment">
+                  新增评论
+                </el-button>
                 <div
                   v-for="(it, index) in commentList"
                   :key="it.commentId"
@@ -296,7 +297,7 @@
                 </div>
               </div>
             </el-tab-pane>
-            <el-tab-pane label="进度历史" name="history">
+            <el-tab-pane label="进度历史" name="history" key="history">
               <div class="overflow-y-auto pl-15px" style="height: calc(100% - 50px)">
                 <el-timeline class="ml-10px">
                   <el-timeline-item
diff --git a/src/views/OKR/Management/Components/DialogOkrInfo.vue b/src/views/OKR/Management/Components/DialogOkrInfo.vue
index b43923b..2dc6422 100644
--- a/src/views/OKR/Management/Components/DialogOkrInfo.vue
+++ b/src/views/OKR/Management/Components/DialogOkrInfo.vue
@@ -145,6 +145,7 @@
                         placeholder="选择执行人，可多选"
                         multiple
                         clearable
+                        collapse-tags
                         filterable
                         style="width: 240px; margin-left: 10px"
                       >
@@ -212,10 +213,10 @@
                             node-key="sourceId"
                             placeholder="请选择渠道"
                           />
-                          <el-radio-group v-model="kr.resultType" class="ml-10px">
+                          <!-- <el-radio-group v-model="kr.resultType" class="ml-10px">
                             <el-radio-button :value="1">目标值</el-radio-button>
                             <el-radio-button :value="2">是/否</el-radio-button>
-                          </el-radio-group>
+                          </el-radio-group> -->
 
                           <el-input
                             v-if="kr.resultType == 1"