王子文 专项培养

1) 月度反馈、季度汇报页面删掉搜索按钮
2) bug fixed: 季度汇报页面年份控件日期取值问题

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

@@ -30,9 +30,9 @@
           style="width:200px"
         />
       </el-form-item>
-      <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-      </el-form-item>
+      <!--<el-form-item>-->
+        <!--<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
+      <!--</el-form-item>-->
     </el-form>
     <!-- 标签页 -->
     <el-tabs type="border-card" @tab-click="handleTabClick" v-model="activeMonth">

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

@@ -87,10 +87,10 @@
           <el-option label="第四季度" value="4"></el-option>
         </el-select>
       </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-form-item>
+      <!--<el-form-item>-->
+        <!--<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
+        <!--&lt;!&ndash; <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> &ndash;&gt;-->
+      <!--</el-form-item>-->
     </el-form>
     <!-- 标签页 -->
     <el-tabs type="border-card" @tab-click="handleTabClick" v-model="activeName">
@@ -1219,12 +1219,18 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.feedbackYear = this.queryParams.feedbackYearTemp;
-      if (this.isFirstSearch) {
+      // this.queryParams.feedbackYear = this.queryParams.feedbackYearTemp;
+      // if (this.isFirstSearch) {
+      //   this.queryParams.feedbackYear = this.queryParams.feedbackYearTemp;
+      // } else {
+      //   this.queryParams.feedbackYear = this.queryParams.feedbackYearTemp.getFullYear();
+      // }
+      if (typeof(this.queryParams.feedbackYearTemp) == 'string') {
         this.queryParams.feedbackYear = this.queryParams.feedbackYearTemp;
       } else {
         this.queryParams.feedbackYear = this.queryParams.feedbackYearTemp.getFullYear();
       }
+
       this.queryParams.pageNum = 1;
       this.getList();
       // 清空问卷