提交

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

@@ -52,12 +52,12 @@
                 <el-form-item label="任务完成校验" v-if="user.timeType.taskFileCharge">
                     <el-checkbox v-model="addForm.attachFileRequired" >是否必须上传成果文件</el-checkbox>
                 </el-form-item>
-                <el-form-item label="第一审核人" v-if="showMmeiLaiDe && user.roleId != 2283" prop="checkSecondId">
+                <el-form-item label="第一审核人" v-if="showMmeiLaiDe" prop="checkSecondId">
                     <el-select v-model="addForm.checkFirstId" :disabled="true" size="small">
                         <el-option v-for="item in users" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="第二审核人" v-if="showMmeiLaiDe && user.roleId != 2283" prop="checkSecondId">
+                <el-form-item label="第二审核人" v-if="showMmeiLaiDe" prop="checkSecondId">
                     <el-select v-model="addForm.checkSecondId" :disabled="!addForm.checkFirstId || doYouWantToDisableAll" size="small">
                         <el-option v-for="item in pmUserList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>

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

@@ -772,12 +772,13 @@
                             this.$router.push("/projectInside/"+date);
                             this.drawer = false;
                         } else if(type == 11) {
-                            const { taskId,  } = row
+                            console.log(row, '<====== ganttData')
+                            const { taskId, ganttData } = row
                             this.$router.push({
                                 path: '/list',
                                 query: { 
                                     messageTaskId: taskId,
-                                    showMmeiLaiDeData: JSON.stringify(ganttData || {}) 
+                                    ganttData: JSON.stringify(ganttData || {}) 
                                 }
                             });
                             this.drawer = false;

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -2139,8 +2139,8 @@ a {
             },
             '$route'(to, from) {
                 if (to.path === '/list') {
-                    const { messageTaskId } = to.query
-                    console.log(messageTaskId, '<======== messageTaskId')
+                    const { messageTaskId, ganttData } = to.query
+                    console.log(messageTaskId, ganttData, '<======== messageTaskId')
                     if(messageTaskId && this.user.companyId == 876) {
                         this.openTheReviewPopUpWindowSeparately(messageTaskId, ganttData)
                     }
@@ -6317,6 +6317,7 @@ a {
 
             const { messageTaskId, ganttData } = this.$route.query
             if(this.user.companyId == 876 && messageTaskId) {
+                console.log(ganttData)
                 this.openTheReviewPopUpWindowSeparately(messageTaskId, ganttData)
             }
         },