提交

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

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

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

@@ -61,10 +61,11 @@ export default {
 
   methods: {
     detaliTaskExposure(row) {
+      const { taskId, ganttData } = row
       this.title = '编辑计划'
+      this.showMmeiLaiDeData = JSON.parse(ganttData || '{}')
       setTimeout(() => {
-        console.log('开始执行')
-        this.editTask(row)
+        this.editTask({ taskId })
       }, 1000)
     },
     getDistanceToParent(element, parent) {

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

@@ -2142,7 +2142,7 @@ a {
                     const { messageTaskId } = to.query
                     console.log(messageTaskId, '<======== messageTaskId')
                     if(messageTaskId && this.user.companyId == 876) {
-                        this.openTheReviewPopUpWindowSeparately(messageTaskId)
+                        this.openTheReviewPopUpWindowSeparately(messageTaskId, ganttData)
                     }
                 }
             }
@@ -2154,11 +2154,11 @@ a {
             })
         },
         methods: {
-            openTheReviewPopUpWindowSeparately(taskId) {
+            openTheReviewPopUpWindowSeparately(taskId, ganttData) {
                 this.isganttshow = true
                 setTimeout(() => {
                     console.log(this.$refs.projectganttRef, ',=========== this.$refs.projectganttRef')
-                    this.$refs.projectganttRef.parentLevelOpensPopUpWindowGantt({ taskId })
+                    this.$refs.projectganttRef.parentLevelOpensPopUpWindowGantt({ taskId, ganttData })
                 }, 300)
             },
             qrCodeClickEvent() {
@@ -6315,9 +6315,9 @@ a {
                 this.getManDaySetting();
             }
 
-            const { messageTaskId } = this.$route.query
+            const { messageTaskId, ganttData } = this.$route.query
             if(this.user.companyId == 876 && messageTaskId) {
-                this.openTheReviewPopUpWindowSeparately(messageTaskId)
+                this.openTheReviewPopUpWindowSeparately(messageTaskId, ganttData)
             }
         },
     };