From f0020d5c8257a1ef119ee4bc8cae15c6437f82dd Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 13 Jun 2025 10:40:03 +0800
Subject: [PATCH] sc

---
 .env.base                                      |  4 ++--
 .../Management/Components/DialogOkrInfo.vue    | 18 ++++++++++++++----
 src/views/OKR/Meeting/MeetingInfo.vue          |  1 +
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.env.base b/.env.base
index 4bc8726..978fb4c 100644
--- a/.env.base
+++ b/.env.base
@@ -6,9 +6,9 @@ VITE_DEV=true
 # 请求路径
 # VITE_BASE_URL='http://localhost:48080'
 
-# VITE_BASE_URL='http://47.98.161.246:48080'
+VITE_BASE_URL='http://47.98.161.246:48080'
 # VITE_BASE_URL='http://114.55.169.15:48080'
-VITE_BASE_URL='http://114.215.207.150:48080'
+# VITE_BASE_URL='http://114.215.207.150:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
diff --git a/src/views/OKR/Management/Components/DialogOkrInfo.vue b/src/views/OKR/Management/Components/DialogOkrInfo.vue
index 102e920..50134bb 100644
--- a/src/views/OKR/Management/Components/DialogOkrInfo.vue
+++ b/src/views/OKR/Management/Components/DialogOkrInfo.vue
@@ -462,9 +462,9 @@ const emit = defineEmits(['success', 'close']) // 定义 success 事件，用于
 function addObjective() {
   objectList.value.push({
     objectiveName: '',
-    executor: [],
+    executor: form.value.executor || [],
     keyResults: [],
-    dataScope: 2
+    dataScope: form.value.dataScope || 2
   })
 }
 
@@ -543,8 +543,8 @@ async function handleSave() {
       .confirm('是否按照当前节点所选的多个执行人自动新增对应的员工节点？', {
         type: 'warning',
         showCancelButton: true,
-        cancelButtonText: '取消',
-        confirmButtonText: '确定'
+        cancelButtonText: '不新增员工节点',
+        confirmButtonText: '新增员工节点'
       })
       .then(() => {
         saveOkrData(true)
@@ -577,21 +577,31 @@ async function saveOkrData(isAutoAddChild = false) {
                 2,
                 '0'
               )}-${getLastDayOfMonth(defaultTime.getFullYear(), month)}`,
+              dataScope: form.value.dataScope,
+              executor: form.value.executor,
               children: [
                 {
                   nodeName: `${month + 1}月第1周`,
+                  dataScope: form.value.dataScope,
+                  executor: form.value.executor,
                   children: []
                 },
                 {
                   nodeName: `${month + 1}月第2周`,
+                  dataScope: form.value.dataScope,
+                  executor: form.value.executor,
                   children: []
                 },
                 {
                   nodeName: `${month + 1}月第3周`,
+                  dataScope: form.value.dataScope,
+                  executor: form.value.executor,
                   children: []
                 },
                 {
                   nodeName: `${month + 1}月第4周`,
+                  dataScope: form.value.dataScope,
+                  executor: form.value.executor,
                   children: []
                 }
               ]
diff --git a/src/views/OKR/Meeting/MeetingInfo.vue b/src/views/OKR/Meeting/MeetingInfo.vue
index 37ee06f..f657caf 100644
--- a/src/views/OKR/Meeting/MeetingInfo.vue
+++ b/src/views/OKR/Meeting/MeetingInfo.vue
@@ -126,6 +126,7 @@
             <div v-if="!!isDetail" class="w-full">{{ form.meetingSummary }}</div>
             <el-input
               v-else
+              v-model="form.meetingSummary"
               type="textarea"
               placeholder="请输入会议纪要"
               :maxlength="-1"