订单中心添加默认时间筛选

config/index.js

@@ -1,47 +1,40 @@
-"use strict";
+'use strict'
 // Template version: 1.2.5
 // see http://vuejs-templates.github.io/webpack for documentation.
 
-const path = require("path");
-const devEnv = require("./dev.env");
+const path = require('path')
+const devEnv = require('./dev.env')
 
 module.exports = {
   configureWebpack: {
     module: {
-      rules: [
-        {
-          test: /\.mjs$/,
-          include: /node_modules/,
-          type: "javascript/auto"
-        }
-      ]
+      rules: [{
+        test: /\.mjs$/,
+        include: /node_modules/,
+        type: 'javascript/auto'
+      }]
     }
   },
   dev: {
-    // Paths
-    assetsSubDirectory: "static",
-    // assetsPublicPath: "/wm-test/", // 测试
-    assetsPublicPath: "/wm-admin/", // 线上
-    // assetsPublicPath: "/",  // 开发
 
+    // Paths
+    assetsSubDirectory: 'static',
+    assetsPublicPath: '/',
     // 代理列表, 是否开启代理通过[./dev.env.js]配置
-    proxyTable:
-      devEnv.OPEN_PROXY === false
-        ? {}
-        : {
-            "/proxyApi": {
-              target: "https://mxys.chuanghai-tech.com/sqx_fast/", // 线上
-              // target: "https://mxys.chuanghai-tech.com/wm-test/wm-api", // 测试
-              // target: 'http://iyfpk3.natappfree.cc/sqx_fast',// 开发
-              changeOrigin: true,
-              pathRewrite: {
-                "^/proxyApi": ""
-              }
-            }
-          },
+    proxyTable: devEnv.OPEN_PROXY === false ? {} : {
+      '/proxyApi': {
+        // target: 'https://mxys.chuanghai-tech.com/sqx_fast/', // 线上
+        target: 'https://mxys.chuanghai-tech.com/wm-test/wm-api',// 测试
+        // target: 'http://iyfpk3.natappfree.cc/sqx_fast',// 开发
+        changeOrigin: true,
+        pathRewrite: {
+          '^/proxyApi': ''
+        }
+      },
+    },
 
     // Various Dev Server settings
-    host: "127.0.0.1", // can be overwritten by process.env.HOST
+    host: '127.0.0.1', // can be overwritten by process.env.HOST
     port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
@@ -61,7 +54,7 @@ module.exports = {
      */
 
     // https://webpack.js.org/configuration/devtool/#development
-    devtool: "eval-source-map",
+    devtool: 'eval-source-map',
 
     // If you have problems debugging vue-files in devtools,
     // set this to false - it *may* help
@@ -73,32 +66,32 @@ module.exports = {
     // (https://github.com/webpack/css-loader#sourcemaps)
     // In our experience, they generally work as expected,
     // just be aware of this issue when enabling this option.
-    cssSourceMap: false
+    cssSourceMap: false,
   },
 
   build: {
     // Template for index.html
-    index: path.resolve(__dirname, "../dist/index.html"),
+    index: path.resolve(__dirname, '../dist/index.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, "../dist"),
-    assetsSubDirectory: "static",
-    assetsPublicPath: "/wm-admin",
+    assetsRoot: path.resolve(__dirname, '../dist'),
+    assetsSubDirectory: 'static',
+    assetsPublicPath: '/wm-admin',
 
     /**
      * Source Maps
      */
 
-    productionSourceMap: false, //隐藏源码
+    productionSourceMap: false,//隐藏源码
     // https://webpack.js.org/configuration/devtool/#production
-    devtool: "#source-map",
+    devtool: '#source-map',
 
     // Gzip off by default as many popular static hosts such as
     // Surge or Netlify already gzip all static assets for you.
     // Before setting to `true`, make sure to:
     // npm install --save-dev compression-webpack-plugin
     productionGzip: false,
-    productionGzipExtensions: ["js", "css"],
+    productionGzipExtensions: ['js', 'css'],
 
     // Run the build command with an extra argument to
     // View the bundle analyzer report after build finishes:
@@ -106,4 +99,4 @@ module.exports = {
     // Set to `true` or `false` to always turn it on or off
     bundleAnalyzerReport: process.env.npm_config_report
   }
-};
+}

npm-shrinkwrap.json

@@ -3456,6 +3456,11 @@
 			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
 			"integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI="
 		},
+		"dayjs": {
+			"version": "1.11.13",
+			"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
+			"integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+		},
 		"de-indent": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",

package.json

@@ -18,6 +18,7 @@
     "babel-plugin-component": "0.10.1",
     "babel-polyfill": "6.26.0",
     "crypto-js": "^4.2.0",
+    "dayjs": "^1.11.13",
     "element-china-area-data": "^5.0.2",
     "element-ui": "2.8.2",
     "fs": "0.0.1-security",

src/main.js

@@ -32,8 +32,7 @@ Vue.use(Viewer, {
   }
 });
 // Vue.prototype.Tupiantou ='https://mxys.chuanghai-tech.com/sqx_fast/alioss/upload'//线上
-Vue.prototype.Tupiantou =
-  "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast/alioss/upload"; //线下
+Vue.prototype.Tupiantou ="https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast/alioss/upload"; //线下
 Vue.prototype.Tupian = function(img) {
   return "https://mxys.chuanghai-tech.com/wmfile" + img;
 }; //全局图片请求头

src/utils/httpRequest.js

@@ -71,8 +71,8 @@ http.adornUrl = actionName => {
   // return 'http://iyfpk3.natappfree.cc/sqx_fast/' + actionName; // 开发
   // return 'https://www.daweilinli.com/sqx_fast/' + actionName
   // return 'http://192.168.0.131:8171/sqx_fast/' + actionName
-  return "https://mxys.chuanghai-tech.com/sqx_fast/" + actionName; //  线上
-  // return "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast/" + actionName;// 测试
+  // return 'https://mxys.chuanghai-tech.com/sqx_fast/' + actionName; //  线上
+  return "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast/" + actionName;// 测试
 };
 
 http.adornUrl2 = actionName => {

src/views/entryManagement/entryManagement.vue

@@ -83,6 +83,18 @@
           >
           </el-date-picker>
         </div>
+        <div style="display: inline-block;margin: 5px;">
+          <span>异常订单:</span>
+          <el-select
+            @change="phoneSelect"
+            :clearable="true"
+            v-model="flag"
+            placeholder="请选择异常订单"
+          >
+            <el-option label="非异常" value="0"></el-option>
+            <el-option label="异常" value="1"></el-option>
+          </el-select>
+        </div>
         <el-button
           style="margin-left:15px;"
           size="mini"
@@ -108,14 +120,14 @@
         >
           导出Excel
         </el-button>
-        <el-button
+        <!-- <el-button
           style="margin-left:15px;"
           size="mini"
           type="primary"
           icon="document"
           @click="abnormity"
           >查询异常订单</el-button
-        >
+        > -->
       </div>
       <div style="color: orange;">
         *
@@ -271,6 +283,7 @@ export default {
       orderNumber: "", //订单号
       startTime: "", //开始时间：
       endTime: "", //截止时间：
+      flag: "", //异常订单
 
       limit: 10,
       page: 1,
@@ -302,7 +315,8 @@ export default {
           couponName: this.activityTitle,
           orderNumber: this.orderNumber,
           startTime: this.startTime,
-          endTime: this.endTime
+          endTime: this.endTime,
+          flag:this.flag
         })
       }).then(({ data }) => {
         console.log(data, "入账管理");
@@ -403,7 +417,8 @@ export default {
             couponName: this.activityTitle,
             orderNumber: this.orderNumber,
             startTime: this.startTime,
-            endTime: this.endTime
+            endTime: this.endTime,
+            flag:this.flag
           })
         }).then(({ data }) => {
           console.log(data, "导出");

src/views/finance/financeList.vue

@@ -98,6 +98,34 @@
           >
           </el-date-picker>
         </div>
+        <div style="margin:5px;display: inline-block;">
+          <span>操作开始时间：</span>
+          <el-date-picker
+            style="width: 160px;margin-left: 10px;"
+            v-model="outstartTime"
+            align="right"
+            type="datetime"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择开始时间"
+          >
+          </el-date-picker
+          >&nbsp;&nbsp;&nbsp;
+        </div>
+        <div style="margin:5px;display: inline-block;">
+          <span>操作截止时间：</span>
+          <el-date-picker
+            style="width: 160px;margin-left: 10px;"
+            v-model="outendTime"
+            align="right"
+            type="datetime"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择截止时间"
+          >
+          </el-date-picker
+          >&nbsp;&nbsp;&nbsp;
+        </div>
         <div style="position: relative;display: inline-block;margin:5px;">
           <span>提现总金额：{{ totalMoney }}</span>
         </div>
@@ -119,7 +147,7 @@
           @click="cleans2"
           >重置
         </el-button>
-        <el-button
+        <!-- <el-button
           style="margin:0 0 20px 20px;"
           size="mini"
           type="primary"
@@ -132,6 +160,16 @@
           批量转账
         </el-button>
         <el-button
+          style="margin:0 0 20px 20px;"
+          size="mini"
+          type="warning"
+          icon="document"
+          @click="transferRefuseClcik()"
+          :disabled="checkBoxData.length <= 0 || !isAuth('financeList:refund')"
+        >
+          批量拒绝
+        </el-button> -->
+        <el-button
           style="margin-left:15px;"
           size="mini"
           type="warning"
@@ -1166,6 +1204,8 @@ export default {
       content: "",
       startTime: "",
       endTime: "",
+      outstartTime:"",
+      outendTime:"",
       cashId: "",
       type: -1,
       totalnum: 0,
@@ -1290,7 +1330,7 @@ export default {
                 this.$notify({
                   title: "提示",
                   duration: 1800,
-                  message: data.msg,
+                  message:'转账成功',
                   type: "warning"
                 });
                 // this.dataSelect();
@@ -1299,7 +1339,7 @@ export default {
                 this.$notify({
                   title: "提示",
                   duration: 1800,
-                  message: data.msg,
+                  message: '转账失败',
                   type: "error"
                 });
                 // this.dataSelect();
@@ -1317,7 +1357,7 @@ export default {
                 this.$notify({
                   title: "提示",
                   duration: 1800,
-                  message: data.msg,
+                  message: '转账成功',
                   type: "warning"
                 });
                 // this.dataSelect();
@@ -1337,7 +1377,7 @@ export default {
                 this.$notify({
                   title: "提示",
                   duration: 1800,
-                  message: data.msg,
+                  message: '转账失败',
                   type: "error"
                 });
                 // this.dataSelect();
@@ -1375,6 +1415,47 @@ export default {
       // });
       // }
     }, 100),
+    // 批量拒绝
+    transferRefuseClcik: debounce(function(id) {
+      var ids = id
+        ? [id]
+        : this.checkBoxData.map(item => {
+            return item.id;
+          });
+      console.log(ids, "勾选的ids");
+      for (var i in ids) {
+        this.$http({
+          url: this.$http.adornUrl(`cash/refund`),
+          method: "post",
+          params: this.$http.adornParams({
+            cashId: ids[i],
+            content: ""
+          })
+        }).then(({ data }) => {
+          // console.log(data, "rht转账");
+          if (data.code == 0) {
+            this.$notify({
+              title: "提示",
+              duration: 1800,
+              message: '操作成功',
+              type: "warning"
+            });
+            // this.dataSelect();
+            // return;
+          } else {
+            this.$notify({
+              title: "提示",
+              duration: 1800,
+              message: '操作失败',
+              type: "error"
+            });
+            // this.dataSelect();
+            return;
+          }
+        });
+      }
+      this.dataSelect();
+    }, 100),
     // 多选
     changeFun(val) {
       this.checkBoxData = val;
@@ -1832,7 +1913,9 @@ export default {
           state: this.indentState,
           phone: this.phone,
           startTime: this.startTime,
-          endTime: this.endTime
+          endTime: this.endTime,
+          outstartTime: this.outstartTime,
+          outendTime: this.outendTime
         })
       }).then(({ data }) => {
         console.log(data, "财务中心");
@@ -1856,7 +1939,9 @@ export default {
           state: this.indentState,
           phone: this.phone,
           startTime: this.startTime,
-          endTime: this.endTime
+          endTime: this.endTime,
+          outstartTime: this.outstartTime,
+          outendTime: this.outendTime,
         })
       }).then(({ data }) => {
         this.totalMoney = data.data;
@@ -2032,6 +2117,8 @@ export default {
       this.phone = "";
       this.startTime = "";
       this.endTime = "";
+      this.outstartTime = "";
+      this.outendTime = "";
       this.dataSelect();
     },
     //保证金查询
@@ -2119,7 +2206,9 @@ export default {
             phone: this.phone,
             state: this.indentState,
             startTime: this.startTime,
-            endTime: this.endTime
+            endTime: this.endTime,
+            outstartTime: this.outstartTime,
+          outendTime: this.outendTime,
           })
         }).then(({ data }) => {
           console.log(data, "导出");
@@ -2203,7 +2292,7 @@ export default {
             type: this.indentState3,
             classify: 2,
             startTime: this.startTime,
-            endTime: this.endTime
+            endTime: this.endTime,
           })
         }).then(({ data }) => {
           console.log(data, "导出");

src/views/mission/mission.vue

@@ -97,31 +97,39 @@
         <div style="position: relative;display: inline-block;margin: 3px;">
           <span>商铺类型：</span>
           <el-select
-            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"
+              v-model="spEarningTypeId"
+              style="width:200px;"
+              @change="phoneSelect"
+              :clearable="true"
             >
-            </el-option> </el-select
-          >&nbsp;&nbsp;&nbsp;
+              <el-option
+                v-for="item in spEarnings"
+                :key="item.id"
+                :label="item.shopTypeName"
+                :value="item.id"
+              >
+              </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>
@@ -365,7 +373,10 @@
           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="商户单号"
@@ -516,9 +527,7 @@
           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>
@@ -581,8 +590,7 @@
               v-if="scope.row.status === 6"
               :disabled="!isAuth('mission:qucan')"
               @click="wancheng(scope.row)"
-              >制作已完成</el-button
-            >
+            >制作已完成</el-button>
             <el-button
               size="mini"
               type="danger"
@@ -590,12 +598,11 @@
               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"
@@ -603,41 +610,38 @@
               :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"
@@ -645,8 +649,7 @@
               :disabled="!isAuth('orderCenterRun:zhuandan')"
               @click="zhuandan(scope.row)"
               style="margin: 3px;"
-              >转单</el-button
-            >
+            >转单</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -1045,16 +1048,16 @@
 </template>
 
 <script>
-import { getLastSevenDays } from "@/utils/lastSevenDays.js";
+import dayjs from "dayjs";
 export default {
   data() {
     return {
       dialogVisible: false,
       stationData: [], // 骑手站点数据
       stationName: "",
-      spEarnings: [], // 商铺类型数据
-      couponType: "", // 优惠券类型
-      spEarningTypeId: "",
+      spEarnings:[],// 商铺类型数据
+      couponType:'',// 优惠券类型
+      spEarningTypeId:"",
       imageUrl: [],
       limit: 10,
       page: 1,
@@ -1062,7 +1065,7 @@ export default {
       phone: "",
       userName: "",
       orderNumber: "",
-      transactionId: "", // 商户单号
+      transactionId:"",// 商户单号
       status: "",
       describes: "",
       token: "",
@@ -1244,7 +1247,7 @@ export default {
 
       tableData: [],
       tableData2: {},
-      shopMoney: "", // 店铺总交易
+      shopMoney:'',// 店铺总交易
       form: {
         id: "",
         classifyName: "",
@@ -1292,8 +1295,8 @@ export default {
       // },
       startTime: "",
       endTime: "",
-      payStartTime: "", //支付开始时间
-      payEndTime: "",
+      payStartTime: dayjs().subtract(6, 'day').format('YYYY-MM-DD'), //支付开始时间
+      payEndTime: dayjs().format('YYYY-MM-DD'),
 
       // 导出限制
       exportTitle: "导出错误",
@@ -1321,7 +1324,7 @@ export default {
         this.stationData = data.data;
       });
     },
-    shopTypeList() {
+    shopTypeList(){
       this.$http({
         url: this.$http.adornUrl("admin/shoptype/selectShopTypeList"),
         method: "get",
@@ -1330,7 +1333,7 @@ export default {
           limit: 1000
         })
       }).then(({ data }) => {
-        console.log(data, "商铺类型");
+        console.log(data,'商铺类型');
 
         let returnData = data.data.list;
         this.spEarnings = returnData;
@@ -1679,7 +1682,7 @@ export default {
       this.riderPhone = "";
       this.userName = "";
       this.orderNumber = "";
-      this.transactionId = "";
+      this.transactionId=""
       this.status = "";
       this.shopName = "";
       this.reservationFlag = "";
@@ -1687,11 +1690,11 @@ export default {
       this.orderType = "";
       this.startTime = "";
       this.endTime = "";
-      this.payStartTime = "";
-      this.payEndTime = "";
-      this.stationName = "";
-      this.spEarningTypeId = "";
-      this.couponType = "";
+      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();
     },
     // 查询
@@ -1738,7 +1741,6 @@ export default {
     taskdataSelect() {
       this.totalMoney = 0;
       this.tableDataLoading = true;
-
       this.$http({
         url: this.$http.adornUrl("admin/order/selectAllOrderAdmin"),
         method: "get",
@@ -1748,7 +1750,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,
@@ -1760,25 +1762,17 @@ export default {
           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, "订单中心");
-
-        this.tableDataLoading = false;
-        let returnData = data.data;
-        this.tableData2 = returnData;
-        if (this.tableData2.list.length == 0) {
-          this.$message({
-            message: `${this.payStartTime}--${this.payEndTime} 支付时间段暂无数据`,
-            type: "warning",
-            duration: 2500
-          });
-        }
-
-        console.log(this.tableData2, "hhhhh");
-        for (var i in this.tableData2.list) {
+        if (data.code == 0) {
+          this.tableDataLoading = false;
+          let returnData = data.data;
+          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) {
@@ -1796,8 +1790,26 @@ export default {
               this.tableData2.list[i].goodsPriceZ +
               this.tableData2.list[i].orderGoodsList[j].goodsPriceZ;
           }
+          }
+          this.totalMoney = this.totalMoney.toFixed(2);
+          if(!data.data.totalCount){
+            this.$message({
+              message: "此时间段暂无数据",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+
+              }
+            });
+          }
+        } else {
+          this.$message({
+            message: data.msg,
+            type: "error",
+            duration: 1500,
+            onClose: () => {}
+          });
         }
-        this.totalMoney = this.totalMoney.toFixed(2);
       });
       // this.$http({
       //   url: this.$http.adornUrl("admin/order/selectAllOrderTotalPrice"),
@@ -1923,7 +1935,7 @@ export default {
         method: "post",
         params: this.$http.adornParams({
           orderId: row.orderId,
-          isAppend: 1 // 1 默认补打
+          isAppend: 1,// 1 默认补打
         })
       }).then(({ data }) => {
         if (data.code == 0) {
@@ -2197,7 +2209,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,
@@ -2210,8 +2222,8 @@ export default {
             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, "导出");
@@ -2244,14 +2256,13 @@ export default {
   },
 
   mounted() {
-    let data = getLastSevenDays();
-    this.payStartTime = data[0];
-    this.payEndTime = data[6];
-
     // this.classifySelect()
     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);
   }
 };
 </script>

src/views/runErrands/financeList.vue

@@ -99,6 +99,35 @@
             ></el-option> </el-select
           >&nbsp;&nbsp;&nbsp;
         </div>
+        <div style="margin:5px;display: inline-block;">
+          <span>操作开始时间：</span>
+          <el-date-picker
+            style="width: 160px;margin-left: 10px;"
+            v-model="outstartTime"
+            align="right"
+            type="datetime"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择开始时间"
+          >
+          </el-date-picker
+          >&nbsp;&nbsp;&nbsp;
+        </div>
+        <div style="margin:5px;display: inline-block;">
+          <span>操作截止时间：</span>
+          <el-date-picker
+            style="width: 160px;margin-left: 10px;"
+            v-model="outendTime"
+            align="right"
+            type="datetime"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择截止时间"
+          >
+          </el-date-picker
+          >&nbsp;&nbsp;&nbsp;
+        </div>
+
         <div style="position: relative;display: inline-block;margin:5px;">
           <span>提现总金额：{{ totalMoney }}</span>
         </div>
@@ -1084,6 +1113,8 @@ export default {
       content: "",
       startTime: "",
       endTime: "",
+      outstartTime:"",
+      outendTime:"",
       cashId: "",
       type: 1,
       totalnum: 0,
@@ -1670,6 +1701,8 @@ export default {
       this.phone = "";
       this.startTime = "";
       this.endTime = "";
+      this.outstartTime = "";
+      this.outendTime = "";
       this.dataSelect();
     },
     phoneSelect1() {
@@ -1754,6 +1787,8 @@ export default {
           type: this.type,
           state: this.indentState,
           phone: this.phone,
+          outstartTime: this.outstartTime,
+          outendTime: this.outendTime,
           startTime: this.startTime,
           endTime: this.endTime,
           riderStationId: this.stationName
@@ -1779,6 +1814,8 @@ export default {
           phone: this.phone,
           startTime: this.startTime,
           endTime: this.endTime,
+          outstartTime: this.outstartTime,
+          outendTime: this.outendTime,
           riderStationId: this.stationName
         })
       }).then(({ data }) => {
@@ -2012,6 +2049,8 @@ export default {
             phone: this.phone,
             startTime: this.startTime,
             endTime: this.endTime,
+            outstartTime: this.outstartTime,
+            outendTime: this.outendTime,
             riderStationId: this.stationName // 骑手站点
           })
         }).then(({ data }) => {