王子文 专项培养 季度回顾

1) 学员下拉列表
2) 搜索条件默认为下拉列表第一个学员、当年、当季度

ui/src/api/training/spec/plan.js

@@ -1,5 +1,14 @@
 import request from '@/utils/request'
 
+// 根据导师ID查询学员列表
+export function getSuccessorListByMentorId(data) {
+  return request({
+    url: '/spec/plan/getSuccessorListByMentorId',
+    method: 'get',
+    params: data
+  })
+}
+
 // 根据MENTOR_STAFF_ID查询培训计划列表
 export function listPlanByMentorId(query) {
   return request({

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

@@ -2,14 +2,19 @@
   <div class="app-container">
     <!-- 搜索栏 -->
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="学员姓名" prop="successorName">
-        <el-input
-          v-model="queryParams.successorName"
-          placeholder="请输入学员姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="学员" prop="staffId">
+        <el-select 
+          v-model="queryParams.successorId" 
+          placeholder="请选择学员"
+          @change="someMethod()"
+        >
+          <el-option
+            v-for="successor in this.successorOptions"
+            :key="successor.key"
+            :label="successor.value"
+            :value="successor.key"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="年" prop="feedbackYear">
         <el-date-picker
@@ -30,22 +35,18 @@
           @keyup.enter.native="handleQuery"
         >
           <el-option
-            key="1"
             label="第一季度"
             value="1">
           </el-option>
           <el-option
-            key="2"
             label="第二季度"
             value="2">
           </el-option>
           <el-option
-            key="3"
             label="第三季度"
             value="3">
           </el-option>
           <el-option
-            key="4"
             label="第四季度"
             value="4">
           </el-option>
@@ -57,7 +58,7 @@
       </el-form-item>
     </el-form>
     <!-- 标签页：后期改成每个导师生成独立标签页 -->
-    <el-tabs type="border-card">
+    <el-tabs type="border-card" id="border-card">
       <el-tab-pane label="居海波">
         <el-table
           :span-method="spanMethod"
@@ -101,13 +102,8 @@
               :on-progress="handleFileDocProgress"
               :on-success="handleFileDocSuccess"
               :auto-upload="true"
-              :on-preview="handlePreview"
-              :on-remove="handleRemove"
-              :before-remove="beforeRemove"
               multiple
-              :limit="3"
-              :on-exceed="handleExceed"
-              :file-list="fileList">
+              :limit="3">
               <el-button size="small" type="primary" style="margin-bottom:10px;">点击上传汇报展示PPT</el-button>
             </el-upload>
           <el-table :data="doc.commonfileList" border style="width:50%;">
@@ -340,6 +336,7 @@
 </template>
 
 <script>
+import {listSuccessorsByMentorId} from "@/api/training/spec/plan";
 import { listFeedback } from "@/api/training/spec/feedback";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
@@ -347,13 +344,22 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Editor from '@/components/Editor';
 
 export default {
-  name: "Feedback",
+  name: "SeasonalFeedback",
   components: { Treeselect, Editor },
   data() {
     return {
-      mentorFeedback: "<p>此处稍有不足，请重新学习<br/><img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIkAAAAjCAYAAACgoylBAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAUcSURBVHhe7VpBixxFFO5f5JznLioJcQ+2oEkuanYirCYq2rjJogEJUYlDENnJTfRg/sDOCIqgKwmKScDticRJrh4CCrkYkKDP+qq6el5VV3f1jN0zk7E++EhPvXqvq977+lXPbCJqGB/f+oMupr/nPPTiq7Q9/NEYswmfAkY9iqJIsEejbEhhRD0x3u1Pss8aajzqZbMnfepGXVLTYNPXwIT63YjUVOWn3YBRT8Tp9sUsARmHrcH4DF9+XXIP7EXHc0KtwdiT3D+PXbY3TGW+hfXxvak1Va+liAWI5BXa3vvBGLPpFEmGSb+rxKJ3WppwV5Gyz7ngTMrEuuLxsboimfUeHE67LeSSvQmUisS3t5poXCSf371vCODEpU/p2eQ9+uDmb8Y4J3yqwZ6I0k16RFKWGF8iZxFJafLttVlw+nIhrJlIrt57YAjgw5/v0ealz+jIy2/QxlZCz525YNhB+BjARqc9UoAnCde8hY6oLw1VibR9xEiPF7qiJcukT+OqzuYQSSEOv4f24+sTEAVTxVW+eaEBo5iwl+0NU0tEUliTtbeaaFwkfz78u3DkVBFz4WMjP2Yy8uSrRGgbT0h5Ik0fKx4KktuET9982vhauqLwzk4CVN0DMO4jaC5CFnRqZ3GlbR6RCBhrKu6tDhoXCTC5/xd9lPqFgjmYG7BArMJxo4HiV3UU2IJA2gY6jt2RrGOtBloTCfDg4T/yfQMvphAFiGuMwRawAFhH4KwCAVoVScB6IIgkwIsgkgAvovF4TIGBVQwiCfQyiCTQyyCSQC9bFcmNg1t05afbdPHahM59f0cS1xiDzeUTuHpsTSRf3viF3t2f0Nn9O07Chjku32UzHSbUiTqUDFOnfRlM0yElHfWD2DPn3lro+loRCYq/s3/XKQ5OzCkTSpoOKGa/FMaDxRXsv4jEXncUD5zzZuUw6eSxFi3ixkVy/WBc2UFsYi58eAydaC0M9RTFNEgXJxRN/QTXEWk6iAuCxlgnGRrz5uEgjhqJMw8bFwneN7gIznz3Kx17/zI9+dIpOnzyTXr69I5hB+HDY8gnpZPQcAmisFlXJLawm+ZaiQQvplwAxy5cpo3Xdujtb8bGOCd8eAxfwu2WzpPnsqn2PO1E/PNUBJmfEOfeHs78mHYPzFjRY5u0KeYa90P3gE/2b5Ww7bVFfE3SJo6QRHUjUN8HAuE+u9n6TF9tz2I0+JA1LhL7qHn8+EnauvK1MWYTPnYc3bp5IuW4TmZ2HvMnXSfLfuLqiMQomFNEmc0SAwoo7+0RiWttao/6PlmhS947eCcx16f88vXp/TxaIunR1hdfGWM2XSLRlC9sPHm5eEwigWWFqiMS3rUqRcJEqq6zeT6ROOw8No87tdUQiSuuZy2zsvXj5vnzn9CRU2dnOm5s8qelKgFltiZFAkK4KJjxjcMqss1ykXDB/U9EYr+4bn97m46e36UnXtiip06cpo3X3zHsoPPFlX115AnkgtH2QawLatrwOUGHkUmdJlx1p/lFIu3i21bMigiquOYYCia7XLY2XWht08Xke5S2uiIp7Fmtd6VF0sRXYDA/ZjIWi1jHphJpx+sIUdXtJIYvSzyK5iqELHx+f8GC2JmN3WNekUw/65jCZ9VfXMEmfkxbdfKirRpX/rjRRPGrOgpsj6pA7Cd5mVQdx+5IzQq4NZGA6/gHPnnMiCLw42nZNI+b5jtcqyIJXA8GkQR6GUQS6GX43/IBXgSRBHgRRBLgAdG/w/eQqkOct4wAAAAASUVORK5CYII='></p>",
-      // 表格参数
+      
+      successorOptions: [],
+      queryObject: {
+        mentorStaffId: ""
+      },
+
+
+      dataList: [],
       tableData: [],
+
+      // 导师反馈内容
+      mentorFeedback: "<p>此处稍有不足，请重新学习<br/><img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIkAAAAjCAYAAACgoylBAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAUcSURBVHhe7VpBixxFFO5f5JznLioJcQ+2oEkuanYirCYq2rjJogEJUYlDENnJTfRg/sDOCIqgKwmKScDticRJrh4CCrkYkKDP+qq6el5VV3f1jN0zk7E++EhPvXqvq977+lXPbCJqGB/f+oMupr/nPPTiq7Q9/NEYswmfAkY9iqJIsEejbEhhRD0x3u1Pss8aajzqZbMnfepGXVLTYNPXwIT63YjUVOWn3YBRT8Tp9sUsARmHrcH4DF9+XXIP7EXHc0KtwdiT3D+PXbY3TGW+hfXxvak1Va+liAWI5BXa3vvBGLPpFEmGSb+rxKJ3WppwV5Gyz7ngTMrEuuLxsboimfUeHE67LeSSvQmUisS3t5poXCSf371vCODEpU/p2eQ9+uDmb8Y4J3yqwZ6I0k16RFKWGF8iZxFJafLttVlw+nIhrJlIrt57YAjgw5/v0ealz+jIy2/QxlZCz525YNhB+BjARqc9UoAnCde8hY6oLw1VibR9xEiPF7qiJcukT+OqzuYQSSEOv4f24+sTEAVTxVW+eaEBo5iwl+0NU0tEUliTtbeaaFwkfz78u3DkVBFz4WMjP2Yy8uSrRGgbT0h5Ik0fKx4KktuET9982vhauqLwzk4CVN0DMO4jaC5CFnRqZ3GlbR6RCBhrKu6tDhoXCTC5/xd9lPqFgjmYG7BArMJxo4HiV3UU2IJA2gY6jt2RrGOtBloTCfDg4T/yfQMvphAFiGuMwRawAFhH4KwCAVoVScB6IIgkwIsgkgAvovF4TIGBVQwiCfQyiCTQyyCSQC9bFcmNg1t05afbdPHahM59f0cS1xiDzeUTuHpsTSRf3viF3t2f0Nn9O07Chjku32UzHSbUiTqUDFOnfRlM0yElHfWD2DPn3lro+loRCYq/s3/XKQ5OzCkTSpoOKGa/FMaDxRXsv4jEXncUD5zzZuUw6eSxFi3ixkVy/WBc2UFsYi58eAydaC0M9RTFNEgXJxRN/QTXEWk6iAuCxlgnGRrz5uEgjhqJMw8bFwneN7gIznz3Kx17/zI9+dIpOnzyTXr69I5hB+HDY8gnpZPQcAmisFlXJLawm+ZaiQQvplwAxy5cpo3Xdujtb8bGOCd8eAxfwu2WzpPnsqn2PO1E/PNUBJmfEOfeHs78mHYPzFjRY5u0KeYa90P3gE/2b5Ww7bVFfE3SJo6QRHUjUN8HAuE+u9n6TF9tz2I0+JA1LhL7qHn8+EnauvK1MWYTPnYc3bp5IuW4TmZ2HvMnXSfLfuLqiMQomFNEmc0SAwoo7+0RiWttao/6PlmhS947eCcx16f88vXp/TxaIunR1hdfGWM2XSLRlC9sPHm5eEwigWWFqiMS3rUqRcJEqq6zeT6ROOw8No87tdUQiSuuZy2zsvXj5vnzn9CRU2dnOm5s8qelKgFltiZFAkK4KJjxjcMqss1ykXDB/U9EYr+4bn97m46e36UnXtiip06cpo3X3zHsoPPFlX115AnkgtH2QawLatrwOUGHkUmdJlx1p/lFIu3i21bMigiquOYYCia7XLY2XWht08Xke5S2uiIp7Fmtd6VF0sRXYDA/ZjIWi1jHphJpx+sIUdXtJIYvSzyK5iqELHx+f8GC2JmN3WNekUw/65jCZ9VfXMEmfkxbdfKirRpX/rjRRPGrOgpsj6pA7Cd5mVQdx+5IzQq4NZGA6/gHPnnMiCLw42nZNI+b5jtcqyIJXA8GkQR6GUQS6GX43/IBXgSRBHgRRBLgAdG/w/eQqkOct4wAAAAASUVORK5CYII='></p>",
       // 反馈对话框参数
       feedbackDialog: {
         id: 0,
@@ -362,7 +368,7 @@ export default {
         // 弹出层标题（报告附件）
         title: ""
       },
-      dataList: [],
+      // 问卷单选框
       radio1: '',
       radio2: '',
       radio3: '',
@@ -439,15 +445,15 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 100,
         feedbackType: null,
         mentorId: null,
         successorId: null,
-        successorName: "李滕",
+        successorName: null,
         parentId: null,
         planId: null,
-        feedbackYear: '2022',
-        feedbackSeason: '第一季度',
+        feedbackYear: null,
+        feedbackSeason: null,
         feedbackMonth: null,
         successorFeedback: null,
         mentorFeedback: null,
@@ -469,43 +475,39 @@ export default {
     this.$nextTick(() => {
       this.clientHeight = document.body.clientHeight -250
     })
+    // 获取学员下拉列表
+    this.getSuccessorOptions();
+    // 获取当前日期
+    let date = new Date();
+    // 搜索条件默认为当年、当季度
+    this.queryParams.feedbackYear = date.getFullYear().toString();
+    this.queryParams.feedbackSeason = ( ( date.getMonth() + 2 ) / 3 ).toString();
+    // 获取计划列表
     this.getList();
-
-    let data1 = { isFirstLine:1, feedbackYear:"2022", feedbackMonth: "1", startDate:"2022-01-01", endDate:"2022-04-10", dateOfCompletion:"", studyState:"学习中", plantName:"英语学习（持续）" };
-    let data2 = { isFirstLine:0, feedbackYear:"2022", feedbackMonth: "1", startDate:"2022-01-01", endDate:"2022-06-06", dateOfCompletion:"", studyState:"学习中", plantName:"C560系统学习" };
-    let data3 = { isFirstLine:0, feedbackYear:"2022", feedbackMonth: "1", startDate:"2022-01-01", endDate:"2022-01-18", dateOfCompletion:"2022-02-01", studyState:"已完成", plantName:"C3加氢/V520、C530/540" };
-    let data4 = { isFirstLine:1, feedbackYear:"2022", feedbackMonth: "2", startDate:"2022-01-01", endDate:"2022-04-10", dateOfCompletion:"", studyState:"学习中", plantName:"英语学习（持续）" };
-    let data5 = { isFirstLine:0, feedbackYear:"2022", feedbackMonth: "2", startDate:"2022-01-01", endDate:"2022-06-06", dateOfCompletion:"", studyState:"学习中", plantName:"C560系统学习" };
-    let data6 = { isFirstLine:0, feedbackYear:"2022", feedbackMonth: "2", startDate:"2022-02-01", endDate:"2022-02-11", dateOfCompletion:"2022-02-10", studyState:"已完成", plantName:"C430系统" };
-    let data7 = { isFirstLine:1, feedbackYear:"2022", feedbackMonth: "3", startDate:"2022-03-01", endDate:"2022-03-04", dateOfCompletion:"2022-03-10", studyState:"已完成", plantName:"C440/K450" };
-    let data8 = { isFirstLine:0, feedbackYear:"2022", feedbackMonth: "3", startDate:"2022-01-01", endDate:"2022-04-10", dateOfCompletion:"", studyState:"学习中", plantName:"英语学习（持续）" };
-    let data9 = { isFirstLine:0, feedbackYear:"2022", feedbackMonth: "3", startDate:"2022-01-01", endDate:"2022-06-06", dateOfCompletion:"", studyState:"学习中", plantName:"C560系统学习" };
-
-    this.dataList.push(data1);
-    this.dataList.push(data2);
-    this.dataList.push(data3);
-    this.dataList.push(data4);
-    this.dataList.push(data5);
-    this.dataList.push(data6);
-    this.dataList.push(data7);
-    this.dataList.push(data8);
-    this.dataList.push(data9);
-
-    let answerObj1 = { id: 1, question: "我学到了什么？", answer: "丰富的英语知识"};
-    let answerObj2 = { id: 2, question: "理论学习和平时操作的不同之处？", answer: "很多不同"};
-    let answerObj3 = { id: 3, question: "完成此课程后有什么更好的合理化建议？", answer: "自己需要继续努力，加深学习"};
-
-    this.tableData.push(answerObj1);
-    this.tableData.push(answerObj2);
-    this.tableData.push(answerObj3);
   },
   methods: {
+    /** 查询学员下拉列表 */
+    getSuccessorOptions() {
+      listSuccessorsByMentorId(this.queryObject).then(response => {
+        let successorList = response.data;
+        for (let i = 0; i < successorList.length; i++) {
+          if (i == 0) {
+            // 默认选中列表中第一个学员
+            this.queryParams.successorId = successorList[i].staffId;
+          }
+          let successor = {};
+          successor.key = successorList[i].staffId;
+          successor.value = successorList[i].staffName;
+          this.successorOptions.push(successor);
+        }
+      });
+    },
     /** 反馈处理 */
     handleFeedback(row) {
       this.feedbackDialog.title = "李滕 " + row.plantName + " " + this.$t('学习情况');
       this.feedbackDialog.open = true;
     },
-    // 合并单元格
+    /** 合并单元格 */
     spanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {
         if (row.isFirstLine == 1) {
@@ -521,7 +523,7 @@ export default {
         }
       }
     },
-    // 单元格样式
+    /** 单元格样式 */
     tableCellStyle (row, column, rowIndex, columnIndex) {
       if (row.column.label === "实际完成日期" && row.row.dateOfCompletion > row.row.endDate) {
         return "background: #FFEEEE"
@@ -555,6 +557,11 @@ export default {
       this.$alert(response.msg, this.$t('导入结果'), { dangerouslyUseHTMLString: true });
       this.getFileList()
     },
+
+
+
+
+
     /** 查询专项培训反馈列表 */
     getList() {
       this.loading = true;