页面修改

src/pages/teacher/appraisalList.vue

@@ -159,11 +159,23 @@
       }
     }),
     created() {
+        this.findData();
       let today = new Date();
+      // if (this.$route.query) {
+      //   if (this.$route.query.TeacherAccountId) {
+      //     this.msg.TeacherAccountId = parseInt(this.$route.query.TeacherAccountId)
+      //   }
+      //   if (this.$route.query.YearStr && this.$route.query.MonthStr) {
+      //     this.msg.YearStr = this.$route.query.YearStr;
+      //     this.msg.MonthStr = this.$route.query.MonthStr
+      //     this.queryDate = this.msg.YearStr + '-' + this.msg.MonthStr
+      //   }
+      // } else {
+        
+      // }
       this.msg.YearStr = today.getFullYear().toString();
-      this.msg.MonthStr = (today.getMonth() + 1).toString();
-      this.queryDate = this.msg.YearStr + '-' + this.msg.MonthStr;
-      this.findData();
+        this.msg.MonthStr = (today.getMonth() + 1).toString();
+        this.queryDate = this.msg.YearStr + '-' + this.msg.MonthStr;
     },
     mounted() {
       if (!this.isHaveEdit) {

src/pages/teacher/jobEvaluation.vue

@@ -116,13 +116,11 @@
       }
     },
     created() {
-      let today = new Date();
-      var yearStr = today.getFullYear().toString();
-      var monthStr = (today.getMonth() + 1).toString();
-      this.teacherDate = yearStr + '-' + monthStr;
+
       this.GetTeacherList();
     },
     mounted() {
+      let today = new Date();
       if (this.$route.query) {
         if (this.$route.query.Id) {
           this.saveObj.Id = this.$route.query.Id;
@@ -130,7 +128,14 @@
         if (this.$route.query.TeacherAccountId) {
           this.saveObj.TeacherAccountId = this.$route.query.TeacherAccountId
         }
+        if (this.$route.query.YearStr && this.$route.query.MonthStr) {
+          this.teacherDate = this.$route.query.YearStr + '-' + this.$route.query.MonthStr;
+        }
         this.getInfo();
+      } else {
+        var yearStr = today.getFullYear().toString();
+        var monthStr = (today.getMonth() + 1).toString();
+        this.teacherDate = yearStr + '-' + monthStr;
       }
     },
     methods: {
@@ -221,7 +226,7 @@
                   this.$router.push({
                     path: "/teacher/appraisalList",
                     query: {
-                   
+
                     }
                   });
                 }

src/pages/teacher/teacherMonth.vue

@@ -195,11 +195,18 @@
         </template>
         <template v-slot:body-cell-FinishTimesPlanCount="props">
           <q-td :props="props">
-            <span style="color:blue;cursor:pointer;" title="点击查看跟进详细信息" @click="GoToDetails(props.row)">
+            <span style="color:blue;cursor:pointer;" title="点击查看跟进详细信息" @click="GoToDetails(props.row,1)">
               {{props.row.FinishTimes}} /
               {{props.row.FollowCount}}</span>
           </q-td>
         </template>
+        <template v-slot:body-cell-AssessmentScore="props">
+          <q-td :props="props">
+            <!-- <span style="color:blue;cursor:pointer;" title="点击查看考核信息" @click="GoToDetails(props.row,2)">
+            </span> -->
+            {{props.row.AssessmentScore}}
+          </q-td>
+        </template>
         <template v-slot:bottom-row>
           <q-tr v-if="lastRow">
             <q-td>
@@ -533,15 +540,26 @@
       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)
+      GoToDetails(item, type) {
+        //跳转到跟进详情
+        if (type == 1) {
+          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)
+        }
+        //跳转到考核列表
+        else {
+          var qObj = {
+            TeacherAccountId: item.AccountId,
+            YearStr: this.msg.YearStr,
+            MonthStr: this.msg.MonthStr,
+          };
+          this.OpenNewUrl('/teacher/jobEvaluation', qObj)
+        }
       },
       //初始化部门数据
       initDeptList() {