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 @@
{{ form.meetingSummary }}