王子文 专项培训

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

@@ -73,8 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and extract(year from d.start_date) = #{feedbackYear}
             </if>
             <if test="feedbackSeason != null  and feedbackSeason != ''">
-                and (extract(month from d.start_date) + 2) / 3 &lt;= #{feedbackSeason}
-                and (extract(month from d.end_date) + 2) / 3 &gt;= #{feedbackSeason}
+                and floor((extract(month from d.start_date) + 2) / 3) &lt;= #{feedbackSeason}
+                and floor((extract(month from d.end_date) + 2) / 3) &gt;= #{feedbackSeason}
             </if>
             and d.del_flag = 0
             <!-- 数据范围过滤 -->

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

@@ -56,8 +56,12 @@
           <el-table-column label="开始日期" align="center" :show-overflow-tooltip="true" width="120" prop="startDate"/>
           <el-table-column label="结束日期" align="center" :show-overflow-tooltip="true" width="120" prop="endDate"/>
           <el-table-column label="实际完成日期" align="center" :show-overflow-tooltip="true" width="120" prop="dateOfCompletion"/>
-          <el-table-column label="学习状态" align="center" :show-overflow-tooltip="true" width="120" prop="studyStatus"/>
-          <el-table-column label="学员反馈" align="center" prop="successorFeedback" :show-overflow-tooltip="true"/>
+          <el-table-column label="学习状态" align="center" :show-overflow-tooltip="true" width="120" prop="studyState"/>
+          <el-table-column label="学员反馈" align="center" prop="successorFeedback" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{scope.row.feecbackStatus ? scope.row.successorFeedback : ""}}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="导师反馈" align="center" prop="mentorFeedback" :show-overflow-tooltip="true"/>
           <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
             <template slot-scope="scope">
@@ -140,7 +144,7 @@
         </el-form>
         <!-- 列表 -->
         <el-table
-          :span-method="spanMethod" 
+          :span-method="spanMethod2" 
           v-loading="loading" 
           :data="feedbackListSeasonal" 
           @selection-change="handleSelectionChange" 
@@ -158,8 +162,7 @@
           <el-table-column label="开始日期" align="center" :show-overflow-tooltip="true" width="120" prop="startDate"/>
           <el-table-column label="结束日期" align="center" :show-overflow-tooltip="true" width="120" prop="endDate"/>
           <el-table-column label="实际完成日期" align="center" :show-overflow-tooltip="true" width="120" prop="dateOfCompletion"/>
-          <el-table-column label="学习状态" align="center" :show-overflow-tooltip="true" width="120" prop="studyStatus"/>
-          <el-table-column label="学员反馈" align="center" prop="successorFeedback" :show-overflow-tooltip="true"/>
+          <el-table-column label="学习状态" align="center" :show-overflow-tooltip="true" width="120" prop="studyState"/>
           <el-table-column label="导师反馈" align="center" prop="mentorFeedback" :show-overflow-tooltip="true"/>
           <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
             <template slot-scope="scope">
@@ -167,7 +170,7 @@
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
+                @click="handleUpdate2(scope.row)"
                 v-hasPermi="['spec:feedback:edit']"
                 v-if="scope.row.mentorFeedback==null"
               >反馈</el-button>
@@ -175,7 +178,7 @@
                 size="mini"
                 type="text"
                 icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
+                @click="handleUpdate2(scope.row)"
                 v-hasPermi="['spec:feedback:edit']"
                 v-if="scope.row.mentorFeedback!=null"
               >修改</el-button>
@@ -191,8 +194,18 @@
           @pagination="getList"
         /> -->
         <!-- 添加或修改对话框 -->
-        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-          <el-form ref="form" :model="form" :rules="rules">
+        <el-dialog :title="title2" :visible.sync="open2" width="500px" append-to-body>
+          <!-- <el-row>
+            <span>问卷调查问题</span>
+          </el-row>
+          <el-row>
+            <el-checkbox v-model="checked">备选项</el-checkbox>
+            <el-checkbox v-model="checked">备选项</el-checkbox>
+            <el-checkbox v-model="checked">备选项</el-checkbox>
+            <el-checkbox v-model="checked">备选项</el-checkbox>
+            <el-checkbox v-model="checked">备选项</el-checkbox>
+          </el-row> -->
+          <el-form ref="form" :model="form2" :rules="rules">
             <el-form-item prop="successorFeedback">
               <el-input type="textarea" rows="6" v-model="form.mentorFeedback" placeholder="请输入反馈内容" />
             </el-form-item>
@@ -267,6 +280,7 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      checked:false,
       // 标签页选中项
       activeName: 'first',
       // 遮罩层
@@ -287,6 +301,7 @@ export default {
       feedbackListSeasonal: [],
       // 弹出层标题
       title: "",
+      title2: "",
       // 部门树选项
       deptOptions: undefined,
       clientHeight:300,
@@ -356,6 +371,7 @@ export default {
         file: "",
         // 是否显示弹出层（报告附件）
         open: false,
+        open2: false,
         // 弹出层标题（报告附件）
         title: "",
         // 是否禁用上传
@@ -567,7 +583,6 @@ export default {
                 }
           }
         }
-        console.log(dataList);
         this.feedbackListSeasonal = dataList;
         this.total = response.total;
         this.$nextTick(() => {
@@ -710,7 +725,16 @@ export default {
       getFeedback(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "导师反馈（" + row.successorId + " " + row.feedbackYear + "年" + row.feedbackMonth + "月）";
+        this.title = "导师反馈（" + row.feedbackYear + "年" + row.feedbackMonth + "月）";
+      });
+    },
+    handleUpdate2(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getFeedback(id).then(response => {
+        this.form2 = response.data;
+        this.open2 = true;
+        this.title2 = "导师反馈（" + row.feedbackYear + "年" + row.feedbackSeason + "季度）";
       });
     },
     /** 提交操作 */