新增默认时间和报表查全部的选项

src/views/tool/report/index.vue

@@ -25,15 +25,20 @@
             </el-form-item>
             <el-form-item label="是否合作" prop="isShare">
                 <el-select  v-model="queryParams.isShare">
+                    <el-option value="" key="3" label="全部"></el-option>
                     <el-option value="1" key="1" label="是"></el-option>
                     <el-option value="0" key="2" label="否"></el-option>
+            
+               
                 </el-select>
             </el-form-item>
             <el-form-item label="支付状态" prop="tradeType">
                 <el-select  v-model="queryParams.tradeType">
+                    <el-option value="" key="4" label="全部"></el-option>
                     <el-option value="1" key="1" label="支付成功">支付成功</el-option>
                     <el-option value="2" key="2" label="支付失败">支付失败</el-option>
                     <el-option value="3" key="3" label="已退款"></el-option>
+            
                 </el-select>
             </el-form-item>
             <!-- <el-form-item label="支付类型" prop="payType">
@@ -85,7 +90,7 @@
                 <template slot-scope="scope">
 
 
-                    <router-link class="link-text" :to="'/tool/reportDetail?school='+scope.row.school+'&startTime='+(queryParams.startTime||defaultStartTime)+'&endTime='+(queryParams.endTime||defaultEndTime)+'&schoolName='+scope.row.schoolName">
+                    <router-link class="link-text" :to="'/tool/reportDetail?school='+scope.row.school+'&startTime='+(queryParams.startTime||defaultStartTime)+'&endTime='+(queryParams.endTime||defaultEndTime)+'&schoolName='+scope.row.schoolName+'&isShare='+queryParams.isShare+'&tradeType='+queryParams.tradeType">
                         {{ scope.row.schoolName }}
                     </router-link>
 
@@ -171,8 +176,8 @@ export default {
                
                 pageNum: 1,
                 pageSize: 10,
-                tradeType:null,
-                isShare:null
+                tradeType:'',
+                isShare:''
                 // id: null,
                 // outRefundNo: null,
                 // payType: 1,
@@ -191,6 +196,8 @@ export default {
         };
     },
     created() {
+        this.queryParams.startTime = this.defaultStartTime
+        this.queryParams.endTime = this.defaultEndTime
         this.getList();
     },
     methods: {
@@ -216,8 +223,8 @@ export default {
                 endTime: null,
                 pageNum: 1,
                 pageSize: 10,
-                tradeType:null,
-                isShare:null
+                tradeType:'',
+                isShare:''
                 // id: null,
                 // outRefundNo: null,
                 // payType: 1,

src/views/tool/reportDetail/index.vue

@@ -8,14 +8,14 @@
                 </el-select>
             </el-form-item> -->
             <el-form-item label="开始时间" label-width="120px" prop="outTradeNo">
-                <el-date-picker v-model="queryParams.startTime" type="date" placeholder="默认是当前月份第一天" format="yyyy 年 MM 月 dd 日"
-                    value-format="yyyyMMdd">
+                <el-date-picker v-model="queryParams.startTime" type="date" placeholder="默认是当前月份第一天"
+                    format="yyyy 年 MM 月 dd 日" value-format="yyyyMMdd">
                 </el-date-picker>
 
             </el-form-item>
             <el-form-item label="结束时间" label-width="120px" prop="outTradeNo">
-                <el-date-picker v-model="queryParams.endTime" type="date" placeholder="默认是当前月份最后一天" format="yyyy 年 MM 月 dd 日"
-                    value-format="yyyyMMdd">
+                <el-date-picker v-model="queryParams.endTime" type="date" placeholder="默认是当前月份最后一天"
+                    format="yyyy 年 MM 月 dd 日" value-format="yyyyMMdd">
                 </el-date-picker>
 
             </el-form-item>
@@ -25,12 +25,14 @@
             </el-form-item>
             <el-form-item label="是否合作" prop="isShare">
                 <el-select v-model="queryParams.isShare">
+                    <el-option value="" key="3" label="全部"></el-option>
                     <el-option value="1" key="1" label="是"></el-option>
                     <el-option value="0" key="2" label="否"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="支付状态" prop="tradeType">
                 <el-select v-model="queryParams.tradeType">
+                    <el-option value="" key="4" label="全部"></el-option>
                     <el-option value="1" key="1" label="支付成功">支付成功</el-option>
                     <el-option value="2" key="2" label="支付失败">支付失败</el-option>
                     <el-option value="3" key="3" label="已退款"></el-option>
@@ -102,7 +104,7 @@
                     {{ scope.row.total / 100 }}元
                 </template>
             </el-table-column>
-           
+
             <el-table-column label="驾校提成" align="center" prop="schoolCommission">
                 <template slot-scope="scope">
                     {{ scope.row.schoolCommission / 100 }}元
@@ -172,8 +174,8 @@ export default {
 
                 pageNum: 1,
                 pageSize: 10,
-                tradeType: null,
-                isShare: null
+                tradeType: '',
+                isShare: ''
                 // id: null,
                 // outRefundNo: null,
                 // payType: 1,
@@ -195,6 +197,9 @@ export default {
         this.queryParams.schoolName = this.$route.query.schoolName || ''
         this.queryParams.startTime = this.$route.query.startTime || null
         this.queryParams.endTime = this.$route.query.endTime || null
+
+        this.queryParams.isShare = this.$route.query.isShare || ''
+        this.queryParams.tradeType = this.$route.query.tradeType || ''
         this.getList();
     },
     methods: {
@@ -220,8 +225,8 @@ export default {
                 endTime: null,
                 pageNum: 1,
                 pageSize: 10,
-                tradeType: null,
-                isShare: null
+                tradeType: '',
+                isShare: ''
                 // id: null,
                 // outRefundNo: null,
                 // payType: 1,