Merge remote-tracking branch 'origin/release' into release

src/views/ecw/deptTarget/allAchievement.vue

@@ -59,7 +59,7 @@
             </el-select>
           </el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
-        <el-button type="primary" icon="el-icon-search" @click="resetQuery">{{$t('重置')}}</el-button>
+        <el-button  @click="resetQuery">{{$t('重置')}}</el-button>
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportDetail" :loading="exportLoading" v-hasPermi="['ecw:achievement:export']">{{ $t('导出明细') }}</el-button>
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportStatistics" :loading="exportLoading" v-hasPermi="['ecw:achievement:export']">{{ $t('导出统计') }}</el-button>
 <!--        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
@@ -350,7 +350,11 @@
                 this.dateRangeCreateTime = [];
                 this.dateRangeStartTime = [];
                 this.dateRangeEndTime = [];
-                this.resetForm("queryForm");
+                this.resetForm("queryParams");
+                this.queryParams = {
+                pageNo: 1,
+                pageSize: 10
+               }
                 this.handleQuery();
             },
             /** 新增按钮操作 */