From 805fcd4d881ac13d0fe9961076ead66a71c20b2d Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期六, 28 十月 2023 18:12:21 +0800
Subject: [PATCH] 10.28

---
 admin/src/views/business/wxBill.vue |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/admin/src/views/business/wxBill.vue b/admin/src/views/business/wxBill.vue
index 983a1ca..61198a1 100644
--- a/admin/src/views/business/wxBill.vue
+++ b/admin/src/views/business/wxBill.vue
@@ -9,6 +9,7 @@
           range-separator="鑷�"
           start-placeholder="寮�濮嬫棩鏈�"
           end-placeholder="缁撴潫鏃ユ湡"
+          :picker-options="pickerOptions"
           format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss"
           @change="selectDate"
         ></el-date-picker>
@@ -59,20 +60,21 @@
         :data="tableData.list"
         stripe
         border
+        show-summary
       >
-        <el-table-column prop="createDate" label="鏃ユ湡" min-width="100px" align="center"></el-table-column>
+        <el-table-column prop="id" label="鏃ユ湡" min-width="100px" align="center"></el-table-column>
         <el-table-column prop="sumBill" label="鏀舵绗旀暟" min-width="100px" align="center"></el-table-column>
-        <el-table-column prop="sumTotalFee" label="鏀舵閲戦" min-width="100px" align="center"></el-table-column>
-        <el-table-column prop="sumCmmsAmt" label="鏀舵鎵嬬画璐�" min-width="100px" align="center"></el-table-column>
+        <el-table-column prop="sumTotalFee" label="鏀舵閲戦(鍏�)" min-width="100px" align="center"></el-table-column>
+        <el-table-column prop="sumCmmsAmt" label="鏀舵鎵嬬画璐�(鍏�)" min-width="100px" align="center"></el-table-column>
         <el-table-column prop="sumRefundBill" label="閫�娆剧瑪鏁�" min-width="100px" align="center"></el-table-column>
-        <el-table-column prop="sumRefundFee" label="閫�娆鹃噾棰�" min-width="100px" align="center"></el-table-column>
-        <el-table-column prop="sumRefundCmmsAmt" label="閫�娆炬墜缁垂" min-width="100px" align="center"></el-table-column>
+        <el-table-column prop="sumRefundFee" label="閫�娆鹃噾棰�(鍏�)" min-width="100px" align="center"></el-table-column>
+        <el-table-column prop="sumRefundCmmsAmt" label="閫�娆炬墜缁垂(鍏�)" min-width="100px" align="center"></el-table-column>
 
         <!-- <el-table-column prop="sumSuccessFee" label="搴旂粨璁㈠崟鎬婚噾棰�" min-width="100px" align="center"></el-table-column>
         <el-table-column prop="sumCouponRefundFee" label="鍏呭�煎埜閫�娆炬�婚噾棰�" min-width="100px" align="center"></el-table-column>
         <el-table-column prop="sumApplyRefundFee" label="鐢宠閫�娆炬�婚噾棰�" min-width="100px" align="center"></el-table-column> -->
-        <el-table-column prop="total" label="缁撶畻閲戦" min-width="100px" align="center"></el-table-column>
-        <el-table-column prop="bikeFee" label="鑷杞︽敹鍏�" min-width="100px" align="center"></el-table-column>
+        <el-table-column prop="total" label="缁撶畻閲戦(鍏�)" min-width="100px" align="center"></el-table-column>
+        <el-table-column prop="bikeFee" label="鑷杞︽敹鍏�(鍏�)" min-width="100px" align="center"></el-table-column>
       </el-table>
       <pagination
         @size-change="handleSizeChange"
@@ -95,7 +97,7 @@
   components: { TableLayout, Pagination },
   data () {
     return {
-      value1: [new Date(), new Date()],
+      value1: [],
       // 鎼滅储
       searchForm: {
         endDate: '',
@@ -103,7 +105,8 @@
       },
       sumData: {
 
-      }
+      },
+      pickerOptions: {}
     }
   },
   created () {
@@ -113,7 +116,15 @@
       'field.id': 'id',
       'field.main': 'id'
     })
-    this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
+    this.pickerOptions.disabledDate = (time) => {
+	    // 涓�澶�
+      let tempTime = 3600 * 1000 * 24 
+      return time.getTime() > new Date() - tempTime
+    }
+    // let tempTime = new Date().getTime() - 3600 * 1000 * 24 
+    // this.searchForm.startDate = formatDateTime(new Date(tempTime), 'yyyy-MM-dd') + ' 00:00:00'
+    // this.searchForm.endDate = formatDateTime(new Date(tempTime), 'yyyy-MM-dd') + ' 23:59:59'
+    // this.value1 = [this.searchForm.startDate, this.searchForm.endDate]
     this.search()
   },
   methods: {

--
Gitblit v1.9.3