Merge remote-tracking branch 'origin/master'

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

@@ -732,11 +732,9 @@ export default {
         // 设置父节点id
         feedback.parentId = this.parentId;
       }
-      console.log(feedback);
       // 根据标签页导师id获取反馈id
       getFeedbackByParams(feedback).then(response => {
         let data = response.data;
-        console.log(data);
         // 设置反馈id为当前tab导师反馈id
         this.feedbackId = data.id;
         // 刷新导师反馈内容
@@ -779,8 +777,7 @@ export default {
         this.staffId = response.data;
         // 判断当前用户是否为导师
         return isMentor();
-      })
-      .then(response => {
+      }).then(response => {
         this.isMentor = response.data;
         if (this.isMentor) {  // 当前用户是导师
           // ====================获取导师下拉列表====================
@@ -806,12 +803,27 @@ export default {
               }
               this.successorOptions.push( { key: data[i].staffId, value: data[i].staffName } );
             }
+            // ====================获取当前导师作为受邀导师的学员列表====================
+            return listInvitedSuccessor(null);
+          })
+          .then(response => {
+            let data = response.data;
+            for (let i = 0; i < data.length; i++) {
+              this.successorOptions.push( { key: data[i].successorId, value: data[i].successorName } );
+            }
+            if (this.successorOptions.length != 0) {
+              // 默认选中列表中第一个学员
+              this.queryParams.successorId = this.successorOptions[0].key;
+              this.getList();
+            }
             // 获取当前学员当年当季度反馈id
-            getFeedbackByParams({
+            return getFeedbackByParams({
               successorId: this.queryParams.successorId,
               feedbackYear: this.queryParams.feedbackYear,
               feedbackSeason: this.queryParams.feedbackSeason
-            }).then(response => {
+            });
+          })
+          .then(response => {
               let data = response.data;
               this.feedbackId = data.id;
               this.mentorId = data.mentorId;
@@ -851,14 +863,6 @@ export default {
                 }
               window.scrollTo(0, 0);
               });
-            });
-          });
-          // ====================获取当前导师作为受邀导师的学员列表====================
-          listInvitedSuccessor(null).then(response => {
-            let data = response.data;
-            for (let i = 0; i < data.length; i++) {
-              this.successorOptions.push( { key: data[i].successorId, value: data[i].successorName } );
-            }
           });
         } else {  // 当前用户是学员
           this.queryParams.successorId = this.staffId;
@@ -901,6 +905,14 @@ export default {
       }
       return isEmpty;
     },
+    /** 邀请表格判空 */
+    isInvitationFormEmpty() {
+      if (this.meetingDate == "" || this.mentorOptionsArray.length == 0) {
+        return true;
+      } else {
+        return false;
+      }
+    },
     /** 计算导师评分 */
     calcFeedbackScore() {
       let mentorFeedbackScore = 0; // 本导师评分
@@ -1198,6 +1210,10 @@ export default {
     },
     /** 邀请导师 */
     handleInvite() {
+      if (this.isInvitationFormEmpty()) {
+        this.$message.error('会议日期和受邀导师导师不能为空')
+        return;
+      }
       let updateParams = {};
       updateParams.id = this.feedbackId;
       let date = new Date(this.meetingDate);