From edc81b113b4265d98ed3bc7522ff771ed9b0ce83 Mon Sep 17 00:00:00 2001
From: "BOOL\\25024" <http://192.168.2.2:8099/jsowell/jsowell-uniapp.git>
Date: Tue, 25 Jul 2023 15:00:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=85=E7=94=B5=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=87=8C=E9=9D=A2=E7=9A=84=E7=BB=93=E7=AE=97=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/utils/request.js               |  1 +
 jsowell-ui/src/views/order/order/index.vue    | 24 +++++++++++++++++++
 jsowell-ui/src/views/pile/station/index.vue   |  2 +-
 .../src/views/pile/station/orderReport.vue    |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/jsowell-ui/src/utils/request.js b/jsowell-ui/src/utils/request.js
index 84b250d20..894692335 100644
--- a/jsowell-ui/src/utils/request.js
+++ b/jsowell-ui/src/utils/request.js
@@ -50,6 +50,7 @@ service.interceptors.request.use(config => {
       const s_data = sessionObj.data;                // 请求数据
       const s_time = sessionObj.time;                // 请求时间
       const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
+      
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
         const message = '数据正在处理，请勿重复提交';
         console.warn(`[${s_url}]: ` + message)
diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue
index d19cfe593..839898c25 100644
--- a/jsowell-ui/src/views/order/order/index.vue
+++ b/jsowell-ui/src/views/order/order/index.vue
@@ -82,6 +82,19 @@
                         :clearable="false"
                     ></el-date-picker>
                 </el-form-item>
+                <el-form-item label="结算时间">
+                    <el-date-picker
+                        v-model="comeTimeRange"
+                        style="width: 240px"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        :default-time="['00:00:00', '23:59:59']"
+                        type="daterange"
+                        range-separator="-"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                        :clearable="false"
+                    ></el-date-picker>
+                </el-form-item>
             </div>
             <el-button
                 @click="showOrHide()"
@@ -335,6 +348,8 @@ export default {
                 merchantId: null,
                 startTime: null,
                 endTime: null,
+                startSettleTime:null,
+                endSettleTime:null,
             },
             // 表单参数
             form: {},
@@ -344,6 +359,8 @@ export default {
             stationList: [],
             // 订单创建时间范围
             createTimeRange: [],
+            // 订单创建结束范围
+            comeTimeRange: [],
         };
     },
     mounted() {
@@ -663,6 +680,13 @@ export default {
                 this.queryParams.endTime = newValue[1];
             }
         },
+        comeTimeRange(newValue, oldValue) {
+            // console.log("comeTimeRange发生变化", newValue, oldValue);
+            if (newValue != null && newValue.length > 0) {
+                this.queryParams.startSettleTime = newValue[0];
+                this.queryParams.endSettleTime = newValue[1];
+            }
+        }
     },
     computed: {
         tagType(row) {
diff --git a/jsowell-ui/src/views/pile/station/index.vue b/jsowell-ui/src/views/pile/station/index.vue
index 02e7128a9..7307e3650 100644
--- a/jsowell-ui/src/views/pile/station/index.vue
+++ b/jsowell-ui/src/views/pile/station/index.vue
@@ -566,7 +566,7 @@ export default {
                 {
                     ...this.queryParams,
                 },
-                `station_${new Date().getTime()}.xlsx`
+                `station_${new Date().getTime()}.xlsx` 
             );
         },
     },
diff --git a/jsowell-ui/src/views/pile/station/orderReport.vue b/jsowell-ui/src/views/pile/station/orderReport.vue
index 31765af21..d62afa43a 100644
--- a/jsowell-ui/src/views/pile/station/orderReport.vue
+++ b/jsowell-ui/src/views/pile/station/orderReport.vue
@@ -290,6 +290,7 @@ export default {
         tradeDate: null,
         tradeAmount: null,
         tradeFee: null,
+        
       },
       // 表单参数
       form: {},