From 97ba82f7bdc874e16f32139a8d83a22274ae6034 Mon Sep 17 00:00:00 2001
From: userName <244140623@qq.com>
Date: Tue, 20 Feb 2024 17:33:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/mts/domain/vo/MesPlanDetailVo.java  |  7 +++
 .../src/views/mts/planDetail/index.vue        | 49 ++++++++++++++-----
 2 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanDetailVo.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanDetailVo.java
index 6f0f7d4..3056385 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanDetailVo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanDetailVo.java
@@ -1,12 +1,15 @@
 package com.ruoyi.mts.domain.vo;
 
 import java.util.Date;
+
+import cn.hutool.core.date.DatePattern;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import lombok.Data;
+
 import java.util.Date;
 
 import java.io.Serializable;
@@ -50,21 +53,25 @@ public class MesPlanDetailVo implements Serializable {
     /**
      * 计划开始时间
      */
+    @JsonFormat(pattern = DatePattern.NORM_DATE_PATTERN)
     private Date planStartDate;
 
     /**
      * 计划结束时间
      */
+    @JsonFormat(pattern = DatePattern.NORM_DATE_PATTERN)
     private Date planEndDate;
 
     /**
      * 实际开始时间
      */
+    @JsonFormat(pattern = DatePattern.NORM_DATE_PATTERN)
     private Date actualStartDate;
 
     /**
      * 实际结束时间
      */
+    @JsonFormat(pattern = DatePattern.NORM_DATE_PATTERN)
     private Date actualEndDate;
 
     /**
diff --git a/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue b/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue
index 664571d..b1008b5 100644
--- a/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue
+++ b/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue
@@ -30,10 +30,10 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-if="refreshTable" v-loading="loading" :data="planDetailList" row-key="id"
+    <el-table v-if="refreshTable" v-loading="loading" :data="planDetailList" row-key="id" height="800"
       :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       :cell-style="handleChangeCellStyle">
-      <el-table-column label="名称" align="left" prop="name" width="180">
+      <el-table-column fixed="left" label="名称" align="left" prop="name" width="180">
         <template #default="scope">
           <router-link :to="'/mts/detail-bom/index/' + scope.row.id" class="link-type">
             <span>{{ scope.row.name }}</span>
@@ -165,17 +165,19 @@ const { queryParams, form, rules } = toRefs(data);
 
 
 const dateColumns = ref([])
+const allDates = [];
 onMounted(() => {
   // 定义起始和结束日期
   const startDate = dayjs('2024-02-01');
   const endDate = dayjs('2024-02-25');
   // 获取并打印两个日期之间的所有日期
-  const allDates = [];
-  for (const date of datesBetween(startDate, endDate)) {
-    allDates.push(date.format('YYYY-MM-DD'));
+
+
+  for (const date of getDays('2024-02-01', '2024-02-25')) {
+    allDates.push(date);
     dateColumns.value.push({
-      label: date.format('YYYY-MM-DD'),
-      prop: date.format('YYYY-MM-DD')
+      label: date,
+      prop: date
     })
   }
 })
@@ -189,16 +191,41 @@ function* datesBetween(start, end) {
   }
 }
 
+// 获取日期间隔之间的天数
+function getDays(start, end) {
+  const startDate = dayjs(start);
+  const endDate = dayjs(end);
+  let allDates = [];
+  for (let date = startDate.clone(); date.isBefore(endDate); date = date.add(1, 'day')) {
+    allDates.push(date.format('YYYY-MM-DD'));
+  }
+  allDates.push(endDate.format('YYYY-MM-DD'))
+  return allDates
+}
+
 /**
   * 改变表格单元格颜色
   */
 
 function handleChangeCellStyle({ row, column, rowIndex, columnIndex }) {
-  let cellStyle = {}
-  if (column.label == dayjs(row.planStartDate).format('YYYY-MM-DD')) {
-    cellStyle.backgroundColor = '#FFC000'
+  // 获取两个日期之间的所有日期
+  const planDates = getDays(row.planStartDate, row.planEndDate)
+  let arr = planDates.filter(v => allDates.indexOf(v) > -1)
+
+  let cellStyle = {} //column.label == dayjs(row.planStartDate).format('YYYY-MM-DD')
+  if (arr.includes(column.label)) {
+    if (row.ganttColor) {
+      cellStyle.backgroundColor = row.ganttColor
+    } else {
+      cellStyle.backgroundColor = '#FFC000'
+    }
+
     if (rowIndex % 2 == 0) {
-      cellStyle.backgroundColor = '#00B050'
+      if (row.ganttColor) {
+        cellStyle.backgroundColor = row.ganttColor
+      } else {
+        cellStyle.backgroundColor = '#00B050'
+      }
     }
   } else {
     cellStyle.backgroundColor = 'white'