王子文 专项培养

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

@@ -66,6 +66,7 @@
           type="year"
           size="small"
           @keyup.enter.native="handleQuery"
+          @change="yearFormateter"
           style="width:200px"
         />
       </el-form-item>
@@ -781,10 +782,12 @@ export default {
           listMentors2().then(response => {
             let mentorList = response.data;
             for (let i = 0; i < mentorList.length; i++) {
-              let mentor = {};
-              mentor.key = mentorList[i].staffid;
-              mentor.value = mentorList[i].name;
-              this.mentorOptions.push(mentor);
+              if (mentorList[i].staffid!=this.staffId) {
+                let mentor = {};
+                mentor.key = mentorList[i].staffid;
+                mentor.value = mentorList[i].name;
+                this.mentorOptions.push(mentor);
+              }
             }
           });
           // ====================获取当前导师的学员列表====================
@@ -1196,17 +1199,19 @@ export default {
                 feedbackSeason: this.queryParams.feedbackSeason,
               }).then(response => {
                 let data = response.data;
-                // 初始化导师标签页
-                this.mentorTabs = [];
-                this.activeName = data.mentorId;
-                this.mentorTabs.push({ name: data.mentorId, title: data.mentorName});
+                let firstMentor = {};
+                firstMentor.name = data.mentorId;
+                firstMentor.title = data.mentorName;
                 listFeedback( { parentId: data.id } ).then(response => {
                   let data = response.rows;
+                  let mentorTabsTemp = [];
+                  this.mentorTabs = [];
+                  this.activeName = firstMentor.name;
+                  mentorTabsTemp.push(firstMentor);
                   for (let i = 0; i < data.length; i++) {
-                    this.mentorTabs.push({ name: data[i].mentorId, title: data[i].mentorName});
+                    mentorTabsTemp.push({ name: data[i].mentorId, title: data[i].mentorName});
                   }
-                  let set = new Set(this.mentorTabs);
-                  this.mentorTabs = Array.from(set);
+                  this.mentorTabs = mentorTabsTemp;
                 });
               });
             });
@@ -1252,11 +1257,14 @@ export default {
       };
       this.resetForm("form");
     },
+    yearFormateter() {
+      this.isFirstSearch = false;
+    },
     /** 搜索按钮操作 */
     handleQuery() {
+      this.queryParams.feedbackYear = this.queryParams.feedbackYearTemp;
       if (this.isFirstSearch) {
         this.queryParams.feedbackYear = this.queryParams.feedbackYearTemp;
-        this.isFirstSearch = false;
       } else {
         this.queryParams.feedbackYear = this.queryParams.feedbackYearTemp.getFullYear();
       }
@@ -1292,6 +1300,7 @@ export default {
         this.meetingDate = data.meetingDate;
         this.resetLastDay();
         this.mentorFeedback = data.mentorFeedback;
+        window.scrollTo(0, 0);
         // 刷新汇报附件
         this.initFileList(data.id);
         // 初始化导师标签页
@@ -1323,9 +1332,10 @@ export default {
           if (data[i].questionId == "15") { this.radio12 = data[i].answer; }
           if (data[i].questionId == "16") { this.radio13 = data[i].answer; }
           if (data[i].questionId == "17") { this.radio14 = data[i].answer; }
+          
         }
+        window.scrollTo(0, 0);
       });
-      
     },
     /** 重置按钮操作 */
     resetQuery() {