新增 平台资金账单、商家对账、商家对账页面

src/views/common/home.vue

@@ -241,7 +241,7 @@
       >
         <el-tab-pane label="外卖分析" name="first">
           <el-row v-loading="tableDataLoading1">
-            <el-col :span="6" class="cards">
+            <!-- <el-col :span="6" class="cards">
               <div class="box">
                 <div class="box_num">
                   <div class="box_color">
@@ -262,7 +262,7 @@
                   </div>
                 </div>
               </div>
-            </el-col>
+            </el-col> -->
             <el-col :span="6" class="cards">
               <div class="box">
                 <div class="box_num">

src/views/finance/financeList.vue

@@ -74,12 +74,12 @@
         <div style="margin:5px;display: inline-block;">
           <span>申请开始时间：</span>
           <el-date-picker
-            style="width: 160px;margin-left: 10px;"
+            style="width: 200px;margin-left: 10px;"
             v-model="startTime"
             align="right"
             type="datetime"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择开始时间"
           >
           </el-date-picker
@@ -88,12 +88,12 @@
         <div style="margin:5px;display: inline-block;">
           <span>申请截止时间：</span>
           <el-date-picker
-            style="width: 160px;margin-left: 10px;"
+            style="width: 200px;margin-left: 10px;"
             v-model="endTime"
             align="right"
             type="datetime"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择截止时间"
           >
           </el-date-picker>
@@ -1204,8 +1204,8 @@ export default {
       content: "",
       startTime: "",
       endTime: "",
-      outstartTime:"",
-      outendTime:"",
+      outstartTime: "",
+      outendTime: "",
       cashId: "",
       type: -1,
       totalnum: 0,
@@ -1330,7 +1330,7 @@ export default {
                 this.$notify({
                   title: "提示",
                   duration: 1800,
-                  message:'转账成功',
+                  message: "转账成功",
                   type: "warning"
                 });
                 // this.dataSelect();
@@ -1339,7 +1339,7 @@ export default {
                 this.$notify({
                   title: "提示",
                   duration: 1800,
-                  message: '转账失败',
+                  message: "转账失败",
                   type: "error"
                 });
                 // this.dataSelect();
@@ -1357,7 +1357,7 @@ export default {
                 this.$notify({
                   title: "提示",
                   duration: 1800,
-                  message: '转账成功',
+                  message: "转账成功",
                   type: "warning"
                 });
                 // this.dataSelect();
@@ -1377,7 +1377,7 @@ export default {
                 this.$notify({
                   title: "提示",
                   duration: 1800,
-                  message: '转账失败',
+                  message: "转账失败",
                   type: "error"
                 });
                 // this.dataSelect();
@@ -1437,7 +1437,7 @@ export default {
             this.$notify({
               title: "提示",
               duration: 1800,
-              message: '操作成功',
+              message: "操作成功",
               type: "warning"
             });
             // this.dataSelect();
@@ -1446,7 +1446,7 @@ export default {
             this.$notify({
               title: "提示",
               duration: 1800,
-              message: '操作失败',
+              message: "操作失败",
               type: "error"
             });
             // this.dataSelect();
@@ -1941,7 +1941,7 @@ export default {
           startTime: this.startTime,
           endTime: this.endTime,
           outstartTime: this.outstartTime,
-          outendTime: this.outendTime,
+          outendTime: this.outendTime
         })
       }).then(({ data }) => {
         this.totalMoney = data.data;
@@ -2208,7 +2208,7 @@ export default {
             startTime: this.startTime,
             endTime: this.endTime,
             outstartTime: this.outstartTime,
-          outendTime: this.outendTime,
+            outendTime: this.outendTime
           })
         }).then(({ data }) => {
           console.log(data, "导出");
@@ -2292,7 +2292,7 @@ export default {
             type: this.indentState3,
             classify: 2,
             startTime: this.startTime,
-            endTime: this.endTime,
+            endTime: this.endTime
           })
         }).then(({ data }) => {
           console.log(data, "导出");
@@ -2383,12 +2383,60 @@ export default {
     // },
     exportAffirm() {
       this.exportVisible = false;
+    },
+    getPath() {
+      // this.$router.push({ name: 'mission', params: { refund: '' } });
+      if (this.$route.params.type == "platform") {
+        console.log("平台-监控路由获取参数", this.$route.params);
+        this.indentState = this.$route.params.refund;
+        this.startTime = this.$route.params.dayId + " " + "00:00:00";
+        this.endTime = this.$route.params.dayId + " " + "23:59:59";
+        this.dataSelect();
+      } else if (this.$route.params.type == "shop") {
+        console.log("商家-监控路由获取参数", this.$route.params);
+        this.indentState = this.$route.params.refund;
+        this.shopName = this.$route.params.shopName;
+        this.startTime = this.$route.params.dayId + " " + "00:00:00";
+        this.endTime = this.$route.params.dayId + " " + "23:59:59";
+        this.dataSelect();
+      } else {
+        this.shopName = "";
+        this.indentState = "";
+        this.startTime = "";
+        this.endTime = "";
+        this.dataSelect();
+      }
     }
   },
+  watch: {
+    $route: "getPath"
+  },
   mounted() {
-    this.dataSelect();
+    // this.dataSelect();
     this.transferClick();
     // this.rechargeSelect()
+    this.$nextTick(() => {
+      if (this.$route.params.type == "platform") {
+        console.log("平台-监控路由获取参数", this.$route.params);
+        this.indentState = this.$route.params.refund;
+        this.startTime = this.$route.params.dayId + " " + "00:00:00";
+        this.endTime = this.$route.params.dayId + " " + "23:59:59";
+        this.dataSelect();
+      } else if (this.$route.params.type == "shop") {
+        console.log("商家-监控路由获取参数", this.$route.params);
+        this.indentState = this.$route.params.refund;
+        this.shopName = this.$route.params.shopName;
+        this.startTime = this.$route.params.dayId + " " + "00:00:00";
+        this.endTime = this.$route.params.dayId + " " + "23:59:59";
+        this.dataSelect();
+      } else {
+        this.shopName = "";
+        this.indentState = "";
+        this.startTime = "";
+        this.endTime = "";
+        this.dataSelect();
+      }
+    });
   }
 };
 </script>

src/views/financeBill/paltBill.vue

@@ -7,9 +7,9 @@
           style="width: 220px;margin-left: 10px;"
           v-model="startTime"
           align="right"
-          type="datetime"
-          format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss"
+          type="date"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
           placeholder="选择开始时间"
         >
         </el-date-picker
@@ -21,9 +21,9 @@
           style="width: 220px;margin-left: 10px;"
           v-model="endTime"
           align="right"
-          type="datetime"
-          format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss"
+          type="date"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
           placeholder="选择截止时间"
         >
         </el-date-picker>
@@ -37,6 +37,14 @@
         >查询
       </el-button>
       <el-button
+          style="margin:10px;"
+          size="mini"
+          type="primary"
+          icon="document"
+          @click="cleans"
+          >重置
+        </el-button>
+      <el-button
         style="margin-left:15px;"
         size="mini"
         type="warning"
@@ -46,84 +54,84 @@
       </el-button>
     </div>
     <el-table v-loading="tableDataLoading" :data="duanxinData.list">
-      <el-table-column fixed prop="complaintId" label="编号" width="100">
+      <el-table-column fixed prop="complaintId" label="编号" width="80">
         <template slot-scope="scope">
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="fileName" label="日期" align="center">
+      <el-table-column prop="dayId" label="日期" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="期初金额（元）" align="center">
+      <el-table-column prop="startMoney" label="期初金额（元）" align="center">
       </el-table-column>
       <el-table-column
-        prop="exportId"
+        prop="revenue"
         label="收入（元）"
         align="center"
       ></el-table-column>
       <el-table-column
-        prop="conditionDetail"
+        prop="revenueCount"
         label="收入笔数"
         align="center"
       >
         <template slot-scope="scope">
           <div
             style="color: #4f9dec;cursor: pointer;"
-            @click=""
+            @click="incomeNum(scope.row)"
           >
-            {{ scope.row.conditionDetail }}
+            {{ scope.row.revenueCount }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="updateTime" label="平台抽成手续费" align="center">
+      <el-table-column prop="platformRates" label="平台抽成手续费" align="center">
       </el-table-column>
       <el-table-column
-        prop="fileSize"
+        prop="shopPayouts"
         label="商家提现（元）"
         align="center"
       ></el-table-column>
       <el-table-column
-        prop="sendFromShopName"
+        prop="shopPayoutsRates"
         label="商家提现手续费"
         align="center"
       >
       </el-table-column>
-      <el-table-column prop="updateTime" label="商家提现笔数" align="center">
+      <el-table-column prop="shopPayoutsCount" label="商家提现笔数" align="center">
         <template slot-scope="scope">
           <div
             style="color: #4f9dec;cursor: pointer;"
-            @click=""
+            @click="merchantNum(scope.row)"
           >
-            {{ scope.row.updateTime }}
+            {{ scope.row.shopPayoutsCount }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="updateTime" label="骑手提现（元）" align="center">
+      <el-table-column prop="riderPayouts" label="骑手提现（元）" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="骑手提现手续费" align="center">
+      <el-table-column prop="riderPayoutsRates" label="骑手提现手续费" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="骑手提现笔数" align="center">
+      <el-table-column prop="riderPayoutsCount" label="骑手提现笔数" align="center">
         <template slot-scope="scope">
           <div
             style="color: #4f9dec;cursor: pointer;"
-            @click=""
+            @click="riderNum(scope.row)"
           >
-            {{ scope.row.updateTime }}
+            {{ scope.row.riderPayoutsCount }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="updateTime" label="退款金额" align="center">
+      <el-table-column prop="refundMoney" label="退款金额" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="退款笔数" align="center">
+      <el-table-column prop="refundCount" label="退款笔数" align="center">
         <template slot-scope="scope">
           <div
             style="color: #4f9dec;cursor: pointer;"
-            @click=""
+            @click="refundsNum(scope.row)"
           >
-            {{ scope.row.updateTime }}
+            {{ scope.row.refundCount }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="updateTime" label="期末金额（元）" align="center">
+      <el-table-column prop="endMoney" label="期末金额（元）" align="center">
       </el-table-column>
     </el-table>
     <div style="text-align: center;margin-top: 10px;">
@@ -138,6 +146,55 @@
       >
       </el-pagination>
     </div>
+    <!-- 导出限制 -->
+    <el-dialog
+      custom-class="export"
+      :visible.sync="exportVisible"
+      center
+      :title="exportTitle"
+      :close-on-click-modal="false"
+    >
+      <div class="con" v-show="exportFlag == 1">
+        <img src="../../assets/img/error.png" alt="" />
+        <span
+          style="font-size:20px;color: #000;font-weight: 800;margin: 18px 0 5px;"
+          >当前导出条数超过50000条，暂不支持导出</span
+        >
+        <span style="font-size:14px;color: #808080;"
+          >（注：数据中的图片、附件只能以链接的形式导出）</span
+        >
+      </div>
+      <div class="con" v-show="exportFlag == 2">
+        <img class="gundong" src="../../assets/img/loading.png" alt="" />
+        <span
+          style="font-size:20px;color: #000;font-weight: 800;margin: 18px 0 5px;"
+          >导出中...</span
+        >
+        <span style="font-size:14px;color: #808080;"
+          >（注：请到个人导出记录查看并下载）</span
+        >
+      </div>
+      <div class="con" v-show="exportFlag == 3">
+        <img src="../../assets/img/success.png" alt="" />
+        <span
+          style="font-size:20px;color: #000;font-weight: 800;margin: 18px 0 5px;"
+          >导出成功</span
+        >
+        <span style="font-size:14px;color: #808080;"
+          >（注：请到个人导出记录查看并下载）</span
+        >
+      </div>
+      <div class="con" v-show="exportFlag == 4">
+        <img class="gundong" src="../../assets/img/loading.png" alt="" />
+        <span
+          style="font-size:20px;color: #000;font-weight: 800;margin: 18px 0 5px;"
+          >版本迭代中，导出暂时无法使用</span
+        >
+      </div>
+      <div class="btn">
+        <el-button type="primary" @click="exportAffirm">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -162,7 +219,12 @@ export default {
         {label:"导出完成",value:1},
         {label:"导出失败",value:2},
       ],
-      duanxinData: []
+      duanxinData: [],
+
+       // 导出限制
+       exportTitle: "导出错误",
+      exportVisible: false,
+      exportFlag: 1, //1 超出限制  2导出中
     };
   },
   methods: {
@@ -229,18 +291,16 @@ export default {
     // 重置
     cleans() {
       // this.filename = "";
-      this.state = "";
-      this.startTime = "";
-      this.endTime = "";
       this.page = 1;
-      this.dataSelect();
+      this.startTime=""
+      this.endTime=""
+      this.dataSelect()
     },
     refresh() {
       this.dataSelect();
     },
     // 获取派单数据列表
     dataSelect() {
-      console.log(this.state);
       // if (this.endTime == '') {
       // 	  this.endTime = this.info2.stockDate2
       //   }
@@ -250,23 +310,21 @@ export default {
       this.tableDataLoading = true;
       var userId = this.$cookie.get('userId')
       this.$http({
-        url: this.$http.adornUrl("admin/export/listByUser"),
-        method: "get",
-        params: this.$http.adornParams({
-          curretPage: this.page,
-          pageSize: this.limit,
-          filename:'',// 文件名称
-          userId:userId,
-          state: this.state, //订单id
-          startTime: this.startTime, //开始时间
-          endTime: this.endTime, //结束时间
+        url: this.$http.adornUrl("reconciliation/platformBill"),
+        method: "post",
+        data: this.$http.adornData({
+          page: this.page,
+          limit: this.limit,
+          startDate: this.startTime, //开始时间
+          endDate: this.endTime, //结束时间
         })
       }).then(({ data }) => {
+        // console.log(data,'平台资金账单数据');
         if (data && data.code === 0) {
           this.tableDataLoading = false;
           let returnData = data.data;
           this.duanxinData = returnData;
-          console.log(data.data,'导出文件列表');
+          console.log(data.data,'平台资金账单数据');
         }
       });
     },
@@ -300,12 +358,118 @@ export default {
           document.body.removeChild(elink);
         }
       });
+    },
+
+    // 导出execl
+    exportBtn() {
+      console.log(this.totalnum, "导出条数");
+      this.exportTitle = "导出";
+      // this.exportFlag = 4;
+      this.exportVisible = true;
+      if (this.totalnum >= 50000) {
+        this.exportTitle = "导出错误";
+        this.exportFlag = 1;
+      } else {
+        this.exportTitle = "导出";
+        this.exportFlag = 2;
+        this.exportVisible = true;
+        var userId = this.$cookie.get("userId");
+        this.$http({
+          url: this.$http.adornUrl("admin/export/excelPlatformBill"),
+          method: "get",
+          // responseType: "blob",
+          params: this.$http.adornParams({
+            userId: userId,
+            startDate: this.startTime, //开始时间
+            endDate: this.endTime, //结束时间
+          })
+        }).then(({ data }) => {
+          console.log(data, "导出");
+          if (data.code == 0) {
+            this.exportTitle = "导出成功";
+            this.exportFlag = 3;
+          }
+          // let blob = new Blob([data], {
+          //   type:
+          //     "application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+          // });
+          // if (window.navigator.msSaveOrOpenBlob) {
+          //   navigator.msSaveBlob(blob);
+          // } else {
+          //   let url = window.URL.createObjectURL(blob);
+          //   let elink = document.createElement("a");
+          //   elink.download = "订单列表.xlsx";
+          //   elink.style.display = "none";
+          //   elink.href = url;
+          //   document.body.appendChild(elink);
+          //   elink.click();
+          //   document.body.removeChild(elink);
+          // }
+        });
+      }
+    },
+    exportAffirm() {
+      this.exportVisible = false;
+    },
+
+    // 退款笔数跳转
+    refundsNum(row){
+      console.log(row,'退款笔数跳转');
+      this.$router.push({ name: 'mission', params: { type:'platform',refund: 14,dayId:row.dayId } });
+    },
+    // 骑手提现笔数跳转
+    riderNum(row){
+      console.log(row,'骑手提现笔数跳转');
+      this.$router.push({ name: 'financeListRun', params: { type:'platform',refund: 1,dayId:row.dayId } });
+    },
+    // 商家提现笔数跳转
+    merchantNum(row){
+      console.log(row,'商家提现笔数跳转');
+      this.$router.push({ name: 'financeList', params: { type:'platform',refund: 1,dayId:row.dayId } });
+    },
+    //
+    incomeNum(row){
+      console.log(row,'收入笔数跳转');
+      this.$router.push({ name: 'mission', params: { type:'platform',refund: 15,dayId:row.dayId } });
     }
   },
+
   mounted() {
     this.dataSelect();
   },
 };
 </script>
 
-<style></style>
+<style  scoped="scoped">
+/* 导出限制 */
+.el-tabs >>> .export {
+  width: 500px;
+}
+.el-tabs >>> .export .con {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 20px;
+}
+.el-tabs >>> .export .con .gundong {
+  animation: gundong 3s linear infinite;
+}
+@keyframes gundong {
+  /* from表示动画的开始位置，也可以使用0%来表示。 */
+  from {
+    transform: rotate(0deg);
+  }
+  /* to表示动画的结束位置，也可以使用100%来表示。 */
+  to {
+    transform: rotate(360deg);
+  }
+}
+.el-tabs >>> .export img {
+  width: 70px;
+}
+.el-tabs >>> .export .btn {
+  display: flex;
+  flex-direction: row-reverse;
+}
+</style>

src/views/financeBill/riderBill.vue

@@ -50,7 +50,7 @@
           style="width: 200px;"
           @keydown.enter.native="phoneSelect"
           placeholder="请输入骑手姓名"
-          v-model="phone"
+          v-model="riderName"
         >
         </el-input
         >&nbsp;&nbsp;
@@ -61,7 +61,7 @@
           style="width: 200px;"
           @keydown.enter.native="phoneSelect"
           placeholder="请输入骑手姓名"
-          v-model="phone"
+          v-model="riderPhone"
         >
         </el-input
         >&nbsp;&nbsp;
@@ -75,6 +75,14 @@
         >查询
       </el-button>
       <el-button
+          style="margin:10px;"
+          size="mini"
+          type="primary"
+          icon="document"
+          @click="cleans"
+          >重置
+        </el-button>
+      <el-button
         style="margin-left:15px;"
         size="mini"
         type="warning"
@@ -84,66 +92,66 @@
       </el-button>
     </div>
     <el-table v-loading="tableDataLoading" :data="duanxinData.list">
-      <el-table-column fixed prop="complaintId" label="编号" width="100">
+      <el-table-column fixed prop="complaintId" label="编号" width="80">
         <template slot-scope="scope">
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="updateTime" label="骑手姓名" align="center">
+      <el-table-column prop="userName" label="骑手姓名" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="骑手手机号" align="center">
+      <el-table-column prop="phone" label="骑手手机号" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="骑手所在站点" align="center">
+      <el-table-column prop="stationName" label="骑手所在站点" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="日期" align="center">
+      <el-table-column prop="dayId" label="日期" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="期初金额（元）" align="center">
+      <el-table-column prop="startMoney" label="期初金额（元）" align="center">
       </el-table-column>
       <el-table-column
-        prop="exportId"
+        prop="revenue"
         label="收入（元）"
         align="center"
       ></el-table-column>
       <el-table-column
-        prop="conditionDetail"
+        prop="revenueCount"
         label="收入笔数"
         align="center"
       >
         <template slot-scope="scope">
           <div
             style="color: #4f9dec;cursor: pointer;"
-            @click=""
+            @click="incomeNum(scope.row)"
           >
-            {{ scope.row.conditionDetail }}
+            {{ scope.row.revenueCount }}
           </div>
         </template>
       </el-table-column>
       <el-table-column
-        prop="fileSize"
+        prop="riderPayouts"
         label="提现金额（元）"
         align="center"
       ></el-table-column>
       <el-table-column
-        prop="sendFromShopName"
+        prop="riderPayoutsRates"
         label="提现手续费"
         align="center"
       >
       </el-table-column>
-      <el-table-column prop="updateTime" label="提现笔数" align="center">
+      <el-table-column prop="riderPayoutsCount" label="提现笔数" align="center">
         <template slot-scope="scope">
           <div
             style="color: #4f9dec;cursor: pointer;"
-            @click=""
+            @click="riderNum(scope.row)"
           >
-            {{ scope.row.updateTime }}
+            {{ scope.row.riderPayoutsCount }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="updateTime" label="期末金额（元）" align="center">
+      <el-table-column prop="endMoney" label="期末金额（元）" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="赠送骑手余额（元）" align="center">
+      <el-table-column prop="sysGiftAmount" label="赠送骑手余额（元）" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="总收益（元）" align="center">
+      <el-table-column prop="totalIncome" label="总收益（元）" align="center">
       </el-table-column>
     </el-table>
     <div style="text-align: center;margin-top: 10px;">
@@ -158,6 +166,56 @@
       >
       </el-pagination>
     </div>
+
+    <!-- 导出限制 -->
+    <el-dialog
+      custom-class="export"
+      :visible.sync="exportVisible"
+      center
+      :title="exportTitle"
+      :close-on-click-modal="false"
+    >
+      <div class="con" v-show="exportFlag == 1">
+        <img src="../../assets/img/error.png" alt="" />
+        <span
+          style="font-size:20px;color: #000;font-weight: 800;margin: 18px 0 5px;"
+          >当前导出条数超过50000条，暂不支持导出</span
+        >
+        <span style="font-size:14px;color: #808080;"
+          >（注：数据中的图片、附件只能以链接的形式导出）</span
+        >
+      </div>
+      <div class="con" v-show="exportFlag == 2">
+        <img class="gundong" src="../../assets/img/loading.png" alt="" />
+        <span
+          style="font-size:20px;color: #000;font-weight: 800;margin: 18px 0 5px;"
+          >导出中...</span
+        >
+        <span style="font-size:14px;color: #808080;"
+          >（注：请到个人导出记录查看并下载）</span
+        >
+      </div>
+      <div class="con" v-show="exportFlag == 3">
+        <img src="../../assets/img/success.png" alt="" />
+        <span
+          style="font-size:20px;color: #000;font-weight: 800;margin: 18px 0 5px;"
+          >导出成功</span
+        >
+        <span style="font-size:14px;color: #808080;"
+          >（注：请到个人导出记录查看并下载）</span
+        >
+      </div>
+      <div class="con" v-show="exportFlag == 4">
+        <img class="gundong" src="../../assets/img/loading.png" alt="" />
+        <span
+          style="font-size:20px;color: #000;font-weight: 800;margin: 18px 0 5px;"
+          >版本迭代中，导出暂时无法使用</span
+        >
+      </div>
+      <div class="btn">
+        <el-button type="primary" @click="exportAffirm">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -174,15 +232,24 @@ export default {
 
       startTime: "",
       endTime: "",
+      stationName:"",
+      riderName:"",
+      riderPhone:"",
       filename: "",
       state: "",
+      stationData:"",
 
       statesnum2:[
         {label:"待导出",value:0},
         {label:"导出完成",value:1},
         {label:"导出失败",value:2},
       ],
-      duanxinData: []
+      duanxinData: [],
+
+       // 导出限制
+       exportTitle: "导出错误",
+      exportVisible: false,
+      exportFlag: 1, //1 超出限制  2导出中
     };
   },
   methods: {
@@ -249,15 +316,33 @@ export default {
     // 重置
     cleans() {
       // this.filename = "";
-      this.state = "";
+      this.riderName = "";
       this.startTime = "";
       this.endTime = "";
+      this.riderPhone = "";
+      this.stationName = "";
       this.page = 1;
       this.dataSelect();
     },
     refresh() {
       this.dataSelect();
     },
+    stationList() {
+      this.$http({
+        url: this.$http.adornUrl("admin/riderStation/selectStationList"),
+        method: "get",
+        params: this.$http.adornParams({
+          page: 1,
+          size: 1000
+        })
+      }).then(({ data }) => {
+        console.log(data, "骑手站点");
+        this.tableDataLoading = false;
+        let returnData = data.data.list;
+        this.stationData=returnData
+      });
+    },
+    phoneSelect(){},
     // 获取派单数据列表
     dataSelect() {
       console.log(this.state);
@@ -270,23 +355,23 @@ export default {
       this.tableDataLoading = true;
       var userId = this.$cookie.get('userId')
       this.$http({
-        url: this.$http.adornUrl("admin/export/listByUser"),
-        method: "get",
-        params: this.$http.adornParams({
-          curretPage: this.page,
-          pageSize: this.limit,
-          filename:'',// 文件名称
-          userId:userId,
-          state: this.state, //订单id
-          startTime: this.startTime, //开始时间
-          endTime: this.endTime, //结束时间
+        url: this.$http.adornUrl("reconciliation/riderBill"),
+        method: "post",
+        data: this.$http.adornData({
+          page: this.page,
+          limit: this.limit,
+          riderName:this.riderName,// 骑手姓名
+          riderPhone:this.riderPhone,// 骑手手机号
+          riderStation:this.stationName,
+          startDate: this.startTime, //开始时间
+          endDate: this.endTime, //结束时间
         })
       }).then(({ data }) => {
         if (data && data.code === 0) {
           this.tableDataLoading = false;
           let returnData = data.data;
           this.duanxinData = returnData;
-          console.log(data.data,'导出文件列表');
+          console.log(data.data,'骑手对账');
         }
       });
     },
@@ -320,12 +405,113 @@ export default {
           document.body.removeChild(elink);
         }
       });
-    }
+    },
+
+    // 导出execl
+    exportBtn() {
+      console.log(this.totalnum, "导出条数");
+      this.exportTitle = "导出";
+      // this.exportFlag = 4;
+      this.exportVisible = true;
+      if (this.totalnum >= 50000) {
+        this.exportTitle = "导出错误";
+        this.exportFlag = 1;
+      } else {
+        this.exportTitle = "导出";
+        this.exportFlag = 2;
+        this.exportVisible = true;
+        var userId = this.$cookie.get("userId");
+        this.$http({
+          url: this.$http.adornUrl("admin/export/excelRiderBill"),
+          method: "get",
+          // responseType: "blob",
+          params: this.$http.adornParams({
+            userId: userId,
+            riderName:this.riderName,// 骑手姓名
+            riderPhone:this.riderPhone,// 骑手手机号
+            riderStation:this.stationName,
+            startDate: this.startTime, //开始时间
+            endDate: this.endTime, //结束时间
+          })
+        }).then(({ data }) => {
+          console.log(data, "导出");
+          if (data.code == 0) {
+            this.exportTitle = "导出成功";
+            this.exportFlag = 3;
+          }
+          // let blob = new Blob([data], {
+          //   type:
+          //     "application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+          // });
+          // if (window.navigator.msSaveOrOpenBlob) {
+          //   navigator.msSaveBlob(blob);
+          // } else {
+          //   let url = window.URL.createObjectURL(blob);
+          //   let elink = document.createElement("a");
+          //   elink.download = "订单列表.xlsx";
+          //   elink.style.display = "none";
+          //   elink.href = url;
+          //   document.body.appendChild(elink);
+          //   elink.click();
+          //   document.body.removeChild(elink);
+          // }
+        });
+      }
+    },
+    exportAffirm() {
+      this.exportVisible = false;
+    },
+
+
+    // 收入笔数跳转
+    incomeNum(row){
+      console.log(row,'收入笔数跳转');
+      this.$router.push({ name: 'userDetail',params:{type:'rider',activeName:'shouyi',flag:'day',dayId:row.dayId},query: { userId: row.userId } });
+    },
+    // 提现笔数跳转
+    riderNum(row){
+      console.log(row,'提现笔数跳转');
+      this.$router.push({ name: 'financeListRun', params: { type:'rider',refund: 1,dayId:row.dayId,phone:row.phone,
+      userName:row.userName } });
+    },
   },
   mounted() {
     this.dataSelect();
+    this.stationList()
   },
 };
 </script>
 
-<style></style>
+<style  scoped="scoped">
+/* 导出限制 */
+.export {
+  width: 500px;
+}
+.export .con {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 20px;
+}
+ .export .con .gundong {
+  animation: gundong 3s linear infinite;
+}
+@keyframes gundong {
+  /* from表示动画的开始位置，也可以使用0%来表示。 */
+  from {
+    transform: rotate(0deg);
+  }
+  /* to表示动画的结束位置，也可以使用100%来表示。 */
+  to {
+    transform: rotate(360deg);
+  }
+}
+ .export img {
+  width: 70px;
+}
+ .export .btn {
+  display: flex;
+  flex-direction: row-reverse;
+}
+</style>

src/views/financeBill/shopBill.vue

@@ -34,7 +34,7 @@
           style="width: 200px;"
           @keydown.enter.native="phoneSelect"
           placeholder="请输入店铺名"
-          v-model="phone"
+          v-model="shopName"
         >
         </el-input
         >&nbsp;&nbsp;
@@ -45,7 +45,7 @@
           style="width: 200px;"
           @keydown.enter.native="phoneSelect"
           placeholder="请输入店铺手机号"
-          v-model="phone"
+          v-model="shopPhone"
         >
         </el-input
         >&nbsp;&nbsp;
@@ -59,6 +59,14 @@
         >查询
       </el-button>
       <el-button
+          style="margin:10px;"
+          size="mini"
+          type="primary"
+          icon="document"
+          @click="cleans"
+          >重置
+        </el-button>
+      <el-button
         style="margin-left:15px;"
         size="mini"
         type="warning"
@@ -68,78 +76,78 @@
       </el-button>
     </div>
     <el-table v-loading="tableDataLoading" :data="duanxinData.list">
-      <el-table-column fixed prop="complaintId" label="编号" width="100">
+      <el-table-column fixed prop="complaintId" label="编号" width="80">
         <template slot-scope="scope">
           <span>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="updateTime" label="店铺名" align="center">
+      <el-table-column prop="shopName" label="店铺名" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="店铺手机号" align="center">
+      <el-table-column prop="phone" label="店铺手机号" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="日期" align="center">
+      <el-table-column prop="dayId" label="日期" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="期初金额（元）" align="center">
+      <el-table-column prop="startMoney" label="期初金额（元）" align="center">
       </el-table-column>
       <el-table-column
-        prop="exportId"
+        prop="revenue"
         label="收入（元）"
         align="center"
       ></el-table-column>
       <el-table-column
-        prop="conditionDetail"
+        prop="revenueCount"
         label="收入笔数"
         align="center"
       >
         <template slot-scope="scope">
           <div
             style="color: #4f9dec;cursor: pointer;"
-            @click=""
+            @click="incomeNum(scope.row)"
           >
-            {{ scope.row.conditionDetail }}
+            {{ scope.row.revenueCount }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="updateTime" label="平台抽成手续费" align="center">
+      <el-table-column prop="platformRates" label="平台抽成手续费" align="center">
       </el-table-column>
       <el-table-column
-        prop="fileSize"
+        prop="shopPayouts"
         label="提现金额（元）"
         align="center"
       ></el-table-column>
       <el-table-column
-        prop="sendFromShopName"
+        prop="shopPayoutsRates"
         label="提现手续费"
         align="center"
       >
       </el-table-column>
-      <el-table-column prop="updateTime" label="提现笔数" align="center">
+      <el-table-column prop="shopPayoutsCount" label="提现笔数" align="center">
         <template slot-scope="scope">
           <div
             style="color: #4f9dec;cursor: pointer;"
-            @click=""
+            @click="riderNum(scope.row)"
           >
-            {{ scope.row.updateTime }}
+            {{ scope.row.shopPayoutsCount }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="updateTime" label="期末金额（元）" align="center">
+      <el-table-column prop="endMoney" label="期末金额（元）" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="账户余额（元）" align="center">
+      <el-table-column prop="endMoney" label="账户余额（元）" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="总收益（元）" align="center">
+      <el-table-column prop="totalIncome" label="总收益（元）" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="用户实际付款（元）" align="center">
+      <el-table-column prop="payMoney" label="用户实际付款（元）" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="退款金额（元）" align="center">
+      <el-table-column prop="refundMoney" label="退款金额（元）" align="center">
       </el-table-column>
-      <el-table-column prop="updateTime" label="退款笔数" align="center">
+      <el-table-column prop="refundCount" label="退款笔数" align="center">
         <template slot-scope="scope">
           <div
             style="color: #4f9dec;cursor: pointer;"
-            @click=""
+            @click="refundsNum(scope.row)"
           >
-            {{ scope.row.updateTime }}
+            {{ scope.row.refundCount }}
           </div>
         </template>
       </el-table-column>
@@ -156,6 +164,56 @@
       >
       </el-pagination>
     </div>
+
+    <!-- 导出限制 -->
+    <el-dialog
+      custom-class="export"
+      :visible.sync="exportVisible"
+      center
+      :title="exportTitle"
+      :close-on-click-modal="false"
+    >
+      <div class="con" v-show="exportFlag == 1">
+        <img src="../../assets/img/error.png" alt="" />
+        <span
+          style="font-size:20px;color: #000;font-weight: 800;margin: 18px 0 5px;"
+          >当前导出条数超过50000条，暂不支持导出</span
+        >
+        <span style="font-size:14px;color: #808080;"
+          >（注：数据中的图片、附件只能以链接的形式导出）</span
+        >
+      </div>
+      <div class="con" v-show="exportFlag == 2">
+        <img class="gundong" src="../../assets/img/loading.png" alt="" />
+        <span
+          style="font-size:20px;color: #000;font-weight: 800;margin: 18px 0 5px;"
+          >导出中...</span
+        >
+        <span style="font-size:14px;color: #808080;"
+          >（注：请到个人导出记录查看并下载）</span
+        >
+      </div>
+      <div class="con" v-show="exportFlag == 3">
+        <img src="../../assets/img/success.png" alt="" />
+        <span
+          style="font-size:20px;color: #000;font-weight: 800;margin: 18px 0 5px;"
+          >导出成功</span
+        >
+        <span style="font-size:14px;color: #808080;"
+          >（注：请到个人导出记录查看并下载）</span
+        >
+      </div>
+      <div class="con" v-show="exportFlag == 4">
+        <img class="gundong" src="../../assets/img/loading.png" alt="" />
+        <span
+          style="font-size:20px;color: #000;font-weight: 800;margin: 18px 0 5px;"
+          >版本迭代中，导出暂时无法使用</span
+        >
+      </div>
+      <div class="btn">
+        <el-button type="primary" @click="exportAffirm">确定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -172,6 +230,8 @@ export default {
 
       startTime: "",
       endTime: "",
+      shopName:'',
+      shopPhone:"",
       filename: "",
       state: "",
 
@@ -180,7 +240,12 @@ export default {
         {label:"导出完成",value:1},
         {label:"导出失败",value:2},
       ],
-      duanxinData: []
+      duanxinData: [],
+
+       // 导出限制
+       exportTitle: "导出错误",
+      exportVisible: false,
+      exportFlag: 1, //1 超出限制  2导出中
     };
   },
   methods: {
@@ -247,7 +312,8 @@ export default {
     // 重置
     cleans() {
       // this.filename = "";
-      this.state = "";
+      this.shopName = "";
+      this.shopPhone = "";
       this.startTime = "";
       this.endTime = "";
       this.page = 1;
@@ -268,23 +334,22 @@ export default {
       this.tableDataLoading = true;
       var userId = this.$cookie.get('userId')
       this.$http({
-        url: this.$http.adornUrl("admin/export/listByUser"),
-        method: "get",
-        params: this.$http.adornParams({
-          curretPage: this.page,
-          pageSize: this.limit,
-          filename:'',// 文件名称
-          userId:userId,
-          state: this.state, //订单id
-          startTime: this.startTime, //开始时间
-          endTime: this.endTime, //结束时间
+        url: this.$http.adornUrl("reconciliation/shopBill"),
+        method: "post",
+        data: this.$http.adornData({
+          page: this.page,
+          limit: this.limit,
+          shopName:this.shopName,// 文件名称
+          shopPhone:this.shopPhone,
+          startDate: this.startTime, //开始时间
+          endDate: this.endTime, //结束时间
         })
       }).then(({ data }) => {
         if (data && data.code === 0) {
           this.tableDataLoading = false;
           let returnData = data.data;
           this.duanxinData = returnData;
-          console.log(data.data,'导出文件列表');
+          console.log(data.data,'商家对账');
         }
       });
     },
@@ -318,12 +383,115 @@ export default {
           document.body.removeChild(elink);
         }
       });
-    }
+    },
+
+    // 导出execl
+    exportBtn() {
+      console.log(this.totalnum, "导出条数");
+      this.exportTitle = "导出";
+      // this.exportFlag = 4;
+      this.exportVisible = true;
+      if (this.totalnum >= 50000) {
+        this.exportTitle = "导出错误";
+        this.exportFlag = 1;
+      } else {
+        this.exportTitle = "导出";
+        this.exportFlag = 2;
+        this.exportVisible = true;
+        var userId = this.$cookie.get("userId");
+        this.$http({
+          url: this.$http.adornUrl("admin/export/excelShopBill"),
+          method: "get",
+          // responseType: "blob",
+          params: this.$http.adornParams({
+            userId: userId,
+            shopName:this.shopName,// 文件名称
+            shopPhone:this.shopPhone,
+            startDate: this.startTime, //开始时间
+            endDate: this.endTime, //结束时间
+          })
+        }).then(({ data }) => {
+          console.log(data, "导出");
+          if (data.code == 0) {
+            this.exportTitle = "导出成功";
+            this.exportFlag = 3;
+          }
+          // let blob = new Blob([data], {
+          //   type:
+          //     "application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+          // });
+          // if (window.navigator.msSaveOrOpenBlob) {
+          //   navigator.msSaveBlob(blob);
+          // } else {
+          //   let url = window.URL.createObjectURL(blob);
+          //   let elink = document.createElement("a");
+          //   elink.download = "订单列表.xlsx";
+          //   elink.style.display = "none";
+          //   elink.href = url;
+          //   document.body.appendChild(elink);
+          //   elink.click();
+          //   document.body.removeChild(elink);
+          // }
+        });
+      }
+    },
+    exportAffirm() {
+      this.exportVisible = false;
+    },
+
+
+    // 收入笔数跳转
+    incomeNum(row){
+      console.log(row,'收入笔数跳转');
+      this.$router.push({ name: 'shopDatas',params:{type:'shop',flag:'day',dayId:row.dayId}, query: { shopId: row.shopId } });
+    },
+    // 提现笔数跳转
+    riderNum(row){
+      console.log(row,'提现笔数跳转');
+      this.$router.push({ name: 'financeList', params: { type:'shop',refund: 1,shopName:row.shopName,dayId:row.dayId } });
+    },
+     // 退款笔数跳转
+     refundsNum(row){
+      console.log(row,'退款笔数跳转');
+      this.$router.push({ name: 'mission', params: { type:'shop',refund: 14,shopName:row.shopName,dayId:row.dayId } });
+    },
+
   },
   mounted() {
     this.dataSelect();
   },
 };
 </script>
-
-<style></style>
+<style  scoped="scoped">
+/* 导出限制 */
+.export {
+  width: 500px;
+}
+.export .con {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 20px;
+}
+.export .con .gundong {
+  animation: gundong 3s linear infinite;
+}
+@keyframes gundong {
+  /* from表示动画的开始位置，也可以使用0%来表示。 */
+  from {
+    transform: rotate(0deg);
+  }
+  /* to表示动画的结束位置，也可以使用100%来表示。 */
+  to {
+    transform: rotate(360deg);
+  }
+}
+.export img {
+  width: 70px;
+}
+.export .btn {
+  display: flex;
+  flex-direction: row-reverse;
+}
+</style>

src/views/main-sidebar.vue

@@ -1,134 +1,198 @@
-<template>
-  <aside class="site-sidebar" :class="'site-sidebar--' + sidebarLayoutSkin">
-    <div class="site-sidebar__inner">
-      <el-menu
-        :default-active="menuActiveName || 'home'"
-        :collapse="sidebarFold"
-        :collapseTransition="false"
-        class="site-sidebar__menu">
-       <!-- <el-menu-item index="home" @click="$router.push({ name: 'home' })">
-          <icon-svg name="shuju" class="site-sidebar__menu-icon"></icon-svg>
-          <span slot="title">数据中心</span>
-        </el-menu-item>
-		<el-menu-item index="userList" @click="$router.push({ name: 'userList' })">
-			<icon-svg name="yonghul" class="site-sidebar__menu-icon"></icon-svg>
-			<span slot="title">用户中心</span>
-		</el-menu-item>
-		<el-menu-item index="financeList" @click="$router.push({ name: 'financeList' })">
-			<icon-svg name="caiwu" class="site-sidebar__menu-icon"></icon-svg>
-			<span slot="title">财务中心</span>
-		</el-menu-item>
-		<el-menu-item index="message" @click="$router.push({ name: 'message' })">
-			<icon-svg name="xiaoxi" class="site-sidebar__menu-icon"></icon-svg>
-			<span slot="title">消息中心</span>
-		</el-menu-item>
-		<el-menu-item index="mission" @click="$router.push({ name: 'mission' })">
-			<icon-svg name="renwu" class="site-sidebar__menu-icon"></icon-svg>
-			<span slot="title">任务中心</span>
-		</el-menu-item>
-		<el-menu-item index="taskConfig" @click="$router.push({ name: 'taskConfig' })">
-			<icon-svg name="renwu" class="site-sidebar__menu-icon"></icon-svg>
-			<span slot="title">任务配置</span>
-		</el-menu-item> -->
-		<!-- <el-menu-item index="missionsye" @click="$router.push({ name: 'missionsye' })">
-			<icon-svg name="pingtai" class="site-sidebar__menu-icon"></icon-svg>
-			<span slot="title">系统任务</span>
-		</el-menu-item> -->
-		<!-- <el-menu-item index="materialsList" @click="$router.push({ name: 'materialsList' })">
-			<icon-svg name="xinxi" class="site-sidebar__menu-icon"></icon-svg>
-			<span slot="title">好物圈</span>
-		</el-menu-item> -->
-		<!-- <el-menu-item index="bannerList" @click="$router.push({ name: 'bannerList' })">
-			<icon-svg name="shangpin" class="site-sidebar__menu-icon"></icon-svg>
-			<span slot="title">商城配置</span>
-		</el-menu-item>
-		<el-menu-item index="allocationList" @click="$router.push({ name: 'allocationList' })">
-			<icon-svg name="system" class="site-sidebar__menu-icon"></icon-svg>
-			<span slot="title">系统配置</span>
-		</el-menu-item> -->
-        <sub-menu
-          v-for="menu in menuList"
-          :key="menu.menuId"
-          :menu="menu"
-          :dynamicMenuRoutes="dynamicMenuRoutes">
-        </sub-menu>
-      </el-menu>
-    </div>
-  </aside>
-</template>
-
-<script>
-  import SubMenu from './main-sidebar-sub-menu'
-  import { isURL } from '@/utils/validate'
-  export default {
-    data () {
-      return {
-        dynamicMenuRoutes: []
-      }
-    },
-    components: {
-      SubMenu
-    },
-    computed: {
-      sidebarLayoutSkin: {
-        get () { return this.$store.state.common.sidebarLayoutSkin }
-      },
-      sidebarFold: {
-        get () { return this.$store.state.common.sidebarFold }
-      },
-      menuList: {
-        get () { return this.$store.state.common.menuList },
-        set (val) { this.$store.commit('common/updateMenuList', val) }
-      },
-      menuActiveName: {
-        get () { return this.$store.state.common.menuActiveName },
-        set (val) { this.$store.commit('common/updateMenuActiveName', val) }
-      },
-      mainTabs: {
-        get () { return this.$store.state.common.mainTabs },
-        set (val) { this.$store.commit('common/updateMainTabs', val) }
-      },
-      mainTabsActiveName: {
-        get () { return this.$store.state.common.mainTabsActiveName },
-        set (val) { this.$store.commit('common/updateMainTabsActiveName', val) }
-      }
-    },
-    watch: {
-      $route: 'routeHandle'
-    },
-    created () {
-      this.menuList = JSON.parse(sessionStorage.getItem('menuList') || '[]')
-      this.dynamicMenuRoutes = JSON.parse(sessionStorage.getItem('dynamicMenuRoutes') || '[]')
-      this.routeHandle(this.$route)
-    },
-    methods: {
-      // 路由操作
-      routeHandle (route) {
-        if (route.meta.isTab) {
-          // tab选中, 不存在先添加
-          var tab = this.mainTabs.filter(item => item.name === route.name)[0]
-          if (!tab) {
-            if (route.meta.isDynamic) {
-              route = this.dynamicMenuRoutes.filter(item => item.name === route.name)[0]
-              if (!route) {
-                return console.error('未能找到可用标签页!')
-              }
-            }
-            tab = {
-              menuId: route.meta.menuId || route.name,
-              name: route.name,
-              title: route.meta.title,
-              type: isURL(route.meta.iframeUrl) ? 'iframe' : 'module',
-              iframeUrl: route.meta.iframeUrl || '',
-              params: route.params,
-              query: route.query
-            }
-            this.mainTabs = this.mainTabs.concat(tab)
-          }
-          this.menuActiveName = tab.menuId + ''
-          this.mainTabsActiveName = tab.name
-        }
-      }
-    }
-  }
-</script>
+<template>
+  <aside class="site-sidebar" :class="'site-sidebar--' + sidebarLayoutSkin">
+    <div class="site-sidebar__inner">
+      <el-menu
+        :default-active="menuActiveName || 'home'"
+        :collapse="sidebarFold"
+        :collapseTransition="false"
+        class="site-sidebar__menu"
+      >
+        <!-- <el-menu-item index="home" @click="$router.push({ name: 'home' })">
+          <icon-svg name="shuju" class="site-sidebar__menu-icon"></icon-svg>
+          <span slot="title">数据中心</span>
+        </el-menu-item>
+		<el-menu-item index="userList" @click="$router.push({ name: 'userList' })">
+			<icon-svg name="yonghul" class="site-sidebar__menu-icon"></icon-svg>
+			<span slot="title">用户中心</span>
+		</el-menu-item>
+		<el-menu-item index="financeList" @click="$router.push({ name: 'financeList' })">
+			<icon-svg name="caiwu" class="site-sidebar__menu-icon"></icon-svg>
+			<span slot="title">财务中心</span>
+		</el-menu-item>
+		<el-menu-item index="message" @click="$router.push({ name: 'message' })">
+			<icon-svg name="xiaoxi" class="site-sidebar__menu-icon"></icon-svg>
+			<span slot="title">消息中心</span>
+		</el-menu-item>
+		<el-menu-item index="mission" @click="$router.push({ name: 'mission' })">
+			<icon-svg name="renwu" class="site-sidebar__menu-icon"></icon-svg>
+			<span slot="title">任务中心</span>
+		</el-menu-item>
+		<el-menu-item index="taskConfig" @click="$router.push({ name: 'taskConfig' })">
+			<icon-svg name="renwu" class="site-sidebar__menu-icon"></icon-svg>
+			<span slot="title">任务配置</span>
+		</el-menu-item> -->
+        <!-- <el-menu-item index="missionsye" @click="$router.push({ name: 'missionsye' })">
+			<icon-svg name="pingtai" class="site-sidebar__menu-icon"></icon-svg>
+			<span slot="title">系统任务</span>
+		</el-menu-item> -->
+        <!-- <el-menu-item index="materialsList" @click="$router.push({ name: 'materialsList' })">
+			<icon-svg name="xinxi" class="site-sidebar__menu-icon"></icon-svg>
+			<span slot="title">好物圈</span>
+		</el-menu-item> -->
+        <!-- <el-menu-item index="bannerList" @click="$router.push({ name: 'bannerList' })">
+			<icon-svg name="shangpin" class="site-sidebar__menu-icon"></icon-svg>
+			<span slot="title">商城配置</span>
+		</el-menu-item>
+		<el-menu-item index="allocationList" @click="$router.push({ name: 'allocationList' })">
+			<icon-svg name="system" class="site-sidebar__menu-icon"></icon-svg>
+			<span slot="title">系统配置</span>
+		</el-menu-item> -->
+        <sub-menu
+          v-for="menu in menuList"
+          :key="menu.menuId"
+          :menu="menu"
+          :dynamicMenuRoutes="dynamicMenuRoutes"
+        >
+        </sub-menu>
+      </el-menu>
+    </div>
+  </aside>
+</template>
+
+<script>
+import SubMenu from "./main-sidebar-sub-menu";
+import { isURL } from "@/utils/validate";
+export default {
+  data() {
+    return {
+      dynamicMenuRoutes: []
+    };
+  },
+  components: {
+    SubMenu
+  },
+  computed: {
+    sidebarLayoutSkin: {
+      get() {
+        return this.$store.state.common.sidebarLayoutSkin;
+      }
+    },
+    sidebarFold: {
+      get() {
+        return this.$store.state.common.sidebarFold;
+      }
+    },
+    menuList: {
+      get() {
+        return this.$store.state.common.menuList;
+      },
+      set(val) {
+        this.$store.commit("common/updateMenuList", val);
+      }
+    },
+    menuActiveName: {
+      get() {
+        return this.$store.state.common.menuActiveName;
+      },
+      set(val) {
+        this.$store.commit("common/updateMenuActiveName", val);
+      }
+    },
+    mainTabs: {
+      get() {
+        return this.$store.state.common.mainTabs;
+      },
+      set(val) {
+        this.$store.commit("common/updateMainTabs", val);
+      }
+    },
+    mainTabsActiveName: {
+      get() {
+        return this.$store.state.common.mainTabsActiveName;
+      },
+      set(val) {
+        this.$store.commit("common/updateMainTabsActiveName", val);
+      }
+    }
+  },
+  watch: {
+    $route: "routeHandle"
+  },
+  created() {
+    this.menuList = JSON.parse(sessionStorage.getItem("menuList") || "[]");
+    this.dynamicMenuRoutes = JSON.parse(
+      sessionStorage.getItem("dynamicMenuRoutes") || "[]"
+    );
+    this.routeHandle(this.$route);
+  },
+  methods: {
+    // 路由操作
+    routeHandle(route) {
+      // console.log(route);
+
+      if (route.meta.isTab) {
+        // tab选中, 不存在先添加
+        var tab = this.mainTabs.filter(item => item.name === route.name)[0];
+        if (!tab) {
+          if (route.meta.isDynamic) {
+            route = this.dynamicMenuRoutes.filter(
+              item => item.name === route.name
+            )[0];
+            if (!route) {
+              return console.error("未能找到可用标签页!");
+            }
+          }
+          if (route.name == "mission") {
+            tab = {
+              menuId: route.meta.menuId || route.name,
+              name: route.name,
+              title: route.meta.title,
+              type: isURL(route.meta.iframeUrl) ? "iframe" : "module",
+              iframeUrl: route.meta.iframeUrl || "",
+              params: '',
+              query: ''
+            };
+          }
+          else if (route.name == "financeListRun") {
+            tab = {
+              menuId: route.meta.menuId || route.name,
+              name: route.name,
+              title: route.meta.title,
+              type: isURL(route.meta.iframeUrl) ? "iframe" : "module",
+              iframeUrl: route.meta.iframeUrl || "",
+              params: '',
+              query: ''
+            };
+          }
+          else if (route.name == "financeList") {
+            tab = {
+              menuId: route.meta.menuId || route.name,
+              name: route.name,
+              title: route.meta.title,
+              type: isURL(route.meta.iframeUrl) ? "iframe" : "module",
+              iframeUrl: route.meta.iframeUrl || "",
+              params: '',
+              query: ''
+            };
+          }
+           else {
+            tab = {
+              menuId: route.meta.menuId || route.name,
+              name: route.name,
+              title: route.meta.title,
+              type: isURL(route.meta.iframeUrl) ? "iframe" : "module",
+              iframeUrl: route.meta.iframeUrl || "",
+              params: route.params,
+              query: route.query
+            };
+          }
+
+          this.mainTabs = this.mainTabs.concat(tab);
+        }
+        this.menuActiveName = tab.menuId + "";
+        this.mainTabsActiveName = tab.name;
+      }
+    }
+  }
+};
+</script>

src/views/mission/mission.vue

@@ -97,39 +97,31 @@
         <div style="position: relative;display: inline-block;margin: 3px;">
           <span>商铺类型：</span>
           <el-select
-              v-model="spEarningTypeId"
-              style="width:200px;"
-              @change="phoneSelect"
-              :clearable="true"
+            v-model="spEarningTypeId"
+            style="width:200px;"
+            @change="phoneSelect"
+            :clearable="true"
+          >
+            <el-option
+              v-for="item in spEarnings"
+              :key="item.id"
+              :label="item.shopTypeName"
+              :value="item.id"
             >
-              <el-option
-                v-for="item in spEarnings"
-                :key="item.id"
-                :label="item.shopTypeName"
-                :value="item.id"
-              >
-              </el-option> </el-select
-            >&nbsp;&nbsp;&nbsp;
+            </el-option> </el-select
+          >&nbsp;&nbsp;&nbsp;
         </div>
         <div style="position: relative;display: inline-block;margin: 3px;">
           <span>优惠券类型：</span>
           <el-select
-              v-model="couponType"
-              style="width:200px;"
-              @change="phoneSelect"
-              :clearable="true"
-            >
-              <el-option
-                label="平台"
-                :value="0"
-              >
-              </el-option>
-              <el-option
-                label="商家"
-                :value="1"
-              >
-              </el-option>
-          </el-select>&nbsp;&nbsp;&nbsp;
+            v-model="couponType"
+            style="width:200px;"
+            @change="phoneSelect"
+            :clearable="true"
+          >
+            <el-option label="平台" :value="0"> </el-option>
+            <el-option label="商家" :value="1"> </el-option> </el-select
+          >&nbsp;&nbsp;&nbsp;
         </div>
         <div style="position: relative;display: inline-block;margin: 3px;">
           <span>手机号:</span>
@@ -235,6 +227,33 @@
           >
           </el-date-picker>
         </div>
+        <div v-if="status == 14" style="margin:5px;display: inline-block;">
+          <span>退款开始时间：</span>
+          <el-date-picker
+            style="width: 200px;margin-left: 10px;"
+            v-model="refundStartTime"
+            align="right"
+            type="datetime"
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择开始时间"
+          >
+          </el-date-picker
+          >&nbsp;&nbsp;&nbsp;
+        </div>
+        <div v-if="status == 14" style="margin:5px;display: inline-block;">
+          <span>退款结束时间：</span>
+          <el-date-picker
+            style="width: 200px;margin-left: 10px;"
+            v-model="refundEndTime"
+            align="right"
+            type="datetime"
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择结束时间"
+          >
+          </el-date-picker>
+        </div>
         <el-button
           style="margin-left:15px;"
           size="mini"
@@ -373,10 +392,7 @@
           label="骑手所在站点"
           width="200"
         ></el-table-column>
-        <el-table-column
-          prop="orderSequence"
-          label="序号"
-        ></el-table-column>
+        <el-table-column prop="orderSequence" label="序号"></el-table-column>
         <el-table-column
           prop="transactionId"
           label="商户单号"
@@ -527,7 +543,9 @@
           width="80"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.isPrint === 0 || scope.row.isPrint === ''">未打印</span>
+            <span v-if="scope.row.isPrint === 0 || scope.row.isPrint === ''"
+              >未打印</span
+            >
             <span v-if="scope.row.isPrint === 1">已打印</span>
           </template>
         </el-table-column>
@@ -590,7 +608,8 @@
               v-if="scope.row.status === 6"
               :disabled="!isAuth('mission:qucan')"
               @click="wancheng(scope.row)"
-            >制作已完成</el-button>
+              >制作已完成</el-button
+            >
             <el-button
               size="mini"
               type="danger"
@@ -598,11 +617,12 @@
               style="margin: 10px;"
               v-if="
                 scope.row.status === 3 ||
-                scope.row.status === 6 ||
-                scope.row.status === 7
+                  scope.row.status === 6 ||
+                  scope.row.status === 7
               "
               @click="tuikuan(scope.row)"
-            >退款</el-button>
+              >退款</el-button
+            >
             <el-button
               size="mini"
               type="primary"
@@ -610,38 +630,41 @@
               :disabled="!isAuth('mission:qucan')"
               @click="wancheng(scope.row)"
               style="margin: 5px 0;"
-            >{{ scope.row.orderType == 1 ? "餐品已完成" : "餐品已完成" }}
+              >{{ scope.row.orderType == 1 ? "餐品已完成" : "餐品已完成" }}
             </el-button>
             <el-button
               size="mini"
               type="primary"
               v-if="
                 scope.row.status == 3 ||
-                scope.row.status === 4 ||
-                scope.row.status === 6
+                  scope.row.status === 4 ||
+                  scope.row.status === 6
               "
               :disabled="!isAuth('mission:qucan')"
               @click="dayin(scope.row)"
               style="margin: 3px;"
-            >打印小票</el-button>
+              >打印小票</el-button
+            >
             <el-button
               size="mini"
               type="primary"
               v-if="
                 scope.row.status == 3 ||
-                scope.row.status === 4 ||
-                scope.row.status === 6
+                  scope.row.status === 4 ||
+                  scope.row.status === 6
               "
               :disabled="!isAuth('mission:mingxi')"
               @click="detailClick(scope.row)"
               style="margin: 3px;"
-            >打印小票明细</el-button>
+              >打印小票明细</el-button
+            >
             <el-button
               size="mini"
               type="primary"
               @click="complainDetails(scope.row)"
               style="margin: 3px;"
-            >聊天内容</el-button>
+              >聊天内容</el-button
+            >
             <el-button
               size="mini"
               type="primary"
@@ -649,7 +672,8 @@
               :disabled="!isAuth('orderCenterRun:zhuandan')"
               @click="zhuandan(scope.row)"
               style="margin: 3px;"
-            >转单</el-button>
+              >转单</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -1055,9 +1079,9 @@ export default {
       dialogVisible: false,
       stationData: [], // 骑手站点数据
       stationName: "",
-      spEarnings:[],// 商铺类型数据
-      couponType:'',// 优惠券类型
-      spEarningTypeId:"",
+      spEarnings: [], // 商铺类型数据
+      couponType: "", // 优惠券类型
+      spEarningTypeId: "",
       imageUrl: [],
       limit: 10,
       page: 1,
@@ -1065,7 +1089,7 @@ export default {
       phone: "",
       userName: "",
       orderNumber: "",
-      transactionId:"",// 商户单号
+      transactionId: "", // 商户单号
       status: "",
       describes: "",
       token: "",
@@ -1110,7 +1134,14 @@ export default {
           label: "待支付",
           value: 1
         },
-
+        {
+          label: "已支付",
+          value: 15
+        },
+        {
+          label: "已退款",
+          value: 14
+        },
         {
           label: "商家待接单",
           value: 7
@@ -1247,7 +1278,7 @@ export default {
 
       tableData: [],
       tableData2: {},
-      shopMoney:'',// 店铺总交易
+      shopMoney: "", // 店铺总交易
       form: {
         id: "",
         classifyName: "",
@@ -1295,8 +1326,12 @@ export default {
       // },
       startTime: "",
       endTime: "",
-      payStartTime: dayjs().subtract(6, 'day').format('YYYY-MM-DD'), //支付开始时间
-      payEndTime: dayjs().format('YYYY-MM-DD'),
+      payStartTime: dayjs()
+        .subtract(6, "day")
+        .format("YYYY-MM-DD"), //支付开始时间
+      payEndTime: dayjs().format("YYYY-MM-DD"),
+      refundStartTime: "",
+      refundEndTime: "",
 
       // 导出限制
       exportTitle: "导出错误",
@@ -1324,7 +1359,7 @@ export default {
         this.stationData = data.data;
       });
     },
-    shopTypeList(){
+    shopTypeList() {
       this.$http({
         url: this.$http.adornUrl("admin/shoptype/selectShopTypeList"),
         method: "get",
@@ -1333,7 +1368,7 @@ export default {
           limit: 1000
         })
       }).then(({ data }) => {
-        console.log(data,'商铺类型');
+        console.log(data, "商铺类型");
 
         let returnData = data.data.list;
         this.spEarnings = returnData;
@@ -1677,12 +1712,17 @@ export default {
     },
     // 重置
     cleans2() {
+      // const data=this.$route.query;
+      // if(data.refund){
+      //     delete this.$router.push({query:{}}) // 删除页面参数
+      // }
+
       this.page = 1;
       this.phone = "";
       this.riderPhone = "";
       this.userName = "";
       this.orderNumber = "";
-      this.transactionId=""
+      this.transactionId = "";
       this.status = "";
       this.shopName = "";
       this.reservationFlag = "";
@@ -1690,11 +1730,15 @@ export default {
       this.orderType = "";
       this.startTime = "";
       this.endTime = "";
-      this.payStartTime = dayjs().subtract(6, 'day').format('YYYY-MM-DD');
-      this.payEndTime = dayjs().format('YYYY-MM-DD');
-      this.stationName=""
-      this.spEarningTypeId=""
-      this.couponType=""
+      this.refundStartTime = "";
+      this.refundEndTime = "";
+      this.payStartTime = dayjs()
+        .subtract(6, "day")
+        .format("YYYY-MM-DD");
+      this.payEndTime = dayjs().format("YYYY-MM-DD");
+      this.stationName = "";
+      this.spEarningTypeId = "";
+      this.couponType = "";
       this.taskdataSelect();
     },
     // 查询
@@ -1715,6 +1759,7 @@ export default {
       this.dataSelect();
     },
     animeDat2(state) {
+      // this.$router.replace({ refund: '' })
       this.page = 1;
       this.taskdataSelect();
     },
@@ -1739,6 +1784,8 @@ export default {
     },
     // 获取数据列表
     taskdataSelect() {
+      console.log(this.refundStartTime);
+
       this.totalMoney = 0;
       this.tableDataLoading = true;
       this.$http({
@@ -1750,7 +1797,7 @@ export default {
           phone: this.phone,
           userName: this.userName,
           orderNumber: this.orderNumber,
-          transactionId:this.transactionId,
+          transactionId: this.transactionId,
           status: this.status,
           shopName: this.shopName,
           orderType: this.orderType,
@@ -1759,11 +1806,13 @@ export default {
           riderPhone: this.riderPhone,
           startTime: this.startTime,
           endTime: this.endTime,
+          refundStartTime: this.refundStartTime,
+          refundEndTime: this.refundEndTime,
           payStartTime: this.payStartTime,
           payEndTime: this.payEndTime,
           riderStationId: this.stationName,
-          shopTypeId:this.spEarningTypeId,
-          couponType:this.couponType
+          shopTypeId: this.spEarningTypeId,
+          couponType: this.couponType
         })
       }).then(({ data }) => {
         console.log(data, "订单中心");
@@ -1773,33 +1822,33 @@ export default {
           this.tableData2 = returnData;
           console.log(this.tableData2, "hhhhh");
           for (var i in this.tableData2.list) {
-          this.tableData2.list[i].goodsPriceZ = 0;
-          this.totalMoney = this.totalMoney + this.tableData2.list[i].payMoney;
-          if (this.tableData2.list[i].address) {
-            this.tableData2.list[i].address = JSON.parse(
-              this.tableData2.list[i].address
-            );
-          }
+            this.tableData2.list[i].goodsPriceZ = 0;
+            this.totalMoney =
+              Number(this.totalMoney) +
+              Number(this.tableData2.list[i].payMoney);
+            if (this.tableData2.list[i].address) {
+              this.tableData2.list[i].address = JSON.parse(
+                this.tableData2.list[i].address
+              );
+            }
 
-          for (var j in this.tableData2.list[i].orderGoodsList) {
-            this.tableData2.list[i].orderGoodsList[j].goodsPriceZ =
-              this.tableData2.list[i].orderGoodsList[j].goodsPrice *
-              this.tableData2.list[i].orderGoodsList[j].goodsNum;
+            for (var j in this.tableData2.list[i].orderGoodsList) {
+              this.tableData2.list[i].orderGoodsList[j].goodsPriceZ =
+                this.tableData2.list[i].orderGoodsList[j].goodsPrice *
+                this.tableData2.list[i].orderGoodsList[j].goodsNum;
 
-            this.tableData2.list[i].goodsPriceZ =
-              this.tableData2.list[i].goodsPriceZ +
-              this.tableData2.list[i].orderGoodsList[j].goodsPriceZ;
-          }
+              this.tableData2.list[i].goodsPriceZ =
+                this.tableData2.list[i].goodsPriceZ +
+                this.tableData2.list[i].orderGoodsList[j].goodsPriceZ;
+            }
           }
           this.totalMoney = this.totalMoney.toFixed(2);
-          if(!data.data.totalCount){
+          if (!data.data.totalCount) {
             this.$message({
               message: "此时间段暂无数据",
               type: "success",
               duration: 1500,
-              onClose: () => {
-
-              }
+              onClose: () => {}
             });
           }
         } else {
@@ -1935,7 +1984,7 @@ export default {
         method: "post",
         params: this.$http.adornParams({
           orderId: row.orderId,
-          isAppend: 1,// 1 默认补打
+          isAppend: 1 // 1 默认补打
         })
       }).then(({ data }) => {
         if (data.code == 0) {
@@ -2209,7 +2258,7 @@ export default {
             phone: this.phone,
             userName: this.userName,
             orderNumber: this.orderNumber,
-            transactionId:this.transactionId,
+            transactionId: this.transactionId,
             status: this.status,
             shopName: this.shopName,
             orderSequence: this.orderSequence,
@@ -2221,9 +2270,11 @@ export default {
             endTime: this.endTime,
             payStartTime: this.payStartTime,
             payEndTime: this.payEndTime,
+            refundStartTime: this.refundStartTime,
+            refundEndTime: this.refundEndTime,
             riderStationId: this.stationName,
-            shopTypeId:this.spEarningTypeId,
-            couponType:this.couponType
+            shopTypeId: this.spEarningTypeId,
+            couponType: this.couponType
           })
         }).then(({ data }) => {
           console.log(data, "导出");
@@ -2252,17 +2303,119 @@ export default {
     },
     exportAffirm() {
       this.exportVisible = false;
+    },
+    getPath() {
+      console.log("监控路由获取参数", this.$route.params.refund);
+      if (this.$route.params.type == "platform") {
+        console.log(this.$route.params, "平台-钩子中获取参数");
+        if (this.$route.params.refund == 14) {
+          this.status = this.$route.params.refund;
+          this.payStartTime = "";
+          this.payEndTime = "";
+          this.refundStartTime = this.$route.params.dayId + " " + "00:00:00";
+          this.refundEndTime = this.$route.params.dayId + " " + "23:59:59";
+          this.taskdataSelect();
+        } else if (this.$route.params.refund == 15) {
+          this.status = this.$route.params.refund;
+          this.payStartTime = this.$route.params.dayId + " " + "00:00:00";
+          this.payEndTime = this.$route.params.dayId + " " + "23:59:59";
+          this.refundStartTime = "";
+          this.refundEndTime = "";
+          this.taskdataSelect();
+        } else {
+          this.status = "";
+          this.refundStartTime = "";
+          this.refundEndTime = "";
+          this.payStartTime = "";
+          this.payEndTime = "";
+          this.taskdataSelect();
+        }
+      } else if (this.$route.params.type == "shop") {
+        if (this.$route.params.refund == 14) {
+          console.log(this.$route.params, "商家-钩子中获取参数");
+          this.status = this.$route.params.refund;
+          this.payStartTime = "";
+          this.payEndTime = "";
+          this.shopName = this.$route.params.shopName;
+          this.refundStartTime = this.$route.params.dayId + " " + "00:00:00";
+          this.refundEndTime = this.$route.params.dayId + " " + "23:59:59";
+          this.taskdataSelect();
+        }
+      } else {
+        this.status = "";
+        this.shopName = "";
+        this.refundStartTime = "";
+        this.refundEndTime = "";
+        this.payStartTime = dayjs()
+          .subtract(6, "day")
+          .format("YYYY-MM-DD");
+        this.payEndTime = dayjs().format("YYYY-MM-DD");
+        this.taskdataSelect();
+      }
     }
   },
+  watch: {
+    $route: "getPath"
+  },
+  beforeMount() {},
 
   mounted() {
     // this.classifySelect()
-    this.taskdataSelect();
+    // this.taskdataSelect();
     this.stationList();
-    this.shopTypeList()
+    this.shopTypeList();
     // let endTime=dayjs().format('YYYY-MM-DD')
     // let startTime=dayjs().subtract(6, 'day').format('YYYY-MM-DD')
     // console.log(startTime,endTime);
+
+    this.$nextTick(() => {
+      if (this.$route.params.type == "platform") {
+        console.log(this.$route.params, "平台-钩子中获取参数");
+        if (this.$route.params.refund == 14) {
+          this.status = this.$route.params.refund;
+          this.payStartTime = "";
+          this.payEndTime = "";
+          this.refundStartTime = this.$route.params.dayId + " " + "00:00:00";
+          this.refundEndTime = this.$route.params.dayId + " " + "23:59:59";
+          this.taskdataSelect();
+        } else if (this.$route.params.refund == 15) {
+          this.status = this.$route.params.refund;
+          this.payStartTime = this.$route.params.dayId + " " + "00:00:00";
+          this.payEndTime = this.$route.params.dayId + " " + "23:59:59";
+          this.refundStartTime = "";
+          this.refundEndTime = "";
+          this.taskdataSelect();
+        } else {
+          this.status = "";
+          this.refundStartTime = "";
+          this.refundEndTime = "";
+          this.payStartTime = "";
+          this.payEndTime = "";
+          this.taskdataSelect();
+        }
+      } else if (this.$route.params.type == "shop") {
+        if (this.$route.params.refund == 14) {
+          console.log(this.$route.params, "商家-钩子中获取参数");
+          this.status = this.$route.params.refund;
+          this.payStartTime = "";
+          this.payEndTime = "";
+          this.shopName = this.$route.params.shopName;
+          this.refundStartTime = this.$route.params.dayId + " " + "00:00:00";
+          this.refundEndTime = this.$route.params.dayId + " " + "23:59:59";
+          this.taskdataSelect();
+        }
+      } else {
+        this.status = "";
+        this.shopName = "";
+        this.refundStartTime = "";
+        this.refundEndTime = "";
+        this.payStartTime = dayjs()
+          .subtract(6, "day")
+          .format("YYYY-MM-DD");
+        this.payEndTime = dayjs().format("YYYY-MM-DD");
+        this.taskdataSelect();
+      }
+    });
   }
 };
 </script>

src/views/riderTop/riderTop.vue

@@ -91,13 +91,13 @@
 					<div>{{scope.$index+1}}</div>
 				</template> -->
       </el-table-column>
-      <el-table-column prop="nickName" label="骑手姓名" width="120">
+      <el-table-column prop="riderNickName" label="骑手姓名" width="120">
         <template slot-scope="scope">
           <div
             style="color: #4f9dec;cursor: pointer;"
             @click="updatesvideo(scope.row)"
           >
-            {{ scope.row.nickName ? scope.row.nickName : "未绑定" }}
+            {{ scope.row.riderNickName ? scope.row.riderNickName : "未绑定" }}
           </div>
         </template>
       </el-table-column>
@@ -122,10 +122,10 @@
       <el-table-column prop="stationName" label="骑手所在地区">
       </el-table-column>
       <el-table-column prop="moneyOrder" label="总收益"> </el-table-column>
-      <el-table-column prop="moneyOrder" label="骑手余额"> </el-table-column>
+      <el-table-column prop="riderBalance" label="骑手余额"> </el-table-column>
       <!-- <el-table-column prop="createTime" label="创建时间" width="160">
 			</el-table-column> -->
-      <el-table-column label="操作" width="150" align="center">
+      <!-- <el-table-column label="操作" width="150" align="center">
         <template slot-scope="scope" v-if="scope.row.flag==1">
           <el-button
             size="mini"
@@ -137,7 +137,7 @@
             删除
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <div style="text-align: center;margin-top: 10px;">
       <el-pagination

src/views/runErrands/financeList.vue

@@ -40,7 +40,7 @@
             style="width: 200px;"
             @keydown.enter.native="phoneSelect"
             placeholder="请输入骑手手机号"
-            v-model="zhifubaoName"
+            v-model="riderPhone"
           ></el-input
           >&nbsp;&nbsp;&nbsp;
           <span
@@ -56,7 +56,7 @@
             style="width: 200px;"
             @keydown.enter.native="phoneSelect"
             placeholder="请输入骑手名称"
-            v-model="zhifubaoName"
+            v-model="riderName"
           ></el-input
           >&nbsp;&nbsp;&nbsp;
           <span
@@ -90,12 +90,12 @@
         <div style="margin:5px;display: inline-block;">
           <span>申请开始时间：</span>
           <el-date-picker
-            style="width: 160px;margin-left: 10px;"
+            style="width: 200px;margin-left: 10px;"
             v-model="startTime"
             align="right"
             type="datetime"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择开始时间"
           >
           </el-date-picker
@@ -104,12 +104,12 @@
         <div style="margin:5px;display: inline-block;">
           <span>申请截止时间：</span>
           <el-date-picker
-            style="width: 160px;margin-left: 10px;"
+            style="width: 200px;margin-left: 10px;"
             v-model="endTime"
             align="right"
             type="datetime"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择截止时间"
           >
           </el-date-picker
@@ -1142,6 +1142,8 @@ export default {
         }
       ],
       zhifubaoName: "",
+      riderPhone: "",
+      riderName: "",
       content: "",
       startTime: "",
       endTime: "",
@@ -1728,6 +1730,8 @@ export default {
     cleans2() {
       this.zhifubao = "";
       this.zhifubaoName = "";
+      this.riderPhone = "";
+      this.riderName = "";
       this.page = 1;
       this.indentState = "";
       this.phone = "";
@@ -1815,6 +1819,8 @@ export default {
           page: this.page,
           limit: this.limit,
           zhifubaoName: this.zhifubaoName,
+          phone:this.riderPhone,
+          userName:this.riderName,
           zhifubao: this.zhifubao,
           type: this.type,
           state: this.indentState,
@@ -1840,6 +1846,8 @@ export default {
         method: "get",
         params: this.$http.adornParams({
           zhifubaoName: this.zhifubaoName,
+          phone:this.riderPhone,
+          userName:this.riderName,
           zhifubao: this.zhifubao,
           type: this.type,
           state: this.indentState,
@@ -2075,6 +2083,8 @@ export default {
           params: this.$http.adornParams({
             userId: userId,
             zhifubaoName: this.zhifubaoName,
+            phone:this.riderPhone,
+            userName:this.riderName,
             zhifubao: this.zhifubao,
             type: this.type,
             state: this.indentState,
@@ -2112,12 +2122,66 @@ export default {
     },
     exportAffirm() {
       this.exportVisible = false;
+    },
+    getPath() {
+      // this.$router.push({ name: 'mission', params: { refund: '' } });
+      if (this.$route.params.type=='platform') {
+        console.log(this.$route.params,'平台-钩子中获取参数');
+        this.indentState = this.$route.params.refund;
+        this.startTime = this.$route.params.dayId+' '+"00:00:00";
+        this.endTime = this.$route.params.dayId+' '+"23:59:59";
+        this.dataSelect()
+      }else if (this.$route.params.type=='rider') {
+        console.log(this.$route.params,'骑手-钩子中获取参数');
+        this.indentState = this.$route.params.refund;
+        this.riderPhone=this.$route.params.phone;
+        this.riderName=this.$route.params.userName;
+        this.startTime = this.$route.params.dayId+' '+"00:00:00";
+        this.endTime = this.$route.params.dayId+' '+"23:59:59";
+        this.dataSelect()
+      }
+      else {
+        this.riderPhone=''
+        this.riderName=''
+        this.indentState = "";
+        this.startTime = "";
+        this.endTime =""
+        this.dataSelect()
+      }
     }
   },
+  watch: {
+    $route: "getPath"
+  },
   mounted() {
-    this.dataSelect();
+    // this.dataSelect();
     this.stationList();
     this.transferClick();
+    this.$nextTick(() => {
+      if (this.$route.params.type=='platform') {
+        console.log(this.$route.params,'平台-钩子中获取参数');
+        this.indentState = this.$route.params.refund;
+        this.startTime = this.$route.params.dayId+' '+"00:00:00";
+        this.endTime = this.$route.params.dayId+' '+"23:59:59";
+        this.dataSelect()
+      }else if (this.$route.params.type=='rider') {
+        console.log(this.$route.params,'骑手-钩子中获取参数');
+        this.indentState = this.$route.params.refund;
+        this.riderPhone=this.$route.params.phone;
+        this.riderName=this.$route.params.userName;
+        this.startTime = this.$route.params.dayId+' '+"00:00:00";
+        this.endTime = this.$route.params.dayId+' '+"23:59:59";
+        this.dataSelect()
+      }
+      else {
+        this.riderPhone=''
+        this.riderName=''
+        this.indentState = "";
+        this.startTime = "";
+        this.endTime =""
+        this.dataSelect()
+      }
+    });
   }
 };
 </script>

src/views/shopsList/shopDatas.vue

@@ -825,6 +825,15 @@
     },
     mounted() {
       this.shopId = this.$route.query.shopId
+
+      if (this.$route.params.type=='shop'){
+        console.log('商家-收入提现跳转参数',this.$route.params);
+        this.flag=this.$route.params.flag
+        this.info.stockDate = this.$route.params.dayId
+      }else{
+        this.flag="day"
+        this.info.stockDate=this.getNowTime()
+      }
       this.classifySelect()
       this.taskdataSelect()
 
@@ -832,7 +841,6 @@
     watch: {
       '$route': 'taskdataSelect',
       '$route': 'classifySelect'
-
     }
   }
 </script>

src/views/user/userDetail.vue

@@ -2268,6 +2268,17 @@
       // 获取数据列表
       dataSelect() {
         let userId = this.$route.query.userId
+        if(this.$route.params.type=='rider'){
+          console.log(this.$route.params,'骑手-收入笔数跳转');
+          this.activeName=this.$route.params.activeName
+          this.flag=this.$route.params.flag
+          this.info.stockDate=this.$route.params.dayId
+          this.taskData()
+        }else{
+          this.activeName="first"
+          this.flag="day"
+          this.info.stockDate=this.getNowTime()
+        }
         this.$http({
           url: this.$http.adornUrl('admin/dataCentre/selectUserById'),
           method: 'get',
@@ -3294,5 +3305,5 @@
     margin-right: 5px;
   }
 
-  
+
 </style>