Merge branch 'master' into dev

@@ -25,7 +25,8 @@
           <el-col :span="6">
           <el-col :span="6">
             <el-form-item label="至" prop="receiveEndTime" label-width="35px">
             <el-form-item label="至" prop="receiveEndTime" label-width="35px">
               <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
               <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
-                clearable v-model="form.receiveEndTime" value-format="yyyy/MM/dd HH:mm:ss" @change="endTimeChange"></el-date-picker>
+                clearable v-model="form.receiveEndTime" value-format="yyyy/MM/dd HH:mm:ss"
+                @change="endTimeChange"></el-date-picker>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="6">
           <el-col :span="6">
@@ -108,7 +109,7 @@ import { getReceiveDataReportPage } from "@/api/dataReport.js";
 // 引入详情弹框
 // 引入详情弹框
 import dataDetails from "@/components/EditDialog";
 import dataDetails from "@/components/EditDialog";
 //引入日期处理方法
 //引入日期处理方法
-import {timeFormat } from "@/utils/operation";
+import { timeFormat } from "@/utils/operation";
 export default {
 export default {
   name: "jsbwcx",
   name: "jsbwcx",
   mixins: [tableMixin],
   mixins: [tableMixin],
@@ -124,7 +125,7 @@ export default {
           if (endDateVal) {
           if (endDateVal) {
             return (
             return (
               time.getTime() >=
               time.getTime() >=
-              new Date(endDateVal).getTime() 
+              new Date(endDateVal).getTime()
             );
             );
           }
           }
         },
         },
@@ -216,8 +217,8 @@ export default {
   },
   },
   methods: {
   methods: {
     //截止日期变化
     //截止日期变化
-    endTimeChange(val){
-      this.form.receiveEndTime = timeFormat(new Date(val),true)
+    endTimeChange (val) {
+      this.form.receiveEndTime = timeFormat(new Date(val), true)
     },
     },
     // 初始化数据
     // 初始化数据
     queryClick () {
     queryClick () {
@@ -239,7 +240,6 @@ export default {
       this.queryClick();
       this.queryClick();
     },
     },
     featchData () {
     featchData () {
-      this.form.currentPage = 1
       this.queryClick();
       this.queryClick();
     },
     },
     // 结果
     // 结果