王子文 专项培养

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

@@ -430,6 +430,7 @@ export default {
     },
     /** 反馈处理 */
     handleFeedback(row) {
+      // 加载反馈附件
       this.docFeedback.id = row.id;
       this.docFeedback.queryParams.pId = row.id
       this.docFeedback.pId = row.id
@@ -437,9 +438,10 @@ export default {
       this.$nextTick(() => {
         this.$refs.docFeedback.clearFiles()
       })
-
-      this.feedbackParams = {};
+      // 清空导师反馈内容
       this.mentorFeedback = null;
+      // 清空答案
+      this.feedbackParams = {};
       let feedback1 = {};
       feedback1.planId = row.id;
       feedback1.questionId = 1;
@@ -449,6 +451,7 @@ export default {
       let feedback3 = {};
       feedback3.planId = row.id;
       feedback3.questionId = 3;
+      // 获取答案
       getAnswerByPlanIdAndQuestionId(feedback1).then(response => {
         let data = response.data;
         if (data != null) {
@@ -466,6 +469,7 @@ export default {
         if (data != null) {
           this.feedbackParams.answer3 = data.answer;
         }
+        // 获取导师反馈
         return getFeedbackByPlanId(row.id);
       }).then(response => {
         if (response.data != null) {
@@ -491,6 +495,7 @@ export default {
       feedback3.planId = this.feedbackDialog.planId;
       feedback3.questionId = 3;
       feedback3.answer = this.feedbackParams.answer3;
+      // 根据计划id和问题id获取答案，有则修改，无则新增
       getAnswerByPlanIdAndQuestionId(feedback1).then(response => {
         let data = response.data;
         if (data != null) {

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

@@ -501,7 +501,7 @@ import {getYearplan} from "@/api/training/spec/yearplan";
 import Editor from '@/components/Editor';
 
 export default {
-  name: "MyPlan",
+  name: "Plan",
   components: { Treeselect, PlanApprove, Editor },
   data() {
     return {
@@ -797,9 +797,11 @@ export default {
     /** 通过处理 */
     handleApprove() {
       this.feedbackParams.planId = this.feedbackDialog.id;
+      // 导师反馈内容，有则修改，无则新增
       if (this.mentorFeedback == null) {
         addFeedback(this.feedbackParams).then(response => {
           // 后期需要发邮件通知学员
+
           this.feedbackDialog.open = false;
           // 修改学习状态为1已完成
           let plan = {};
@@ -815,9 +817,11 @@ export default {
       } else {
         updateFeedback(this.feedbackParams).then(response => {
           // 后期需要发邮件通知学员
+
           this.feedbackDialog.open = false;
           // 修改学习状态为1已完成
           let plan = {};
+          // 获取计划id(修改条件)
           plan.id = this.feedbackDialog.planId;
           plan.studyState = 1;
           plan.dateOfCompletion = new Date();
@@ -832,12 +836,15 @@ export default {
     /** 驳回处理 */
     handleReject() {
       this.feedbackParams.planId = this.feedbackDialog.id;
+      // 导师反馈内容：有则修改，无则新增
       if (this.mentorFeedback == null) {
         addFeedback(this.feedbackParams).then(response => {
           // 后期需要发邮件通知学员
+
           this.feedbackDialog.open = false;
         // 修改学习状态为3导师已反馈
           let plan = {};
+          // 获取计划id(修改条件)
           plan.id = this.feedbackDialog.planId;
           plan.studyState = 3;
           plan.dateOfCompletion = new Date();
@@ -850,6 +857,7 @@ export default {
       } else {
         updateFeedback(this.feedbackParams).then(response => {
           // 后期需要发邮件通知学员
+
           this.feedbackDialog.open = false;
         // 修改学习状态为3导师已反馈
           let plan = {};
@@ -866,6 +874,7 @@ export default {
     },
     /** 反馈处理 */
     handleFeedback(row) {
+      // 加载反馈附件
       this.docFeedback.id = row.id;
       this.docFeedback.queryParams.pId = row.id
       this.docFeedback.pId = row.id
@@ -873,8 +882,9 @@ export default {
       this.$nextTick(() => {
         this.$refs.docFeedback.clearFiles()
       })
-
+      // 清空导师反馈内容
       this.mentorFeedback = null;
+      // 清空表格数据
       this.tableData = [];
       let feedback1 = {};
       feedback1.planId = row.id;
@@ -888,6 +898,7 @@ export default {
       let answerObj1 = {};
       let answerObj2 = {};
       let answerObj3 = {};
+      // 获取问题和答案
       getAnswerByPlanIdAndQuestionId(feedback1).then(response => {
         let data = response.data;
         if (data != null) {
@@ -908,6 +919,7 @@ export default {
           this.tableData.push(answerObj2);
           this.tableData.push(answerObj3);
         }
+        // 获取导师反馈内容
         return getFeedbackByPlanId(row.id);
       }).then(response => {
         if (response.data != null) {
@@ -916,7 +928,6 @@ export default {
           this.feedbackParams.id = data.id;
         }
         this.feedbackDialog.title = row.staffName + row.plantName + "学习情况反馈";
-        this.feedbackDialog.id = row.id;
         this.feedbackDialog.planId = row.id;
         this.feedbackDialog.studyState = row.studyState;
         this.feedbackDialog.open = true;