王子文 专项培养

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

@@ -120,6 +120,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="mentorStaffId != null  and mentorStaffId != ''"> and mentor_staff_id = #{mentorStaffId}</if>
             and d.del_flag = 0
         </where>
+        <!-- 王子文 2022年5月18日 09点46分 -->
+        <!-- 根据开始时间排序 -->
+        order by start_date
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>

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

@@ -369,9 +369,9 @@ export default {
       },
       // 反馈参数
       feedbackParams: {
-        answer1: null,
-        answer2: null,
-        answer3: null
+        answer1: "",
+        answer2: "",
+        answer3: ""
       },
       // 查询参数
       queryParams: {
@@ -441,7 +441,9 @@ export default {
       // 清空导师反馈内容
       this.mentorFeedback = null;
       // 清空答案
-      this.feedbackParams = {};
+      this.feedbackParams.answer1 = "";
+      this.feedbackParams.answer2 = "";
+      this.feedbackParams.answer3 = "";
       let feedback1 = {};
       feedback1.planId = row.id;
       feedback1.questionId = 1;
@@ -653,8 +655,12 @@ export default {
     },
     /** 附件上传成功处理 */
     handleFileDocSuccessFeedback(response, file, fileList) {
+      this.getFileListFeedback()
       this.docMentorFeedback.isUploading = false;
       this.$alert(response.msg, this.$t('导入结果'), { dangerouslyUseHTMLString: true });
+      this.docFeedback.id = row.id;
+      this.docFeedback.queryParams.pId = row.id
+      this.docFeedback.pId = row.id
       this.getFileListFeedback()
     },
     handleFileDocSuccessMentor(response, file, fileList) {

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

@@ -797,7 +797,7 @@ export default {
     },
     /** 通过处理 */
     handleApprove() {
-      this.feedbackParams.planId = this.feedbackDialog.id;
+      this.feedbackParams.planId = this.feedbackDialog.planId;
       // 导师反馈内容，有则修改，无则新增
       if (this.mentorFeedback == null) {
         addFeedback(this.feedbackParams).then(response => {
@@ -884,7 +884,7 @@ export default {
         this.$refs.docFeedback.clearFiles()
       })
       // 清空导师反馈内容
-      this.mentorFeedback = null;
+      this.feedbackParams.mentorFeedback = null;
       // 清空表格数据
       this.tableData = [];
       let feedback1 = {};