chuangte/smart-switch-ui
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/utils/constants.js
This commit is contained in:
墨大叔 2024-07-29 11:14:10 +08:00
commit 10f6e7351e
13 changed files with 656 additions and 140 deletions

44
src/api/ss/account.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询用户账户列表
export function listAccount(query) {
return request({
url: '/ss/account/list',
method: 'get',
params: query
})
}
// 查询用户账户详细
export function getAccount(accountId) {
return request({
url: '/ss/account/' + accountId,
method: 'get'
})
}
// 新增用户账户
export function addAccount(data) {
return request({
url: '/ss/account',
method: 'post',
data: data
})
}
// 修改用户账户
export function updateAccount(data) {
return request({
url: '/ss/account',
method: 'put',
data: data
})
}
// 删除用户账户
export function delAccount(accountId) {
return request({
url: '/ss/account/' + accountId,
method: 'delete'
})
}

17
src/api/system/smUser.js
View File

@ -44,15 +44,6 @@ export function updateSmUser(data) {
})
}
// 修改普通用户服务费
export function updateServiceRate(data) {
return request({
url: '/system/smUser/updateServiceRate',
method: 'put',
data: data
})
}
// 删除普通用户信息
export function delSmUser(userId) {
return request({
@ -60,3 +51,11 @@ export function delSmUser(userId) {
method: 'delete'
})
}
// 重置用户服务费
export function resetSmUserService(userId) {
return request({
url: `/system/smUser/${userId}/resetService`,
method: 'put'
})
}

8
src/utils/constants.js
View File

@ -3,6 +3,14 @@ export const views = {
user: 'user',
}
// 收款账户类型
export const AccountType = {
BANK_CARD: "1", // 银行卡
WECHAT: "2", // 微信
ALI_PAY: "3", // 支付宝
OFFLINE_IMAGE: "4" // 线下收款
}
export const UserType = {
ADMIN: "1", // 管理员
APP: "2" // 普通用户

14
src/utils/mixins.js
View File

@ -65,7 +65,7 @@ export const $showColumns = {
},
}
// 服务费
// 充值服务费
export const $serviceType = {
computed: {
// 服务费单位
@ -76,3 +76,15 @@ export const $serviceType = {
}
}
}
// 提现服务费
export const $withdrawServiceType = {
computed: {
// 提现服务费单位
withdrawServiceUnit() {
return (type) => {
return type === '2' ? '元' : '%';
}
}
}
}

388
src/views/ss/account/index.vue Normal file
View File

@ -0,0 +1,388 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户名称" prop="userName" v-if="notHasView(views.user)">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="收款账户" prop="accountNo">
<el-input
v-model="queryParams.accountNo"
placeholder="请输入收款账户"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<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-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['ss:account:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['ss:account:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['ss:account:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['ss:account:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="accountList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="onSortChange">
<el-table-column type="selection" width="55" align="center" />
<template v-for="column of showColumns">
<el-table-column
:key="column.key"
:label="column.label"
:prop="column.key"
:align="column.align"
:min-width="column.minWidth"
:width="column.width"
:sort-orders="orderSorts"
:sortable="column.sortable"
:show-overflow-tooltip="column.overflow"
>
<template slot-scope="d">
<template v-if="column.key === 'accountId'">
{{d.row[column.key]}}
</template>
<template v-else-if="column.key === 'accountNo'">
<template v-if="d.row.accountType === AccountType.OFFLINE_IMAGE">
<image-preview :src="d.row.accountNo" :width="50" :height="50"/>
</template>
<template v-else-if="d.row.accountType === AccountType.BANK_CARD">
{{d.row.name}} / {{d.row.mobile}} / {{d.row.idCard}} / {{d.row.accountNo}}
</template>
<template v-else>{{d.row.accountNo}}</template>
</template>
<template v-else-if="column.key === 'accountType'">
<dict-tag :options="dict.type.account_type" :value="d.row.accountType"/>
</template>
<template v-else>
{{d.row[column.key]}}
</template>
</template>
</el-table-column>
</template>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['ss:account:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['ss:account:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
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-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="用户" prop="userId">
<user-input v-model="form.userId" :disabled="hasView(views.user)"/>
</el-form-item>
<el-form-item label="账户类型" prop="accountType">
<el-select v-model="form.accountType" style="width: 100%">
<el-option v-for="dict in dict.type.account_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="姓名" prop="name" v-if="form.accountType === AccountType.BANK_CARD">
<el-input v-model="form.name" placeholder="请输入姓名" />
</el-form-item>
<el-form-item label="手机号" prop="mobile" v-if="form.accountType === AccountType.BANK_CARD">
<el-input v-model="form.mobile" placeholder="请输入手机号" />
</el-form-item>
<el-form-item label="身份证" prop="idCard" v-if="form.accountType === AccountType.BANK_CARD">
<el-input v-model="form.idCard" placeholder="请输入身份证" />
</el-form-item>
<el-form-item label="收款码" prop="accountNo" v-if="form.accountType === AccountType.OFFLINE_IMAGE">
<image-upload v-model="form.accountNo" :limit="1"/>
</el-form-item>
<el-form-item label="账户" prop="accountNo" v-else>
<el-input v-model="form.accountNo" placeholder="请输入账户（微信openId/银行卡号/支付宝账号）" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listAccount, getAccount, delAccount, addAccount, updateAccount } from "@/api/ss/account";
import { $showColumns, $view } from '@/utils/mixins'
import UserInput from '@/components/Business/SmUser/UserInput.vue'
import { AccountType } from '@/utils/constants'
// 默认排序字段
const defaultSort = {
prop: "createTime",
order: "descending"
}
export default {
name: "Account",
computed: {
AccountType() {
return AccountType
}
},
components: { UserInput },
mixins: [$showColumns, $view],
dicts: ['account_type'],
props: {
query: {
type: Object,
default: () => {
return {}
}
}
},
data() {
return {
// 字段列表
columns: [
{key: 'accountId', visible: true, label: '账户id', minWidth: null, sortable: true, overflow: false, align: 'center', width: "80"},
{key: 'userName', visible: true, label: '用户名称', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'accountType', visible: true, label: '账户类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'accountNo', visible: true, label: '收款账户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
],
// 排序方式
orderSorts: ['ascending', 'descending', null],
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 收款账户表格数据
accountList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
defaultSort,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderByColumn: defaultSort.prop,
isAsc: defaultSort.order,
accountId: null,
userId: null,
accountType: null,
name: null,
idCard: null,
accountNo: null,
mobile: null,
cardInfo: null,
isDefault: null
},
// 表单参数
form: {},
// 表单校验
rules: {
userId: [
{ required: true, message: "用户不能为空", trigger: "blur" }
],
accountType: [
{ required: true, message: "账户类型不能为空", trigger: "blur" }
],
accountNo: [
{ required: true, message: "账户不能为空", trigger: "blur" }
],
mobile: [
{ required: true, message: "手机号不能为空", trigger: "blur" }
],
idCard: [
{ required: true, message: "身份证不能为空", trigger: "blur" }
],
name: [
{ required: true, message: "姓名不能为空", trigger: "blur" }
],
}
};
},
created() {
this.queryParams = {
...this.queryParams,
...this.query
}
this.getList();
},
methods: {
/** 当排序按钮被点击时触发 **/
onSortChange(column) {
if (column.order == null) {
this.queryParams.orderByColumn = defaultSort.prop;
this.queryParams.isAsc = defaultSort.order;
} else {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
}
this.getList();
},
/** 查询收款账户列表 */
getList() {
this.loading = true;
listAccount(this.queryParams).then(response => {
this.accountList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
accountId: null,
userId: this.query.userId,
accountType: null,
name: null,
idCard: null,
accountNo: null,
mobile: null,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.accountId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加收款账户";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const accountId = row.accountId || this.ids
getAccount(accountId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改收款账户";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.accountId != null) {
updateAccount(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addAccount(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const accountIds = row.accountId || this.ids;
this.$modal.confirm('是否确认删除收款账户编号为"' + accountIds + '"的数据项？').then(function() {
return delAccount(accountIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('ss/account/export', {
...this.queryParams
}, `account_${new Date().getTime()}.xlsx`)
}
}
};
</script>

10
src/views/ss/mchApply/index.vue
View File

@ -25,6 +25,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="申请状态" prop="status">
<el-select v-model="queryParams.status" clearable @change="handleQuery" placeholder="请选择申请状态">
<el-option
v-for="dict in dict.type.ss_mch_apply_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="审核人" prop="verifyName">
<el-input
v-model="queryParams.verifyName"

139
src/views/system/channel/index.vue
View File

@ -26,17 +26,17 @@
<!-- v-hasPermi="['system:channel:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:channel:edit']"
>修改</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['system:channel:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
@ -64,16 +64,33 @@
<el-table v-loading="loading" :data="channelList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="渠道名称" align="center" prop="name"/>
<el-table-column label="是否启用" align="center" prop="enabled">
<el-table-column label="启用充值" align="center" prop="enabled">
<template slot-scope="d">
<el-switch v-model="d.row.enabled" @change="(nv) => {onChangeEnabled(d.row, nv)}"/>
</template>
</el-table-column>
<el-table-column label="服务费费率" align="center" prop="serviceRate">
<template slot-scope="d">{{d.row.serviceRate | money}}%</template>
<el-table-column label="设备服务费" align="center" prop="serviceRate">
<template slot-scope="d">
<dict-tag :options="dict.type.service_type" :value="d.row.serviceType"/>
{{d.row.serviceRate | money}} {{serviceUnit(d.row.serviceType)}}
</template>
</el-table-column>
<el-table-column label="成本率" align="center" prop="costRate">
<template slot-scope="d">{{d.row.costRate | money}}%</template>
<el-table-column label="充值成本率" align="center" prop="costRate">
<template slot-scope="d">{{d.row.costRate | money}} %</template>
</el-table-column>
<el-table-column label="启用提现" align="center" prop="withdrawEnabled">
<template slot-scope="d">
<el-switch v-model="d.row.withdrawEnabled" @change="(nv) => {onChangeWithdrawEnabled(d.row, nv)}"/>
</template>
</el-table-column>
<el-table-column label="提现服务费" align="center" prop="withdrawServiceRate">
<template slot-scope="d">
<dict-tag :options="dict.type.withdraw_service_type" :value="d.row.withdrawServiceType"/>
{{d.row.withdrawServiceRate | money}} {{withdrawServiceUnit(d.row.withdrawServiceType)}}
</template>
</el-table-column>
<el-table-column label="提现成本率" align="center" prop="withdrawCostRate">
<template slot-scope="d">{{d.row.withdrawCostRate | money}} %</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@ -105,19 +122,50 @@
<!-- 添加或修改充值渠道对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="渠道名称" prop="name">
<el-form ref="form" :model="form" :rules="rules" label-width="7em">
<form-col :span="span" label="渠道名称" prop="name">
<el-input v-model="form.name" placeholder="请输入渠道名称" disabled readonly/>
</el-form-item>
<el-form-item label="是否启用" prop="enabled">
</form-col>
<form-col :span="span" label="启用充值" prop="enabled">
<el-switch v-model="form.enabled" />
</el-form-item>
<el-form-item label="服务费率" prop="serviceRate">
<el-input-number v-model="form.serviceRate" controls-position="right" placeholder="请输入服务费费率%" :min="0" :precision="2"/> %
</el-form-item>
<el-form-item label="成本率" prop="costRate">
<el-input-number v-model="form.costRate" controls-position="right" placeholder="请输入服务费费率%" :min="0" :precision="2"/> %
</el-form-item>
</form-col>
<form-col :span="span" label="设备服务费" prop="serviceRate">
<el-input v-model.number="form.serviceRate" :min="0" type="number">
<template #prepend>
<el-select v-model="form.serviceType" style="width: 10em">
<el-option v-for="dict in dict.type.service_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</template>
<template #append>
{{serviceUnit(form.serviceType)}}
</template>
</el-input>
</form-col>
<form-col :span="span" label="充值成本率" prop="costRate">
<el-input v-model.number="form.costRate" placeholder="请输入充值成本率" :min="0">
<template #append>%</template>
</el-input>
</form-col>
<form-col :span="span" label="启用提现" prop="withdrawEnabled">
<el-switch v-model="form.withdrawEnabled" />
</form-col>
<form-col :span="span" label="提现服务费" prop="withdrawServiceRate">
<el-input v-model.number="form.withdrawServiceRate" :min="0" type="number">
<template #prepend>
<el-select v-model="form.withdrawServiceType" style="width: 10em">
<el-option v-for="dict in dict.type.withdraw_service_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</template>
<template #append>
{{withdrawServiceUnit(form.withdrawServiceType)}}
</template>
</el-input>
</form-col>
<form-col :span="span" label="提现成本率" prop="withdrawCostRate">
<el-input v-model.number="form.withdrawCostRate" placeholder="请输入充值成本率" :min="0">
<template #append>%</template>
</el-input>
</form-col>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -129,11 +177,15 @@
<script>
import { listChannel, getChannel, delChannel, addChannel, updateChannel } from "@/api/system/channel";
import { $serviceType, $withdrawServiceType } from '@/utils/mixins'
export default {
name: "Channel",
mixins: [$serviceType, $withdrawServiceType],
dicts: ['withdraw_service_type', 'service_type'],
data() {
return {
span: 24,
// 遮罩层
loading: true,
// 选中数组
@ -169,14 +221,23 @@ export default {
{required: true, message: '渠道名称不能为空', target: 'blur'}
],
enabled: [
{required: true, type: 'boolean', message: '是否启用不能为空', target: 'blur'}
{required: true, type: 'boolean', message: '充值是否启用不能为空', target: 'blur'}
],
serviceRate: [
{required: true, type: 'number', message: '服务费率不能为空', target: 'blur'}
{required: true, type: 'number', message: '设备服务费率不能为空', target: 'blur'}
],
costRate: [
{required: true, type: 'number', message: '成本率不能为空', target: 'blur'}
{required: true, type: 'number', message: '充值成本率不能为空', target: 'blur'}
],
withdrawEnabled: [
{required: true, type: 'boolean', message: '提现是否启用不能为空', target: 'blur'}
],
withdrawServiceRate: [
{required: true, type: 'number', message: '提现服务费率不能为空', target: 'blur'}
],
withdrawCostRate: [
{required: true, type: 'number', message: '提现成本率不能为空', target: 'blur'}
]
}
};
@ -185,13 +246,27 @@ export default {
this.getList();
},
methods: {
parseNumber(val) {
if (val == null) {
return null;
}
return parseFloat(val);
},
// 更新是否启用
onChangeEnabled(row, enabled) {
if (row == null) {
return this.$message.warning("参数错误");
}
updateChannel({channelId: row.channelId, enabled: enabled}).then(res => {
this.getList();
updateChannel({channelId: row.channelId, enabled: enabled}).catch(() => {
row.enabled = !enabled;
})
},
onChangeWithdrawEnabled(row, enabled) {
if (row == null) {
return this.$message.warning("参数错误");
}
updateChannel({channelId: row.channelId, withdrawEnabled: enabled}).catch(() => {
row.withdrawEnabled = !enabled;
})
},
/** 查询充值渠道列表 */

2
src/views/system/device/detail.vue
View File

@ -72,7 +72,7 @@
<store-link :name="deviceData.storeName" :id="deviceData.storeId"/>
</el-descriptions-item>
<el-descriptions-item label="服务费">
<template v-if="deviceData.serviceRate == null">跟随用户</template>
<template v-if="deviceData.serviceRate == null || deviceData.serviceType == null">跟随用户</template>
<template v-else>
<dict-tag :options="dict.type.service_type" :value="deviceData.serviceType" size="mini"/>
{{deviceData.serviceRate}} {{serviceUnit(deviceData.serviceType)}}

6
src/views/system/device/index.vue
View File

@ -50,7 +50,7 @@
/>
</el-form-item>
<el-form-item label="在线状态" prop="onlineStatus">
<el-select v-model="queryParams.onlineStatus" placeholder="请选择在线状态" clearable>
<el-select v-model="queryParams.onlineStatus" placeholder="请选择在线状态" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.sm_device_online_status"
:key="dict.value"
@ -60,7 +60,7 @@
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.sm_device_status"
:key="dict.value"
@ -175,7 +175,7 @@
</el-table-column>
<el-table-column label="服务费" align="center" prop="serviceRate" >
<template slot-scope="d">
<template v-if="d.row.serviceRate == null">跟随用户</template>
<template v-if="d.row.serviceRate == null || d.row.serviceType == null">跟随用户</template>
<template v-else>
<dict-tag :options="dict.type.service_type" :value="d.row.serviceType"/>
{{d.row.serviceRate}} {{serviceUnit(d.row.serviceType)}}

76
src/views/system/smUser/components/serviceRateForm.vue
View File

@ -1,76 +0,0 @@
<template>
<el-dialog title="修改服务费" :visible.sync="show" width="500px" append-to-body @open="open" @close="onCancel">
<el-form ref="serviceRateForm" :model="form" label-width="6em">
<el-form-item label="服务费费率" prop="serviceRate">
<el-input v-model="form.serviceRate" placeholder="请输入服务费费率" type="number">
<template #append>%</template>
</el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="onSubmit">确 定</el-button>
<el-button @click="onCancel">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import { getSmUser, updateServiceRate } from '@/api/system/smUser'
export default {
name: 'serviceRateForm',
props: {
userId: {
type: String,
default: null,
},
show: {
type: Boolean,
default: false,
}
},
data() {
return {
form: {}
}
},
methods: {
onSubmit() {
this.$refs["serviceRateForm"].validate(valid => {
if (valid) {
this.$confirm("是否将其应用于该用户的所有设备？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.form.freshDevice = true;
this.updateRate();
}).catch(() => {
this.form.freshDevice = false;
this.updateRate();
})
}
});
},
onCancel() {
this.$emit("update:show", false);
},
updateRate() {
updateServiceRate(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.onCancel();
this.$emit('success');
});
},
open() {
getSmUser(this.userId).then(res => {
this.form = {
userId: res.data.userId,
serviceRate: res.data.serviceRate,
freshDevice: false
}
});
}
}
}
</script>

8
src/views/system/smUser/detail.vue
View File

@ -20,7 +20,7 @@
<el-descriptions-item label="总收入">{{userData.totalIncome | money | defaultValue}} 元</el-descriptions-item>
<el-descriptions-item label="总提现">{{userData.withDrawlAmount | money | defaultValue}} 元</el-descriptions-item>
<el-descriptions-item label="服务费费率">
<template v-if="userData.serviceRate == null">跟随渠道</template>
<template v-if="userData.serviceRate == null || userData.serviceType == null">跟随渠道</template>
<template v-else>
<dict-tag :options="dict.type.service_type" :value="userData.serviceType" size="mini"/>
{{userData.serviceRate}} {{serviceUnit(userData.serviceType)}}
@ -43,6 +43,9 @@
<el-tab-pane label="店铺列表" lazy>
<store :query="{userId: userData.userId}" :view="views.user"/>
</el-tab-pane>
<el-tab-pane label="账户列表" lazy>
<account :query="{userId: userData.userId}" :view="views.user"/>
</el-tab-pane>
<el-tab-pane label="充值提现记录" lazy>
<user-account :landlord-id="userData.userId"/>
</el-tab-pane>
@ -67,11 +70,12 @@ import Access from '@/views/ss/access/index.vue'
import { $serviceType, $view } from '@/utils/mixins'
import Store from '@/views/ss/store/index.vue'
import RecordBalance from '@/views/ss/recordBalance/index.vue'
import Account from '@/views/ss/account/index.vue'
export default {
name: 'deviceDetail',
mixins: [$view, $serviceType],
components: { RecordBalance, Store, Access, UserRechargeReport, UserAccount, UserDevice, LineChart},
components: { Account, RecordBalance, Store, Access, UserRechargeReport, UserAccount, UserDevice, LineChart},
dicts: ['sm_user_type', 'service_type'],
computed: {
serviceUnit() {

77
src/views/system/smUser/index.vue
View File

@ -33,6 +33,26 @@
/>
</el-select>
</el-form-item>
<el-form-item label="设备服务费类型" prop="serviceType" label-width="8em">
<el-select v-model="queryParams.serviceType" placeholder="请选择设备服务费类型" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.service_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="提现服务费类型" prop="withdrawServiceType" label-width="8em">
<el-select v-model="queryParams.withdrawServiceType" placeholder="请选择提现服务费类型" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.withdraw_service_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<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>
@ -104,12 +124,19 @@
{{d.row.balance | money}} 元
</template>
<template v-else-if="column.key === 'serviceRate'">
<template v-if="d.row.serviceRate == null">跟随渠道</template>
<template v-if="d.row.serviceRate == null || d.row.serviceType == null">跟随渠道</template>
<template v-else>
<dict-tag :options="dict.type.service_type" :value="d.row.serviceType"/>
{{d.row.serviceRate}} {{serviceUnit(d.row.serviceType)}}
</template>
</template>
<template v-else-if="column.key === 'withdrawServiceRate'">
<template v-if="d.row.withdrawServiceRate == null || d.row.withdrawServiceType == null">跟随渠道</template>
<template v-else>
<dict-tag :options="dict.type.withdraw_service_type" :value="d.row.withdrawServiceType"/>
{{d.row.withdrawServiceRate}} {{withdrawServiceUnit(d.row.withdrawServiceType)}}
</template>
</template>
<template v-else-if="column.key === 'status'">
<dict-tag :options="dict.type.sm_user_status" :value="d.row.status"/>
</template>
@ -190,10 +217,10 @@
<el-input v-model="form.phonenumber" placeholder="请输入手机号" :maxlength="11" show-word-limit
clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>
</form-col>
<form-col :span="span * 2" label="服务费" prop="serviceRate">
<el-input v-model="form.serviceRate" placeholder="请输入服务费" type="number">
<form-col :span="span * 2" label="设备服务费" prop="serviceRate" label-width="7em">
<el-input v-model="form.serviceRate" placeholder="请输入设备服务费" type="number">
<template #prepend>
<el-select v-model="form.serviceType" placeholder="请选择服务费收取方式" style="width: 10em">
<el-select v-model="form.serviceType" placeholder="请选择设备服务费收取方式" style="width: 10em">
<el-option
v-for="dict in dict.type.service_type"
:key="dict.value"
@ -205,6 +232,21 @@
<template #append>{{serviceUnit(form.serviceType)}}</template>
</el-input>
</form-col>
<form-col :span="span * 2" label="提现服务费" prop="withdrawServiceRate" label-width="7em">
<el-input v-model="form.withdrawServiceRate" placeholder="请输入提现服务费" type="number">
<template #prepend>
<el-select v-model="form.withdrawServiceType" placeholder="请选择提现服务费收取方式" style="width: 10em">
<el-option
v-for="dict in dict.type.withdraw_service_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</template>
<template #append>{{withdrawServiceUnit(form.withdrawServiceType)}}</template>
</el-input>
</form-col>
<form-col :span="span * 2" label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" :maxlength="500" show-word-limit type="textarea"/>
</form-col>
@ -222,9 +264,16 @@
</template>
<script>
import { listSmUser, getSmUser, addSmUser, updateSmUser, delSmUser, updateServiceRate } from '@/api/system/smUser'
import ServiceRateForm from '@/views/system/smUser/components/serviceRateForm.vue'
import { $serviceType, $showColumns } from '@/utils/mixins'
import {
listSmUser,
getSmUser,
addSmUser,
updateSmUser,
delSmUser,
updateServiceRate,
resetSmUserService
} from '@/api/system/smUser'
import { $serviceType, $showColumns, $withdrawServiceType } from '@/utils/mixins'
import UserLink from '@/components/Business/SmUser/UserLink.vue'
const defaultSort = {
@ -234,9 +283,9 @@ const defaultSort = {
export default {
name: "SmUser",
mixins: [$showColumns, $serviceType],
components: { UserLink, ServiceRateForm },
dicts: ['sm_user_status', 'user_type', 'sys_user_sex', 'service_type'],
mixins: [$showColumns, $serviceType, $withdrawServiceType],
components: { UserLink },
dicts: ['sm_user_status', 'user_type', 'sys_user_sex', 'service_type', 'withdraw_service_type'],
computed: {
serviceUnit() {
return (type) => {
@ -259,7 +308,8 @@ export default {
{key: 'rechargeAmount', visible: true, label: '充值金额', align: 'center', minWidth: null, sortable: true},
{key: 'withDrawlAmount', visible: true, label: '提现金额', align: 'center', minWidth: null, sortable: true},
{key: 'balance', visible: true, label: '账户余额', align: 'center', minWidth: null, sortable: true},
{key: 'serviceRate', visible: true, label: '服务费', align: 'center', minWidth: null, sortable: true},
{key: 'serviceRate', visible: true, label: '设备服务费', align: 'center', minWidth: null, sortable: true},
{key: 'withdrawServiceRate', visible: true, label: '提现服务费', align: 'center', minWidth: null, sortable: true},
{key: 'storeCount', visible: true, label: '店铺数量', align: 'center', minWidth: null, sortable: false},
{key: 'deviceCount', visible: true, label: '设备数量', align: 'center', minWidth: null, sortable: false},
{key: 'deviceAdmin', visible: false, label: '设备管理员', align: 'center', minWidth: null, sortable: false},
@ -338,10 +388,7 @@ export default {
type: 'warning'
}).then(() => {
this.loading = true;
updateServiceRate({
userId: row.userId,
serviceRate: null
}).then(res => {
resetSmUserService(row.userId).then(res => {
if (res.code === 200) {
this.$message.success("重置成功");
}

7
src/views/system/withdraw/index.vue
View File

@ -62,11 +62,16 @@
{{d.row.arrivalAmount | money}} 元
</template>
</el-table-column>
<el-table-column label="手续费" align="center">
<el-table-column label="服务费" align="center">
<template slot-scope="d">
{{d.row.serviceCharge | money}} 元
</template>
</el-table-column>
<el-table-column label="渠道成本" align="center">
<template slot-scope="d">
{{d.row.channelCost | money}} 元
</template>
</el-table-column>
<el-table-column label="时间" align="center" prop="createTime" width="180"/>
<el-table-column label="到账时间" align="center" prop="payTime" width="180"/>
<el-table-column label="打款渠道" align="center">