调整代码

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

@@ -375,8 +375,9 @@
         </el-dialog>
     </div>
     <div slot="footer" class="dialog-footer foooot">
-        <el-button v-if="(user.id == showMmeiLaiDeData.checkFirstId && showMmeiLaiDeData.taskStatus == 3) || (user.id == showMmeiLaiDeData.checkSecondId && [4, '4', '1', 1].includes(showMmeiLaiDeData.taskStatus))" @click.native="deleteTask()" style="float:left;">{{ $t('btn.delete') }}</el-button>
-        <el-button v-if="showMmeiLaiDeData.taskPlan && showMmeiLaiDeData.taskStatus == 2" @click.native="deleteTask()" style="float:left;">删除</el-button>
+        <!-- <el-button v-if="(user.id == showMmeiLaiDeData.checkFirstId && showMmeiLaiDeData.taskStatus == 3) || (user.id == showMmeiLaiDeData.checkSecondId && [4, '4', '1', 1].includes(showMmeiLaiDeData.taskStatus))" @click.native="deleteTask()" style="float:left;">{{ $t('btn.delete') }}</el-button>
+        <el-button v-if="showMmeiLaiDeData.taskPlan && showMmeiLaiDeData.taskStatus == 2" @click.native="deleteTask()" style="float:left;">删除</el-button> -->
+        <el-button v-if="addForm.createrId == user.id && addForm.taskStatus == 2" @click.native="deleteTask()" style="float:left;">删除</el-button>
         <el-button @click.native="closeBounceds()">{{ $t('btn.cancel') }}</el-button>
 
         <template v-if="addForm.taskStatus == 3 && addForm.createrId == user.id">

fhKeeper/formulahousekeeper/timesheet_mld/src/views/Home.vue

@@ -773,11 +773,12 @@
                             this.drawer = false;
                         } else if(type == 11) {
                             console.log(row, '<====== ganttData')
-                            const { taskId, ganttData, msg } = row
+                            const { taskId, ganttData, msg, jumpType } = row
                             // if(msg.indexOf('取消') != -1 || msg.indexOf('驳回') != -1 || msg.indexOf('审核') != -1) {
                             this.$router.push({
                                 path: '/task',
-                                query: { doICreateIt: msg.indexOf('审批') != -1 ? 3 : 2 }
+                                // query: { doICreateIt: msg.indexOf('新的工作计划') != -1 ? 1 : msg.indexOf('审批') != -1 ? 3 : 2 }
+                                query: { doICreateIt: jumpType ? jumpType : 2 }
                             })
                             // } else {
                             //     this.$router.push({

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

@@ -418,7 +418,7 @@ export default {
 
       // 正常人
       return `<div class="task_text" style="justify-content: center;">
-          <div>${task.text}</div>
+          <div style="color: #333">${task.text}</div>
         </div>`;
     };
     gantt.config.grid_width = 350;