王子文 专项培养

master/src/main/resources/mybatis/training/spec/TStFeedbackMapper.xml

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="mentorId"    column="mentor_id"    />
         <result property="mentorName"    column="mentor_name"    />
         <result property="successorId"    column="successor_id"    />
-        <result property="successorName"    column="successorName"    />
+        <result property="successorName"    column="successor_name"    />
         <result property="parentId"    column="parent_id"    />
         <result property="planId"    column="plan_id"    />
         <result property="feedbackYear"    column="feedback_year"    />

ui/src/views/training/spec/seasonalfeedback/index.vue

@@ -726,12 +726,17 @@ export default {
       feedback.successorId = this.queryParams.successorId;
       feedback.feedbackYear = this.queryParams.feedbackYear;
       feedback.feedbackSeason = this.queryParams.feedbackSeason;
-      if (this.isMentor && this.staffId != tab.name) {
+      if (this.mentorId == tab.name) {
         feedback.parentId = this.parentId;
       }
+
+
+
+
       // 根据标签页导师id获取反馈id
       getFeedbackByParams(feedback).then(response => {
         let data = response.data;
+        console.log(data);
         // 设置反馈id为当前tab导师反馈id
         this.feedbackId = data.id;
         // 刷新导师反馈内容
@@ -809,7 +814,7 @@ export default {
             }).then(response => {
               let data = response.data;
               this.feedbackId = data.id;
-              this.mentorId = data.id;
+              this.mentorId = data.mentorId;
               this.parentId = data.id;
               this.meetingDate = data.meetingDate;
               this.resetLastDay();