Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

src/pages/teacher/teacherMonth.vue

@@ -175,7 +175,8 @@
         </template>
         <template v-slot:body-cell-FinishTimesPlanCount="props">
           <q-td :props="props">
-            {{props.row.FinishTimes}} / {{props.row.FollowCount}}
+            <span style="color:blue;cursor:pointer;" title="点击查看跟进详细信息" @click="GoToDetails(props.row)"> {{props.row.FinishTimes}} /
+              {{props.row.FollowCount}}</span>
           </q-td>
         </template>
         <template v-slot:bottom-row>
@@ -471,6 +472,16 @@
       this.getList();
     },
     methods: {
+      //跳转到跟进详情
+      GoToDetails(item) {
+        var lastDay = new Date(this.msg.YearStr, this.msg.MonthStr, 0).getDate()
+        var qObj = {
+          HeadTeacherId: item.AccountId,
+          StartTime: this.msg.YearStr + "-" + this.msg.MonthStr + "-01",
+          EndTime: this.msg.YearStr + "-" + this.msg.MonthStr + "-" + lastDay,
+        };
+        this.OpenNewUrl('/teacher/teacherTrack', qObj)
+      },
       //初始化部门数据
       initDeptList() {
         var localStorageData = window.localStorage["loginUserInfo"];

src/pages/teacher/teacherTrack.vue

@@ -47,7 +47,6 @@
     height: 40px;
     background-color: rgb(238, 238, 239);
   }
-
 </style>
 <template>
   <div class="page-body studentTracking">
@@ -256,7 +255,7 @@
             <td>
               <span v-html="getTeacherManager(item)"></span>
             </td>
-      
+
             <td>
               <span>{{ item.ContractSTime }}</span>
             </td>
@@ -411,7 +410,6 @@
           StuSourceId: '',
           StuPurpose: '', //学习目的
           HeadTeacherId: '', //老师
-
         },
         //归属类型列表
         BelongTypeList: [{
@@ -497,7 +495,19 @@
           this.msg.IsQueryMyStu = 0
           return
         }
-      })
+      });
+
+      if (this.$route.query) {
+        if (this.$route.query.HeadTeacherId) {
+          this.msg.HeadTeacherId = parseInt(this.$route.query.HeadTeacherId)
+        }
+        if (this.$route.query.StartTime) {
+          this.dateArray.push(this.$route.query.StartTime);
+        }
+        if (this.$route.query.EndTime) {
+          this.dateArray.push(this.$route.query.EndTime);
+        }
+      }
     },
     computed: mapState({
       //是否有下载权限
@@ -894,11 +904,9 @@
       },
     }
   }
-
 </script>
 <style lang="sass">
   @import url('~assets/css/table.sass')
-
 </style>
 <style scoped>
   /deep/.el-input__inner,
@@ -925,5 +933,4 @@
   .roatImg {
     transform: rotate(180deg);
   }
-
-</style>
+</style>
\ No newline at end of file