Browse Source

报表增加搜索的条件

JXDS18FUJT 2 năm trước cách đây
mục cha
commit
cfd38a4d49
2 tập tin đã thay đổi với 70 bổ sung17 xóa
  1. 55 17
      src/views/tool/report/index.vue
  2. 15 0
      src/views/tool/reportDetail/index.vue

+ 55 - 17
src/views/tool/report/index.vue

@@ -7,22 +7,35 @@
                     <el-option :value="0" label="否"></el-option>
                 </el-select>
             </el-form-item> -->
-            <el-form-item label="开始时间"  label-width="120px" prop="outTradeNo">
+            <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>
-              
+
             </el-form-item>
-            <el-form-item label="结束时间"  label-width="120px" prop="outTradeNo">
+            <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>
-               
+
             </el-form-item>
             <el-form-item label="驾校名称" prop="schoolName">
                 <el-input v-model="queryParams.schoolName" placeholder="请输入驾校名称" clearable size="small"
                     @keyup.enter.native="handleQuery" />
             </el-form-item>
+            <el-form-item label="是否合作" prop="isShare">
+                <el-select  v-model="queryParams.isShare">
+                    <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="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">
                 <el-select v-model="queryParams.payType" placeholder="">
                     <el-option :value="1" label="微信"></el-option>
@@ -68,18 +81,29 @@
 
         <el-table v-loading="loading" :data="errorList" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="驾校名" align="center" prop="schoolName">
+                <template slot-scope="scope">
+
+
+                    <router-link class="link-text" to="/tool/reportDetail">
+                        {{ scope.row.schoolName }}
+                    </router-link>
+
+
 
-          
 
-            <el-table-column label="驾校名" align="center" prop="schoolName" />
-            <el-table-column label="订单总额" align="center" prop="orderTotal" >
+
+                </template>
+            </el-table-column>
+            <el-table-column label="订单总额" align="center" prop="orderTotal">
                 <template slot-scope="scope">
-                    {{ scope.row.orderTotal/100}}元
+                    {{ scope.row.orderTotal / 100 }}元
                 </template>
             </el-table-column>
-            <el-table-column label="驾校提成" align="center" prop="schoolCommission" >
+
+            <el-table-column label="驾校提成" align="center" prop="schoolCommission">
                 <template slot-scope="scope">
-                    {{ scope.row.schoolCommission/100}}元
+                    {{ scope.row.schoolCommission / 100 }}元
                 </template>
             </el-table-column>
             <!-- schoolCommission -->
@@ -140,8 +164,11 @@ export default {
             open: false,
             // 查询参数
             queryParams: {
+               
                 pageNum: 1,
-                pageSize: 10
+                pageSize: 10,
+                tradeType:null,
+                isShare:null
                 // id: null,
                 // outRefundNo: null,
                 // payType: 1,
@@ -184,7 +211,9 @@ export default {
                 startTime: null,
                 endTime: null,
                 pageNum: 1,
-                pageSize: 10
+                pageSize: 10,
+                tradeType:null,
+                isShare:null
                 // id: null,
                 // outRefundNo: null,
                 // payType: 1,
@@ -212,11 +241,11 @@ export default {
         },
         /** 搜索按钮操作 */
         handleQuery() {
-            if(this.queryParams.startTime&&this.queryParams.endTime&&Number(this.queryParams.startTime)>Number(this.queryParams.endTime)){
+            if (this.queryParams.startTime && this.queryParams.endTime && Number(this.queryParams.startTime) > Number(this.queryParams.endTime)) {
                 this.msgError('开始时间不能大于结束时间')
-                return 
-               
-               
+                return
+
+
             }
             this.queryParams.pageNum = 1;
             this.getList();
@@ -297,4 +326,13 @@ export default {
         }
     }
 };
-</script>
+</script>
+<style scoped>
+.link-text {
+    color: #1890ff;
+    text-decoration: underline;
+    text-decoration-color: #1890ff;
+
+
+}
+</style>

+ 15 - 0
src/views/tool/reportDetail/index.vue

@@ -0,0 +1,15 @@
+<template>
+    <div>
+        报表详情
+    </div>
+</template>
+
+<script>
+    export default {
+        
+    }
+</script>
+
+<style lang="sass" scoped>
+
+</style>