王子文 专项培训

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="queryForm2" :inline="true" v-show="showSearch">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
           <el-form-item label="年" prop="feedbackYear"  label-width="35px">
             <el-input
-              v-model="queryParams2.feedbackYear"
+              v-model="queryParams.feedbackYear"
               placeholder="请输入年"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery2"
+              @keyup.enter.native="handleQuery"
             />
           </el-form-item>
           <el-form-item label="月" prop="feedbackMonth"  label-width="35px">
             <el-input
-              v-model="queryParams2.feedbackMonth"
+              v-model="queryParams.feedbackMonth"
               placeholder="请输入月"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery2"
+              @keyup.enter.native="handleQuery"
             />
           </el-form-item>
           <el-form-item label="学员编号" prop="successorId" label-width="80px">
             <el-input
-              v-model="queryParams2.successorId"
+              v-model="queryParams.successorId"
               placeholder="请输入学员编号"
               clearable
               size="small"
-              @keyup.enter.native="handleQuery2"
+              @keyup.enter.native="handleQuery"
             />
           </el-form-item>
           <el-form-item>
-            <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-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-form-item>
         </el-form>
         <!-- 列表 -->
@@ -103,39 +103,39 @@
       </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"  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="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 label="学员编号" prop="feedbackMonth" 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>
         <!-- 列表 -->
@@ -149,7 +149,7 @@
           border
         >
           <el-table-column label="学员编号" align="center" :show-overflow-tooltip="true" prop="successorId"/>
-          <el-table-column label="时间" align="center" :show-overflow-tooltip="true" width="120">
+          <el-table-column label="时间" align="center" :show-overflow-tooltip="true" width="200">
             <template slot-scope="scope">
               <span>{{scope.row.feedbackYear}}年{{scope.row.feedbackSeason}}季度</span>
             </template>
@@ -202,55 +202,55 @@
             <el-button @click="cancel">取 消</el-button>
           </div>
         </el-dialog>
-      </el-tab-pane>
-      <el-tab-pane label="受邀反馈"></el-tab-pane>
-      <!-- 报告附件对话框 -->
+        <!-- 报告附件对话框 -->
         <el-dialog v-dialogDrag :title="doc.title" :visible.sync="doc.open" width="700px" append-to-body>
-          <el-table :data="doc.commonfileList" border>
-            <el-table-column :label="$t('文件名')" align="center" prop="fileName" :show-overflow-tooltip="true">
-              <template slot-scope="scope">
-                <a  class="link-type"  @click="handleDownload(scope.row)">
-                  <span>{{ scope.row.fileName }}</span>
-                </a>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('大小(Kb)')" align="center" prop="fileSize" :show-overflow-tooltip="true" width="80" />
-            <el-table-column :label="$t('上传人')" align="center" prop="creator" :show-overflow-tooltip="true" width="120"/>
-            <el-table-column :label="$t('操作')" align="center" width="120" class-name="small-padding fixed-width">
-              <template slot-scope="scope">
-                <el-button
-                  v-if="scope.row.fileName.endsWith('pdf')"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-view"
-                  @click="handleSee(scope.row)"
-                >{{ $t('预览') }}</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-download"
-                  @click="handleDownload(scope.row)"
-                >{{ $t('下载') }}</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDeleteDoc(scope.row)"
-                >{{ $t('删除') }}</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-dialog v-dialogDrag :title="pdf.title" :visible.sync="pdf.open" width="1300px" append-to-body>
-            <div style="margin-top: -60px;float: right;margin-right: 40px;">
-              <el-button size="mini" type="text" @click="openPdf">{{$t('新页面打开PDF')}}</el-button></div>
-            <div style="margin-top: -30px">
-              <iframe :src="pdf.pdfUrl" frameborder="0" width="100%" height="700px"></iframe>
+            <el-table :data="doc.commonfileList" border>
+              <el-table-column :label="$t('文件名')" align="center" prop="fileName" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  <a  class="link-type"  @click="handleDownload(scope.row)">
+                    <span>{{ scope.row.fileName }}</span>
+                  </a>
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('大小(Kb)')" align="center" prop="fileSize" :show-overflow-tooltip="true" width="80" />
+              <el-table-column :label="$t('上传人')" align="center" prop="creator" :show-overflow-tooltip="true" width="120"/>
+              <el-table-column :label="$t('操作')" align="center" width="120" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                  <el-button
+                    v-if="scope.row.fileName.endsWith('pdf')"
+                    size="mini"
+                    type="text"
+                    icon="el-icon-view"
+                    @click="handleSee(scope.row)"
+                  >{{ $t('预览') }}</el-button>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-download"
+                    @click="handleDownload(scope.row)"
+                  >{{ $t('下载') }}</el-button>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-delete"
+                    @click="handleDeleteDoc(scope.row)"
+                  >{{ $t('删除') }}</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            <el-dialog v-dialogDrag :title="pdf.title" :visible.sync="pdf.open" width="1300px" append-to-body>
+              <div style="margin-top: -60px;float: right;margin-right: 40px;">
+                <el-button size="mini" type="text" @click="openPdf">{{$t('新页面打开PDF')}}</el-button></div>
+              <div style="margin-top: -30px">
+                <iframe :src="pdf.pdfUrl" frameborder="0" width="100%" height="700px"></iframe>
+              </div>
+            </el-dialog>
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="doc.open = false">{{ $t('返 回') }}</el-button>
             </div>
-          </el-dialog>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="doc.open = false">{{ $t('返 回') }}</el-button>
-          </div>
         </el-dialog>
+      </el-tab-pane>
+      <el-tab-pane label="受邀反馈"></el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -325,8 +325,26 @@ export default {
         feedbackStatus: null,
         meetingDate: null
       },
+      queryParams2: {
+        pageNum: 1,
+        pageSize: 1000,
+        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: {
       },
@@ -417,7 +435,6 @@ export default {
         }
       }
     },
-    // 合并单元格
     spanMethod2({ row, column, rowIndex, columnIndex }) {
       // 按月合并单元格
       if (columnIndex === 1 || columnIndex === 7 || columnIndex === 8 || columnIndex === 9) {
@@ -453,6 +470,10 @@ export default {
       // 保留检索条件
       this.getList(this.form);
     },
+    refresh2() {
+      // 保留检索条件
+      this.getListSeasonal(this.form2);
+    },
     // 标签页切换
     handleClick(tab, event) {
         console.log(tab, event);
@@ -633,16 +654,43 @@ export default {
       };
       this.resetForm("form");
     },
+    reset2() {
+      this.form2 = {
+        id: null,
+        feedbackType: null,
+        mentorId: null,
+        successorId: null,
+        parentId: null,
+        planId: null,
+        feedbackYear: null,
+        feedbackSeason: null,
+        feedbackMonth: null,
+        successorFeedback: null,
+        mentorFeedback: null,
+        feedbackScore: null,
+        feedbackStatus: 0,
+        meetingDate: null
+      };
+      this.resetForm("form2");
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       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)