From f9691d544e62d6c04dbfe45d05a6c7bc5e004291 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十二月 2023 11:52:29 +0800
Subject: [PATCH] 服务商
---
admin/src/views/business/wxBill.vue | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/admin/src/views/business/wxBill.vue b/admin/src/views/business/wxBill.vue
index 3e35f4f..0f5042d 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>
@@ -16,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>
<!-- 琛ㄦ牸鍜屽垎椤� -->
@@ -43,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>
@@ -59,20 +61,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"
@@ -81,6 +84,7 @@
>
</pagination>
</template>
+ <Synchronous ref="Synchronous" />
</TableLayout>
</template>
@@ -88,21 +92,23 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+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: {
-
- }
+ },
+ pickerOptions: {}
}
},
created () {
@@ -112,16 +118,26 @@
'field.id': 'id',
'field.main': 'id'
})
+ this.pickerOptions.disabledDate = (time) => {
+ // 涓�澶�
+ const 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: {
- 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) {
@@ -152,8 +168,8 @@
.finally(() => {
this.isWorking.search = false
})
- },
- },
+ }
+ }
}
</script>
<style lang="scss" scoped>
@@ -163,6 +179,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