Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-11-03 53e25d994cfbf6608f6fd1eef2e27ec129fd41c6

 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"
@@ -88,6 +90,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import { formatDateTime } from '@/utils/util'
export default {
  name: 'WxBill',
  extends: BaseTable,
@@ -102,7 +105,8 @@
      },
      sumData: {

      }
      },
      pickerOptions: {}
    }
  },
  created () {
@@ -112,6 +116,15 @@
      'field.id': 'id',
      'field.main': 'id'
    })
    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: {
@@ -119,6 +132,7 @@
      this.searchForm.startDate = ''
      this.searchForm.endDate = ''
      this.value1 = []
      this.$refs.searchForm.resetFields()
      this.search()
    },
    selectDate(v) {