Merge branch 'dev-new' into dev

This commit is contained in:
Guoqs
2025-01-07 15:19:23 +08:00

View File

@@ -1,28 +1,49 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" <el-form
label-width="68px"> :model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="会员ID" prop="memberId"> <el-form-item label="会员ID" prop="memberId">
<el-input v-model="queryParams.memberId" placeholder="请输入会员ID" clearable <el-input
@keyup.enter.native="handleQuery" /> v-model="queryParams.memberId"
placeholder="请输入会员ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="mobileNumber"> <el-form-item label="手机号" prop="mobileNumber">
<el-input v-model="queryParams.mobileNumber" placeholder="请输入手机号" clearable <el-input
@keyup.enter.native="handleQuery" /> v-model="queryParams.mobileNumber"
placeholder="请输入手机号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button
v-hasPermi="['member:merchantVip:add']">开卡 type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['member:merchantVip:add']"
>开卡
</el-button> </el-button>
</el-col> </el-col>
<!--<el-col :span="1.5"> <!--<el-col :span="1.5">
@@ -60,7 +81,11 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="infoList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="卡号" align="center" prop="walletCode" /> <el-table-column label="卡号" align="center" prop="walletCode" />
<el-table-column label="运营商" align="center" prop="merchantName" /> <el-table-column label="运营商" align="center" prop="merchantName" />
@@ -68,15 +93,21 @@
<el-table-column label="头像" align="center" prop="avatarUrl"> <el-table-column label="头像" align="center" prop="avatarUrl">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-image v-if="scope.row.avatarUrl === null" :src="defaultImg" />--> <!-- <el-image v-if="scope.row.avatarUrl === null" :src="defaultImg" />-->
<el-image style="height: 50px;width: 50px" <el-image
style="height: 50px; width: 50px"
:src="scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl" :src="scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl"
:preview-src-list='[scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl]' /> :preview-src-list="[
scope.row.avatarUrl === null ? defaultImg[0].img : scope.row.avatarUrl,
]"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="昵称" align="center" prop="nickName"> <el-table-column label="昵称" align="center" prop="nickName">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/member/detail/index/' + scope.row.memberId" class="link-type"> <router-link
:to="'/member/detail/index/' + scope.row.memberId"
class="link-type"
>
<span>{{ scope.row.nickName }}</span> <span>{{ scope.row.nickName }}</span>
</router-link> </router-link>
</template> </template>
@@ -87,49 +118,81 @@
<el-table-column label="总余额" align="center" prop="totalAccountAmount" /> <el-table-column label="总余额" align="center" prop="totalAccountAmount" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdateBalance(scope.row)" <el-button
v-hasPermi="['member:merchantVip:update']">充值/扣款 size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdateBalance(scope.row)"
v-hasPermi="['member:merchantVip:update']"
>充值/扣款
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="查看" align="center" class-name="small-padding fixed-width"> <el-table-column label="查看" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="viewDetails(scope.row)">明细</el-button> <el-button size="mini" type="text" @click="viewDetails(scope.row)"
>明细</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" <pagination
:limit.sync="queryParams.pageSize" @pagination="getList" /> v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改会员基础信息对话框 --> <!-- 添加或修改会员基础信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="createMerchantVip" :rules="rules" label-width="100px"> <el-form ref="form" :model="createMerchantVip" :rules="rules" label-width="100px">
<el-form-item label="选择运营商"> <el-form-item label="选择运营商">
<el-select v-model="createMerchantVip.targetMerchantId" filterable clearable placeholder="请选择运营商" <el-select
@change="$forceUpdate()"> v-model="createMerchantVip.targetMerchantId"
<el-option v-for="item in merchantList" :key="item.merchantId" :label="item.merchantName" filterable
:value="item.merchantId"> clearable
placeholder="请选择运营商"
@change="$forceUpdate()"
>
<el-option
v-for="item in merchantList"
:key="item.merchantId"
:label="item.merchantName"
:value="item.merchantId"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="手机号码"> <el-form-item label="手机号码">
<el-input v-model="createMerchantVip.mobileNumber" placeholder="请输入手机号码" /> <el-input
v-model="createMerchantVip.mobileNumber"
placeholder="请输入手机号码"
/>
</el-form-item> </el-form-item>
<el-form-item label="操作类型"> <el-form-item label="操作类型">
<el-radio v-model="createMerchantVip.type" label="1" border>充值</el-radio> <el-radio v-model="createMerchantVip.type" label="1" border>充值</el-radio>
<el-radio v-model="createMerchantVip.type" label="2" border>扣款</el-radio> <el-radio v-model="createMerchantVip.type" label="2" border>扣款</el-radio>
</el-form-item> </el-form-item>
<el-form-item label="金额" prop="balance"> <el-form-item label="金额" prop="balance">
<el-input-number v-model="createMerchantVip.updatePrincipalBalance" placeholder="请输入金额" :min="0" <el-input-number
:controls="false" :precision="2" /> v-model="createMerchantVip.updatePrincipalBalance"
placeholder="请输入金额"
:min="0"
:controls="false"
:precision="2"
/>
</el-form-item> </el-form-item>
<el-form-item label="赠送金" prop="balance"> <el-form-item label="赠送金" prop="balance">
<el-input-number v-model="createMerchantVip.updateGiftBalance" placeholder="请输入赠送金" :min="0" <el-input-number
:controls="false" :precision="2" /> v-model="createMerchantVip.updateGiftBalance"
placeholder="请输入赠送金"
:min="0"
:controls="false"
:precision="2"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -139,24 +202,44 @@
</el-dialog> </el-dialog>
<!-- 添加或修改会员余额对话框 --> <!-- 添加或修改会员余额对话框 -->
<el-dialog title="会员充值/扣款" @close="closeUpdateBalance" :visible.sync="openUpdateBalance" width="500px" <el-dialog
append-to-body> title="会员充值/扣款"
@close="closeUpdateBalance"
:visible.sync="openUpdateBalance"
width="500px"
append-to-body
>
<p>线下充值本金客户直接在线下付款给商家</p> <p>线下充值本金客户直接在线下付款给商家</p>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="选择运营商"> <el-form-item label="选择运营商">
<el-select v-model="forbid" clearable disabled placeholder="请选择运营商"></el-select> <el-select
v-model="forbid"
clearable
disabled
placeholder="请选择运营商"
></el-select>
</el-form-item> </el-form-item>
<el-form-item label="操作类型"> <el-form-item label="操作类型">
<el-radio v-model="type" label="1" border>充值</el-radio> <el-radio v-model="type" label="1" border>充值</el-radio>
<el-radio v-model="type" label="2" border>扣款</el-radio> <el-radio v-model="type" label="2" border>扣款</el-radio>
</el-form-item> </el-form-item>
<el-form-item label="金额" prop="balance"> <el-form-item label="金额" prop="balance">
<el-input-number v-model="updatePrincipalBalance" placeholder="请输入金额" :min="0" :controls="false" <el-input-number
:precision="2" /> v-model="updatePrincipalBalance"
placeholder="请输入金额"
:min="0"
:controls="false"
:precision="2"
/>
</el-form-item> </el-form-item>
<el-form-item label="赠送金" prop="balance"> <el-form-item label="赠送金" prop="balance">
<el-input-number v-model="updateGiftBalance" placeholder="请输入赠送金" :min="0" :controls="false" <el-input-number
:precision="2" /> v-model="updateGiftBalance"
placeholder="请输入赠送金"
:min="0"
:controls="false"
:precision="2"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -165,28 +248,43 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 明细 --> <!-- 明细 -->
<el-dialog title="交易明细" :visible.sync="vehicleDetails" :before-close="closeDetails" width="1200px" <el-dialog
append-to-body> title="交易明细"
:visible.sync="vehicleDetails"
:before-close="closeDetails"
width="1200px"
append-to-body
>
<el-form :model="detailParameters" size="small" :inline="true"> <el-form :model="detailParameters" size="small" :inline="true">
<el-form-item label="选择日期" prop="tradeDate"> <el-form-item label="选择日期" prop="tradeDate">
<el-date-picker v-model="createTimeRange" type="month" value-format="yyyy-MM" range-separator="-" <el-date-picker
placeholder="选择日期"> v-model="createTimeRange"
type="month"
value-format="yyyy-MM"
range-separator="-"
placeholder="选择日期"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item style="margin-left: 10px;"> <el-form-item style="margin-left: 10px">
<el-button type="primary" icon="el-icon-search" size="mini" @click="getDetails">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="getDetails"
<el-button >搜索</el-button
type="warning" >
plain <el-button type="warning" plain icon="Download" @click="handleExport"
icon="Download" >导出</el-button
@click="handleExport" >
>导出</el-button>
</el-form-item> </el-form-item>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="充值余额:"> {{ totalRechargeAmount }} </el-form-item> <el-form-item label="充值余额:"> {{ totalRechargeAmount }} </el-form-item>
<el-form-item label="消费金额:" style="padding-left: 50px;">{{ totalConsumption }}</el-form-item> <el-form-item label="消费金额:" style="padding-left: 50px">{{
<el-form-item label="累计充值金额:" style="padding-left: 50px;">{{ totalRechargeAmount }}</el-form-item> totalConsumption
<el-form-item label="累计消费金额:" style="padding-left: 50px;">{{ totalConsumption }}</el-form-item> }}</el-form-item>
<el-form-item label="累计充值金额:" style="padding-left: 50px">{{
totalRechargeAmount
}}</el-form-item>
<el-form-item label="累计消费金额:" style="padding-left: 50px">{{
totalConsumption
}}</el-form-item>
</el-col> </el-col>
</el-form> </el-form>
<el-table :data="detailList" stripe style="width: 100%" v-loading="loadings"> <el-table :data="detailList" stripe style="width: 100%" v-loading="loadings">
@@ -207,8 +305,14 @@
<el-table-column label="时间" align="center" prop="transactionTime" /> <el-table-column label="时间" align="center" prop="transactionTime" />
</el-table> </el-table>
<!--分页--> <!--分页-->
<pagination v-show="closeTotal > 0" :total="closeTotal" :page.sync="detailParameters.pageNum" <pagination
:limit.sync="detailParameters.pageSize" @pagination="getDetails" style="margin-bottom: 20px" /> v-show="closeTotal > 0"
:total="closeTotal"
:page.sync="detailParameters.pageNum"
:limit.sync="detailParameters.pageSize"
@pagination="getDetails"
style="margin-bottom: 20px"
/>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@@ -220,15 +324,18 @@ import {
addInfo, addInfo,
updateInfo, updateInfo,
updateMemberBalance, updateMemberBalance,
getMerchantListByAuth, queryMerchantVipList, createMerchantVip, getMemberBalanceChangesV2 getMerchantListByAuth,
queryMerchantVipList,
createMerchantVip,
getMemberBalanceChangesV2,
} from "@/api/member/info"; } from "@/api/member/info";
import { parseTime } from "@/utils/common"; import { parseTime } from "@/utils/common";
export default { export default {
name: "Info", name: "Info",
dicts: ['member_status'], dicts: ["member_status"],
data() { data() {
return { return {
defaultImg: [{ img: require('../../../assets/images/headPort.png') }], defaultImg: [{ img: require("../../../assets/images/headPort.png") }],
// 遮罩层 // 遮罩层
loading: true, loading: true,
loadings: true, loadings: true,
@@ -254,7 +361,7 @@ export default {
updatePrincipalBalance: "", // 充值扣款金额 updatePrincipalBalance: "", // 充值扣款金额
updateGiftBalance: "", updateGiftBalance: "",
updateBalanceMemberId: "", // 需要充值扣款的会员id updateBalanceMemberId: "", // 需要充值扣款的会员id
type: '1', // 操作类型 1-充值2-扣款 type: "1", // 操作类型 1-充值2-扣款
targetMerchantId: "", // 目标运营商id targetMerchantId: "", // 目标运营商id
// 查询参数 // 查询参数
queryParams: { queryParams: {
@@ -278,7 +385,7 @@ export default {
createMerchantVip: {}, createMerchantVip: {},
// 充值/扣款 // 充值/扣款
updateMerchantVip: {}, updateMerchantVip: {},
forbid: '', //充值/扣款参数 forbid: "", //充值/扣款参数
selectedValue: null, // 设置默认选中第一条数据 selectedValue: null, // 设置默认选中第一条数据
vehicleDetails: false, vehicleDetails: false,
detailList: [], detailList: [],
@@ -292,7 +399,7 @@ export default {
pageSize: 10, pageSize: 10,
walletCode: null, walletCode: null,
tradeDate: null, tradeDate: null,
memberId: null memberId: null,
}, },
createTimeRange: [], createTimeRange: [],
}; };
@@ -300,8 +407,8 @@ export default {
computed: { computed: {
// 子类型 进账10-充值, 11-赠送, 12-订单结算退款 出账20-后管扣款, 21-订单付款, 22-用户退款 // 子类型 进账10-充值, 11-赠送, 12-订单结算退款 出账20-后管扣款, 21-订单付款, 22-用户退款
subType() { subType() {
return this.type === '1' ? '10' : '20'; return this.type === "1" ? "10" : "20";
} },
}, },
created() { created() {
this.getList(); this.getList();
@@ -316,9 +423,9 @@ export default {
pageSize: this.queryParams.pageSize, pageSize: this.queryParams.pageSize,
memberId: this.queryParams.memberId, memberId: this.queryParams.memberId,
mobileNumber: this.queryParams.mobileNumber, mobileNumber: this.queryParams.mobileNumber,
} };
console.log("params", params) console.log("params", params);
queryMerchantVipList(params).then(response => { queryMerchantVipList(params).then((response) => {
this.infoList = response.rows; this.infoList = response.rows;
console.log(this.infoList); console.log(this.infoList);
this.total = response.total; this.total = response.total;
@@ -328,10 +435,10 @@ export default {
// 获取运营商列表 // 获取运营商列表
getMerchantList() { getMerchantList() {
getMerchantListByAuth().then((response) => { getMerchantListByAuth().then((response) => {
console.log("response", response) console.log("response", response);
this.merchantList = response.obj; this.merchantList = response.obj;
this.createMerchantVip.targetMerchantId = this.merchantList[0].merchantId this.createMerchantVip.targetMerchantId = this.merchantList[0].merchantId;
}) });
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
@@ -366,9 +473,9 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1 this.single = selection.length !== 1;
this.multiple = !selection.length this.multiple = !selection.length;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
@@ -380,8 +487,8 @@ export default {
handleUpdate(row) { handleUpdate(row) {
console.log("修改按钮", row); console.log("修改按钮", row);
this.reset(); this.reset();
const id = row.memberId || this.ids const id = row.memberId || this.ids;
getInfo(id).then(response => { getInfo(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改会员基础信息"; this.title = "修改会员基础信息";
@@ -413,8 +520,8 @@ export default {
// 点击充值按钮 // 点击充值按钮
handleUpdateBalance(row) { handleUpdateBalance(row) {
console.log(row); console.log(row);
this.forbid = row.merchantName this.forbid = row.merchantName;
this.targetMerchantId = row.merchantId this.targetMerchantId = row.merchantId;
this.openUpdateBalance = true; this.openUpdateBalance = true;
this.updateBalanceMemberId = row.memberId; this.updateBalanceMemberId = row.memberId;
}, },
@@ -426,10 +533,10 @@ export default {
updateGiftBalance: this.updateGiftBalance, updateGiftBalance: this.updateGiftBalance,
type: this.type, type: this.type,
subType: this.subType, subType: this.subType,
targetMerchantId: this.targetMerchantId targetMerchantId: this.targetMerchantId,
}; };
console.log("修改会员本金余额 param:", param); console.log("修改会员本金余额 param:", param);
updateMemberBalance(param).then(response => { updateMemberBalance(param).then((response) => {
console.log("修改会员本金余额 response:", response); console.log("修改会员本金余额 response:", response);
this.$modal.msgSuccess("充值成功"); this.$modal.msgSuccess("充值成功");
this.openUpdateBalance = false; this.openUpdateBalance = false;
@@ -439,7 +546,7 @@ export default {
/* 开卡确定按钮 */ /* 开卡确定按钮 */
submitCreateMerchantVip() { submitCreateMerchantVip() {
console.log("submitCreateMerchantVip", this.createMerchantVip); console.log("submitCreateMerchantVip", this.createMerchantVip);
createMerchantVip(this.createMerchantVip).then(response => { createMerchantVip(this.createMerchantVip).then((response) => {
console.log("开卡确定按钮 response:", response); console.log("开卡确定按钮 response:", response);
this.$modal.msgSuccess("开卡成功"); this.$modal.msgSuccess("开卡成功");
this.open = false; this.open = false;
@@ -448,16 +555,16 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateInfo(this.form).then(response => { updateInfo(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addInfo(this.form).then(response => { addInfo(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@@ -469,25 +576,36 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除会员基础信息编号为"' + ids + '"的数据项?').then(function () { this.$modal
.confirm('是否确认删除会员基础信息编号为"' + ids + '"的数据项?')
.then(function () {
return delInfo(ids); return delInfo(ids);
}).then(() => { })
.then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => { })
}); .catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('member/info/exportWalletList', { // console.log("memberId", this.detailParameters.memberId);
...this.queryParams const params = {
}, `info_${new Date().getTime()}.xlsx`) ...this.queryParams,
memberId: this.detailParameters.memberId,
};
this.download(
"member/info/exportWalletList",
params,
`info_${new Date().getTime()}.xlsx`
);
}, },
viewDetails(row) { viewDetails(row) {
console.log(row); console.log(row);
this.detailParameters.walletCode = row.walletCode; this.detailParameters.walletCode = row.walletCode;
this.detailParameters.memberId = row.memberId; this.detailParameters.memberId = row.memberId;
this.detailParameters.tradeDate = parseTime(new Date(), '{y}-{m}'); //设置默认日期 this.detailParameters.tradeDate = parseTime(new Date(), "{y}-{m}"); //设置默认日期
this.createTimeRange = this.detailParameters.tradeDate; this.createTimeRange = this.detailParameters.tradeDate;
this.vehicleDetails = true; this.vehicleDetails = true;
this.getDetails(); this.getDetails();
@@ -501,7 +619,7 @@ export default {
getDetails() { getDetails() {
this.loadings = true; this.loadings = true;
console.log(this.detailParameters); console.log(this.detailParameters);
getMemberBalanceChangesV2(this.detailParameters).then(response => { getMemberBalanceChangesV2(this.detailParameters).then((response) => {
console.log(response); console.log(response);
this.loadings = false; this.loadings = false;
this.detailList = response.obj.pageResponse.list; this.detailList = response.obj.pageResponse.list;