王子文 专项培训

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

@@ -3,38 +3,38 @@
     <el-tabs type="border-card">
       <el-tab-pane label="月度反馈">
         <!-- 搜索栏 -->
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+        <el-form :model="queryParams" ref="queryForm2" :inline="true" v-show="showSearch">
           <el-form-item label="年" prop="feedbackYear"  label-width="35px">
             <el-input
-              v-model="queryParams.feedbackYear"
+              v-model="queryParams2.feedbackYear"
               placeholder="请输入年"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery"
+              @keyup.enter.native="handleQuery2"
             />
           </el-form-item>
           <el-form-item label="月" prop="feedbackMonth"  label-width="35px">
             <el-input
-              v-model="queryParams.feedbackMonth"
+              v-model="queryParams2.feedbackMonth"
               placeholder="请输入月"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery"
+              @keyup.enter.native="handleQuery2"
             />
           </el-form-item>
-          <el-form-item label="学员编号" prop="feedbackMonth" label-width="80px">
+          <el-form-item label="学员编号" prop="successorId" label-width="80px">
             <el-input
-              v-model="queryParams.successorId"
+              v-model="queryParams2.successorId"
               placeholder="请输入学员编号"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery"
+              @keyup.enter.native="handleQuery2"
             />
           </el-form-item>
           <el-form-item>
-            <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="refresh()">刷新</el-button>
+            <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery2">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery2">重置</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="refresh2()">刷新</el-button>
           </el-form-item>
         </el-form>
         <!-- 列表 -->

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

@@ -109,7 +109,7 @@
           v-hasPermi="['spec:plan:export']"
         >导出</el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+	  <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="loading" ref="planTable" :data="planList" @selection-change="handleSelectionChange" :height="clientHeight" border :row-style="tableRowStyle">
@@ -513,7 +513,7 @@
 </template>
 
 <script>
-import { getFeedback} from "@/api/training/spec/feedback";
+import { getFeedback} from "@/api/training/spec/planfeedback";
 import { getPlan,listPlanByYearId, delPlan, addPlan, updatePlan, exportPlan, importTemplate, listSuccessorsByMentorId, listPlanByMentorId } from "@/api/training/spec/plan";
 import { allFileList, delCommonfile } from "@/api/common/commonfile";
 import { treeselect } from "@/api/system/dept";
@@ -789,6 +789,7 @@ export default {
       this.comment.open = true;
       getFeedback(row.id).then(response => {
         let feedbackObject = response.data;
+        console.log(feedbackObject);
         let data1 = { id: 1, question: feedbackObject.question1, answer: feedbackObject.answer1};
         let data2 = { id: 2, question: feedbackObject.question2, answer: feedbackObject.answer2};
         let data3 = { id: 3, question: feedbackObject.question3, answer: feedbackObject.answer3};

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

@@ -101,31 +101,31 @@
       </el-tab-pane>
       <el-tab-pane label="季度反馈">
         <!-- 搜索栏 -->
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+        <el-form :model="queryParams2" ref="queryForm2" :inline="true" v-show="showSearch">
           <el-form-item label="年" prop="feedbackYear">
             <el-input
-              v-model="queryParams.feedbackYear"
+              v-model="queryParams2.feedbackYear"
               placeholder="请输入年"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery"
+              @keyup.enter.native="handleQuery2"
               label-width="35px"
             />
           </el-form-item>
           <el-form-item label="季度" prop="feedbackSeason">
             <el-input
-              v-model="queryParams.feedbackSeason"
+              v-model="queryParams2.feedbackSeason"
               placeholder="请输入季度"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery"
+              @keyup.enter.native="handleQuery2"
               label-width="50px"
             />
           </el-form-item>
           <el-form-item>
-            <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="refresh()">刷新</el-button>
+            <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery2">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery2">重置</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="refresh2()">刷新</el-button>
           </el-form-item>
         </el-form>
         <!-- 列表 -->
@@ -307,8 +307,26 @@ export default {
         feedbackStatus: null,
         meetingDate: null
       },
+      queryParams2: {
+        pageNum: 1,
+        pageSize: 20,
+        feedbackType: null,
+        mentorId: null,
+        successorId: null,
+        parentId: null,
+        planId: null,
+        feedbackYear: null,
+        feedbackSeason: null,
+        feedbackMonth: null,
+        successorFeedback: null,
+        mentorFeedback: null,
+        feedbackScore: null,
+        feedbackStatus: null,
+        meetingDate: null
+      },
       // 表单参数
       form: {},
+      form2: {},
       // 表单校验
       rules: {
       },
@@ -386,6 +404,10 @@ export default {
       // 保留检索条件
       this.getList(this.form);
     },
+    refresh2() {
+      // 保留检索条件
+      this.getList(this.form2);
+    },
     // 标签页切换
     handleClick(tab, event) {
         console.log(tab, event);
@@ -423,7 +445,7 @@ export default {
     /** 查询专项培训季度反馈列表 */
     getListSeasonal() {
       this.loading = true;
-      listSuccessorSeasonalFeedback(this.queryParams).then(response => {
+      listSuccessorSeasonalFeedback(this.queryParams2).then(response => {
         let dataList = [];
         let responseRows = response.rows;
         for (let i = 0; i < responseRows.length; i++) {
@@ -533,11 +555,19 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
+    handleQuery2() {
+      this.queryParams2.pageNum = 1;
+      this.getListSeasonal();
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    resetQuery2() {
+      this.resetForm("queryForm2");
+      this.handleQuery2();
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)