jiangping
2025-07-14 9679e32d50d55606627b6adc9cd7d9b3a715e120
前端
已修改4个文件
64 ■■■■ 文件已修改
admin/src/api/business/member.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/api/business/memberRevenue.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaMemberDetailWindow.vue 49 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/api/business/member.js
@@ -15,6 +15,13 @@
  return request.post('/business/member/updateStatus', data)
}
// 导出Excel
export function exportExcel (data) {
  return request.post('/business/member/exportExcel', data, {
    download: true
  })
}
// 修改
export function updateById (data) {
  return request.post('/business/member/updateById', data)
admin/src/api/business/memberRevenue.js
@@ -30,3 +30,9 @@
    }
  })
}
// 导出Excel
export function exportExcel (data) {
  return request.post('/business/memberRevenue/exportExcel', data, {
    download: true
  })
}
admin/src/components/business/OperaMemberDetailWindow.vue
@@ -43,8 +43,8 @@
    <div class="main" v-if="activeTabs === 0 && info">
      <div class="title" >
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
          <el-form-item label="交易流水号"  style="width: 200px;" label-width="100px" prop="telephone">
            <el-input v-model="searchForm.telephone" style="width: 100px"  clearable placeholder="请输入" ></el-input>
          <el-form-item label="交易流水号"  style="width: 200px;" label-width="100px" prop="transactionNo">
            <el-input v-model="searchForm.transactionNo" style="width: 100px"  clearable placeholder="请输入" ></el-input>
          </el-form-item>
          <el-form-item label="收支类型" prop="type"  style="width: 200px;" label-width="100px" >
            <el-select v-model="searchForm.optType"  style="width: 100px"  clearable placeholder="请选择类型"  >
@@ -52,16 +52,16 @@
              <el-option :value="-1" label="支出"></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="收支时间" prop="eventType"  style="width: 330px;" label-width="100px" >
            <el-date-picker type="datetime"  style="width: 100px"  v-model="searchForm.startTime" clearable value-format="yyyy-MM-dd HH:mm:ss"
          <el-form-item label="收支时间" prop="eventType"  style="width: 380px;" label-width="100px" >
            <el-date-picker type="datetime"  style="width: 120px"  v-model="searchForm.startTime" clearable value-format="yyyy-MM-dd HH:mm:ss"
                            placeholder="开始时间" />-
            <el-date-picker type="datetime"  style="width: 100px"  v-model="searchForm.endTime" clearable value-format="yyyy-MM-dd HH:mm:ss"
            <el-date-picker type="datetime"  style="width: 120px"  v-model="searchForm.endTime" clearable value-format="yyyy-MM-dd HH:mm:ss"
                            placeholder="结束时间" />
          </el-form-item>
          <section  style="width: 200px;display: inline-block" >
          <section  style="width: 280px;display: inline-block" >
            <el-button type="primary" @click="handleCurrentChange0(0)">搜索</el-button>
            <el-button @click="reset0">重置</el-button>
            <el-button @click="exportExcel0">重置</el-button>
            <el-button type="primary" @click="exportExcel0" :loading="export0">导出</el-button>
          </section>
        </el-form>
      </div>
@@ -76,9 +76,9 @@
            <span style="cursor: pointer;color: #a10e0e" v-else>支出</span>
          </template>
        </el-table-column>
        <el-table-column prop="telephone" label="金额(元)" width="120px"  align="center">
        <el-table-column prop="amountInfo" label="金额(元)" width="120px"  align="center">
          <template slot-scope="{row}">
            <span class="yellowbtn">{{ ((row.amount || 0)/100).toFixed(2) }}</span>
            <span class="yellowbtn">{{ row.amountInfo || 0 }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="createTime" label="收支时间" min-width="150px"  align="center"></el-table-column>
@@ -217,7 +217,7 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import BaseOpera from '@/components/base/BaseOpera'
import { getById } from '@/api/business/member'
import { fetchList as yueList } from '@/api/business/memberRevenue'
import { fetchList as yueList, exportExcel as yueExportExcel } from '@/api/business/memberRevenue'
import { commentList } from '@/api/business/orders'
import { fetchList as renzhengList } from '@/api/business/identityInfo'
export default {
@@ -240,6 +240,7 @@
      totalPage0: 0,
      total0: 0,
      loading: false,
      export0: false,
      searchForm: {
        type: 0,
        startTime: null,
@@ -271,9 +272,31 @@
          this.handleCurrentChange0(0)
        })
    },
    exportExcel0 (page) {
      this.page0 = page
      this.getYueList()
    exportExcel0 () {
      this.$dialog.exportConfirm('确认导出吗?')
        .then(() => {
          this.export0 = true
          yueExportExcel({
            page: 1,
            capacity: 1000000,
            model: {
              memberId: this.info.id || -1,
              startTime: this.searchForm.startTime,
              endTime: this.searchForm.endTime,
              optType: this.searchForm.optType,
              transactionNo: this.searchForm.transactionNo
            }
          }).then(response => {
              this.download(response)
            })
            .catch(e => {
              this.$tip.apiFailed(e)
            })
            .finally(() => {
              this.export0 = false
            })
        })
        .catch(() => {})
    },
    reset0 () {
      this.searchForm.startTime = null
server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java
@@ -21,10 +21,8 @@
@ApiModel("会员收支记录")
@TableName("`member_revenue`")
public class MemberRevenue {
    @ApiModelProperty(value = "主键", example = "1")
    private Integer id;
    @ApiModelProperty(value = "是否已删除 0未删除 1已删除", example = "1")
    private Integer deleted;