增加充电订单里面的结算时间

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)

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) {

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` 
             );
         },
     },

jsowell-ui/src/views/pile/station/orderReport.vue

@@ -290,6 +290,7 @@ export default {
         tradeDate: null,
         tradeAmount: null,
         tradeFee: null,
+        
       },
       // 表单参数
       form: {},