提交相关代码

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

@@ -774,20 +774,20 @@
                         } else if(type == 11) {
                             console.log(row, '<====== ganttData')
                             const { taskId, ganttData, msg } = row
-                            if(msg.indexOf('取消') != -1 || msg.indexOf('驳回') != -1 || msg.indexOf('审核') != -1) {
-                                this.$router.push({
-                                    path: '/task',
-                                    query: { doICreateIt: true }
-                                })
-                            } else {
-                                this.$router.push({
-                                    path: '/list',
-                                    query: { 
-                                        messageTaskId: taskId,
-                                        ganttData: JSON.stringify(ganttData || {}) 
-                                    }
-                                });
-                            }
+                            // if(msg.indexOf('取消') != -1 || msg.indexOf('驳回') != -1 || msg.indexOf('审核') != -1) {
+                            this.$router.push({
+                                path: '/task',
+                                query: { doICreateIt: msg.indexOf('审批') != -1 ? 3 : 2 }
+                            })
+                            // } else {
+                            //     this.$router.push({
+                            //         path: '/list',
+                            //         query: { 
+                            //             messageTaskId: taskId,
+                            //             ganttData: JSON.stringify(ganttData || {}) 
+                            //         }
+                            //     });
+                            // }
                             this.drawer = false;
                         }
                         

fhKeeper/formulahousekeeper/timesheet_mld/src/views/task/list.vue

@@ -2563,7 +2563,7 @@ import { getThemeColor } from '@/utils/commonMethod.js'
             const query = this.$route.query
             if(query.doICreateIt) {
                 setTimeout(() => {
-                    this.switchs(2)
+                    this.switchs(query.doICreateIt)
                 }, 500)
             }
         },