From 1fd655872ba0414c59b9152a69fde78cb3c4a759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Thu, 26 Dec 2024 17:37:11 +0800 Subject: [PATCH] =?UTF-8?q?ljm=20=E4=BF=AE=E6=94=B9=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- planning_gantt/static/src/js/planning_gantt_renderer.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/planning_gantt/static/src/js/planning_gantt_renderer.js b/planning_gantt/static/src/js/planning_gantt_renderer.js index a81883ddd..8013ffcea 100644 --- a/planning_gantt/static/src/js/planning_gantt_renderer.js +++ b/planning_gantt/static/src/js/planning_gantt_renderer.js @@ -188,15 +188,15 @@ patch(PlanningGanttRenderer.prototype, { group.end_time = groupSlotTemplate?.end_time || 0; group.end_time2 = groupSlotTemplate?.end_time2 || 0; group.day2 = groupSlotTemplate?.day2 || ''; - group.planning_name = groupSlotTemplate?.planning_name; + group.planning_name = groupSlotTemplate?.planning_name || ''; // 拼接显示信息 // 拼接显示信息，根据 day2 是否有值来决定显示内容 if (group.day2) { // 如果 day2 有值，显示 day2 的时间 - group.ganttLegend = `${groupSlotTemplate.planning_name} : ${floatToTime(group.start_time)} - ${groupSlotTemplate.day2} ${floatToTime(group.end_time2)}`; + group.ganttLegend = `${group.planning_name} : ${floatToTime(group.start_time)} - ${group.day2} ${floatToTime(group.end_time2)}`; } else { // 如果 day2 没有值，正常显示 - group.ganttLegend = `${groupSlotTemplate.planning_name} : ${floatToTime(group.start_time)} - ${floatToTime(group.end_time)}`; + group.ganttLegend = `${group.planning_name} : ${floatToTime(group.start_time)} - ${floatToTime(group.end_time)}`; } }); },