JXDS18FUJT 2 лет назад
Родитель
Сommit
81876da0c1
2 измененных файлов с 12 добавлено и 8 удалено
  1. 8 4
      src/views/tool/report/index.vue
  2. 4 4
      src/views/tool/reportDetail/index.vue

+ 8 - 4
src/views/tool/report/index.vue

@@ -8,13 +8,13 @@
                 </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 日"
+                <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 日"
+                <el-date-picker v-model="queryParams.endTime" type="date" placeholder="默认是当前月份最后一天" format="yyyy 年 MM 月 dd 日"
                     value-format="yyyyMMdd">
                 </el-date-picker>
 
@@ -85,7 +85,7 @@
                 <template slot-scope="scope">
 
 
-                    <router-link class="link-text" :to="'/tool/reportDetail?school='+scope.row.school+'&startTime='+(queryParams.startTime||'')+'&endTime='+(queryParams.endTime||'')+'&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">
                         {{ scope.row.schoolName }}
                     </router-link>
 
@@ -139,11 +139,15 @@
 
 <script>
 import { getList, getError, refundOrder, delError, addError, updateError, exportError } from "@/api/tool/report";
-
+let date = new Date()
+let defaultStartTime =`${date.getFullYear()}${date.getMonth()+1<10?'0'+(date.getMonth()+1):date.getMonth()+1}01`
+let defaultEndTime =`${date.getFullYear()}${date.getMonth()+1<10?'0'+(date.getMonth()+1):date.getMonth()+1}${ new Date(date.getFullYear(),date.getMonth()+1,0).getDate()}`;
 export default {
     name: "Error",
     data() {
         return {
+            defaultStartTime:defaultStartTime,
+            defaultEndTime:defaultEndTime,
             // 遮罩层
             loading: true,
             // 选中数组

+ 4 - 4
src/views/tool/reportDetail/index.vue

@@ -8,13 +8,13 @@
                 </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 日"
+                <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 日"
+                <el-date-picker v-model="queryParams.endTime" type="date" placeholder="默认是当前月份最后一天" format="yyyy 年 MM 月 dd 日"
                     value-format="yyyyMMdd">
                 </el-date-picker>
 
@@ -88,7 +88,7 @@
                 </template>
             </el-table-column>
             <el-table-column label="商品名" align="center" prop="goodsName"></el-table-column>
-            <el-table-column label="流水号" align="center" prop="outTradeNo"></el-table-column>
+            <el-table-column label="订单流水号" align="center" prop="outTradeNo"></el-table-column>
             <el-table-column label="手机类型" align="center" prop="goodsName">
                 <template slot-scope="scope">{{ scope.row.phoneType == 1 ? '苹果' : '安卓' }}</template>
             </el-table-column>
@@ -143,7 +143,7 @@
 import { getList } from "@/api/tool/reportDetail";
 
 export default {
-    name: "Error",
+    name: "reportDetail",
     data() {
         return {
             // 遮罩层