提交相关代码

fhKeeper/formulahousekeeper/timesheet_mld/src/components/taskComponent.vue

@@ -378,7 +378,7 @@
         <el-button v-if="showMmeiLaiDeData.taskPlan && showMmeiLaiDeData.taskStatus == 2" @click.native="deleteTask()" style="float:left;">删除</el-button>
         <el-button @click.native="closeBounceds()">{{ $t('btn.cancel') }}</el-button>
 
-        <template v-if="(showMmeiLaiDeData.leaderIdList || []).includes(user.id) && showMmeiLaiDeData.taskStatus == 3">
+        <template v-if="addForm.taskStatus == 3 && addForm.createrId == user.id">
             <el-button @click.native="planToWithdraw()">撤回</el-button>
         </template>
 

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

@@ -16,7 +16,7 @@
     <div 
       v-if="tooltip.visible"
       :style="`top:${tooltip.y}px;left:${tooltip.x}px;`" 
-      class="custom-tooltip"
+      class="custom-tooltip-customize"
     >
       <div><b>开始时间:</b> {{ tooltip.task.start_date }}</div>
       <div><b>结束时间:</b> {{ tooltip.task.end_date }}</div>
@@ -251,7 +251,7 @@ export default {
             dayDifference:  d2.diff(d1, 'day'),
           };
           this.tooltip.x = rect.left + window.scrollX;
-          this.tooltip.y = (rect.top - 240) - 10 + window.scrollY;
+          this.tooltip.y = (rect.top - 180) - 10 + window.scrollY;
           this.tooltip.visible = true;
         });
 
@@ -648,7 +648,7 @@ export default {
   white-space: pre-wrap;
 }
 
-.custom-tooltip {
+.custom-tooltip-customize {
   position: fixed;
   z-index: 9999;
   background: rgba(0, 0, 0, 0.7);
@@ -656,4 +656,13 @@ export default {
   padding: 20px;
   border-radius: 6px;
 }
+
+.custom-tooltip-customize div {
+  margin-bottom: 10px;
+  line-height: 20px;
+}
+
+.custom-tooltip-customize div:last-child {
+  margin-bottom: 0;
+}
 </style>