From 2e3adf807c3c198746d3d51fbab4d71bdf22af81 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 10 十一月 2023 10:14:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev

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

diff --git a/admin/src/views/business/wxBill.vue b/admin/src/views/business/wxBill.vue
index 61198a1..ad11cba 100644
--- a/admin/src/views/business/wxBill.vue
+++ b/admin/src/views/business/wxBill.vue
@@ -17,6 +17,7 @@
       <section>
         <el-button type="primary" @click="search">鎼滅储</el-button>
         <el-button @click="reset">閲嶇疆</el-button>
+        <el-button @click="$refs.Synchronous.open('鎵嬪姩鍚屾璐﹀崟')" :permissions="['business:wxbill:create']">鎵嬪姩鍚屾璐﹀崟</el-button>
       </section>
     </el-form>
     <!-- 琛ㄦ牸鍜屽垎椤� -->
@@ -44,7 +45,7 @@
         </div>
         <div class="sum-value">
           <div>閫�娆鹃噾棰�(鍏�)</div>
-          <div>{{ sumData.sumRefundBill }}</div>
+          <div>{{ sumData.sumRefundFee }}</div>
         </div>
         <div class="sum-value">
           <div>閫�娆炬墜缁垂(鍏�)</div>
@@ -83,6 +84,7 @@
       >
       </pagination>
     </template>
+    <Synchronous ref="Synchronous" />
   </TableLayout>
 </template>
 
@@ -90,18 +92,19 @@
 import BaseTable from '@/components/base/BaseTable'
 import TableLayout from '@/layouts/TableLayout'
 import Pagination from '@/components/common/Pagination'
-import { formatDateTime } from '@/utils/util'
+import Synchronous from '@/components/business/synchronous'
+// import { formatDateTime } from '@/utils/util'
 export default {
   name: 'WxBill',
   extends: BaseTable,
-  components: { TableLayout, Pagination },
+  components: { TableLayout, Pagination, Synchronous },
   data () {
     return {
       value1: [],
       // 鎼滅储
       searchForm: {
         endDate: '',
-        startDate: '',
+        startDate: ''
       },
       sumData: {
 
@@ -118,24 +121,24 @@
     })
     this.pickerOptions.disabledDate = (time) => {
 	    // 涓�澶�
-      let tempTime = 3600 * 1000 * 24 
+      const tempTime = 3600 * 1000 * 24
       return time.getTime() > new Date() - tempTime
     }
-    // let tempTime = new Date().getTime() - 3600 * 1000 * 24 
+    // 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: {
-    reset() {
+    reset () {
       this.searchForm.startDate = ''
       this.searchForm.endDate = ''
       this.value1 = []
       this.$refs.searchForm.resetFields()
       this.search()
     },
-    selectDate(v) {
+    selectDate (v) {
       this.searchForm.startDate = ''
       this.searchForm.endDate = ''
       if (v) {
@@ -166,8 +169,8 @@
         .finally(() => {
           this.isWorking.search = false
         })
-    },
-  },
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -177,6 +180,7 @@
   margin-bottom: 10px;
   background-color: rgb(243, 243, 251);
   .sum-title {
+    flex-shrink: 0;
     background-color: rgb(111, 129, 198);
     color: #fff;
     font-weight: 500;

--
Gitblit v1.9.3