From 204e353d6a5a080cad4e262a0ea490f7ef1b306e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Sat, 2 Nov 2024 08:31:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B9=E7=AB=99=E8=B4=A2=E5=8A=A1=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../runningWater/tab/oilDepot.vue             | 51 +++++++------------
 1 file changed, 18 insertions(+), 33 deletions(-)

diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
index 818a30951..f902bfc63 100644
--- a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
+++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
@@ -5,24 +5,16 @@
       <div class="wgang">
         <div style="display: flex;align-items: center ">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
-            <el-form-item label="">
-
-              <el-date-picker
-                v-model="beginTime"
-                style="width: 140px"
-                type="date"
-                @change="getDays()"
-                placeholder="开始日期">
-              </el-date-picker>
-              至
-              <el-date-picker
-                v-model="endTime"
-                style="width: 140px"
-                type="date"
-                @change="getDays()"
-                placeholder="结束日期">
-              </el-date-picker>
-            </el-form-item>
+            <el-date-picker
+              v-model="this.dateRange"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
           </el-form>
         </div>
         <div>
@@ -33,7 +25,7 @@
     <div class="wit_box">
       <div class="box-gang">
         <div class="box">
-          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
+          <el-tooltip class="item" effect="dark" content="订单总金额（元）/笔数" placement="top-start">
             <div class="size-bole">0/0</div>
           </el-tooltip>
           <div class="size-hui">
@@ -42,8 +34,8 @@
           </div>
         </div>
         <div class="box">
-          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole" style="color:#00CAFF;">0/0</div>
+          <el-tooltip class="item" effect="dark" content="实收总金额（元）" placement="top-start">
+            <div class="size-bole" style="color:#00CAFF;">0</div>
           </el-tooltip>
           <div class="size-hui">
             <div class="dian" style="background: #00CAFF"></div>
@@ -51,7 +43,7 @@
           </div>
         </div>
         <div class="box">
-          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
+          <el-tooltip class="item" effect="dark" content="退款总金额（元）/笔数" placement="top-start">
             <div class="size-bole" style="color:#F44522;" >0/0</div>
           </el-tooltip>
 
@@ -61,10 +53,9 @@
           </div>
         </div>
         <div class="box">
-          <el-tooltip class="item" effect="dark" content="999999/999999999999" placement="top-start">
-            <div class="size-bole"  style="color:#FF7E00;" >{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0</div>
+          <el-tooltip class="item" effect="dark" content="日均订单金额（元）" placement="top-start">
+            <div class="size-bole"  style="color:#FF7E00;" >{{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}</div>
           </el-tooltip>
-
           <div class="size-hui">
             <div class="dian" style="background: #FF7E00"></div>
             <div class="nei">日均订单金额（元）</div>
@@ -211,7 +202,6 @@ import {
           this.$download.saveAs(blob,'油站流水订单统计.xLsx')
         })
       },
-      // 获取订单统计信息
 
       getOrderStatistics() {
         let dateRange = []
@@ -231,17 +221,12 @@ import {
 
       // 获取列表信息
       getList(val){
-        let dateRange = []
-        if (this.beginTime && this.endTime) {
-          dateRange.push(this.beginTime.toLocaleDateString())
-          dateRange.push(this.endTime.toLocaleDateString())
-        }
-        getInstituionListApi2(this.addDateRange(this.queryParams,dateRange)).then( response => {
+        getInstituionListApi2(this.queryParams).then( response => {
           this.orderList = response.data.records;
           this.total = response.data.total;
           this.isSysDate = false
         })
-        this.getOrderStatistics()
+        //this.getOrderStatistics()
       },
 
       // 搜索按钮操作