Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/timesheet_mld/src/views/project/gantt.vue

@@ -18,11 +18,12 @@
       :style="`top:${tooltip.y}px;left:${tooltip.x}px;`" 
       class="custom-tooltip-customize"
     >
+      <div><b>类&#8195;&ensp;&nbsp;型:</b> {{ tooltip.task.taskPlanTypeName }}</div>
       <div><b>开始时间:</b> {{ tooltip.task.start_date }}</div>
       <div><b>结束时间:</b> {{ tooltip.task.end_date }}</div>
       <div><b>计划工时:</b> {{ tooltip.task.time }} 小时 ({{ tooltip.task.dayDifference }} 天 )</div>
       <div><b>项目名称:</b> {{ tooltip.task.projectName }}</div>
-      <div><b>计划名称:</b> {{ tooltip.task.planName }}</div>
+      <div><b>任务内容:</b> {{ tooltip.task.planName }}</div>
     </div>
   </div>
 </template>
@@ -46,6 +47,12 @@ export default {
     },
     stafforpro: '',
     valueDate: [],
+    typeList: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
   },
   data() {
     return {
@@ -248,6 +255,7 @@ export default {
             projectName: list[0],
             planName: list[1],
             dayDifference:  d2.diff(d1, 'day'),
+            taskPlanTypeName: this.typeList.find(type => type.id == task.taskPlanType).name
           };
           this.tooltip.x = rect.left + window.scrollX;
           this.tooltip.y = (rect.top - 180) - 10 + window.scrollY;

fhKeeper/formulahousekeeper/timesheet_mld/src/views/project/project_gantt.vue

@@ -221,7 +221,7 @@
           </template>
         </div>
       </div>
-      <gantt ref="ganttTable1" class="left-container" :tasks="tasks" :stafforpro="radio1":valueDate="valueDate":key="updatakey1" @closeBounced="closeBounced":style="`height: 88vh`"
+      <gantt ref="ganttTable1" class="left-container" :tasks="tasks" :stafforpro="radio1":valueDate="valueDate":key="updatakey1" :typeList="typeList" @closeBounced="closeBounced":style="`height: 88vh`"
       ></gantt>
     </div>