chuangte/ride-lease-vue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
tx 2024-10-25 18:05:50 +08:00
parent 932d08b7bc
commit 181cdb9fe6
8 changed files with 312 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -6,9 +6,9 @@ ENV = 'development'
# 电动车租赁系统/开发环境 # 电动车租赁系统/开发环境
# VUE_APP_BASE_API = '/dev-api' # VUE_APP_BASE_API = '/dev-api'
# VUE_APP_BASE_API = 'http://192.168.2.21:8090' VUE_APP_BASE_API = 'http://192.168.2.168:8090'
# VUE_APP_BASE_API = 'https://zc.chuangtewl.com' # VUE_APP_BASE_API = 'https://zc.chuangtewl.com'
VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api' # VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api'
# 路由懒加载 # 路由懒加载

2
.env.production
View File

@ -8,5 +8,5 @@ ENV = 'production'
# VUE_APP_BASE_API = '/prod-api' # VUE_APP_BASE_API = '/prod-api'
# VUE_APP_BASE_API = 'http://192.168.2.21:8090' # VUE_APP_BASE_API = 'http://192.168.2.21:8090'
# VUE_APP_BASE_API = 'https://zc.chuangtewl.com' # VUE_APP_BASE_API = 'https://zc.chuangtewl.com'
VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api' # VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api'
VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api' VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api'

15
src/api/rl/withdraw.js
View File

@ -42,3 +42,18 @@ export function delWithdraw(id) {
method: 'delete' method: 'delete'
}) })
} }
export function getuserWithdraw(id) {
return request({
url: '/user/user/getUserWithdrawChannelList?userId=' + id,
method: 'get'
})
}
// 修改提现记录
export function putuserWithdraw(data) {
return request({
url: '/user/user/eidtUserWithdrawChannel',
method: 'put',
data: data
})
}

25
src/views/system/agent/index.vue
View File

@ -122,35 +122,38 @@
/> />
<!-- 添加或修改代理商对话框 --> <!-- 添加或修改代理商对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="150px">
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name" label-width="150px">
<el-input v-model="form.name" placeholder="请输入名称" /> <el-input v-model="form.name" placeholder="请输入名称" />
</el-form-item> </el-form-item>
<el-form-item label="客服电话" prop="servicePhone"> <el-form-item label="客服电话" prop="servicePhone" label-width="150px">
<el-input v-model="form.servicePhone" placeholder="请输入客服电话" /> <el-input v-model="form.servicePhone" placeholder="请输入客服电话" />
</el-form-item> </el-form-item>
<el-form-item label="调度费" prop="dispatchFee"> <el-form-item label="调度费" prop="dispatchFee" label-width="150px">
<el-input v-model="form.dispatchFee" placeholder="请输入调度费" /> <el-input v-model="form.dispatchFee" placeholder="请输入调度费" />
</el-form-item> </el-form-item>
<el-form-item label="配送费" prop="deliveryFee"> <el-form-item label="配送费" prop="deliveryFee" label-width="150px">
<el-input v-model="form.deliveryFee" placeholder="请输入配送费" /> <el-input v-model="form.deliveryFee" placeholder="请输入配送费" />
</el-form-item> </el-form-item>
<el-form-item label="城市id" prop="cityId"> <el-form-item label="城市id" prop="cityId" label-width="150px">
<el-input v-model="form.cityId" placeholder="请输入城市id" /> <el-input v-model="form.cityId" placeholder="请输入城市id" />
</el-form-item> </el-form-item>
<el-form-item label="联系人" prop="contact"> <el-form-item label="联系人" prop="contact" label-width="150px">
<el-input v-model="form.contact" placeholder="请输入联系人" /> <el-input v-model="form.contact" placeholder="请输入联系人" />
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="phone"> <el-form-item label="联系电话" prop="phone" label-width="150px">
<el-input v-model="form.phone" placeholder="请输入联系电话" /> <el-input v-model="form.phone" placeholder="请输入联系电话" />
</el-form-item> </el-form-item>
<el-form-item label="用户id" prop="userid"> <el-form-item label="用户id" prop="userid" label-width="150px">
<el-input v-model="form.userid" placeholder="请输入用户id" /> <el-input v-model="form.userid" placeholder="请输入用户id" />
</el-form-item> </el-form-item>
<el-form-item label="是否免费送取车" prop="isFreeCar"> <el-form-item label="是否免费送取车" prop="isFreeCar" label-width="150px">
<el-input v-model="form.isFreeCar" placeholder="请输入是否免费送取车" /> <el-input v-model="form.isFreeCar" placeholder="请输入是否免费送取车" />
</el-form-item> </el-form-item>
<el-form-item label="分账比例" prop="isFreeCar" label-width="150px">
<el-input v-model="form.dividendProportion" placeholder="请输入和代理商的分账比例" />
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>

11
src/views/system/channelWithdraw/index.vue
View File

@ -65,10 +65,10 @@
<dict-tag :options="dict.type.withdraw_service_type" :value="d.row.serviceType" /> <dict-tag :options="dict.type.withdraw_service_type" :value="d.row.serviceType" />
</template> </template>
<template v-else-if="column.key === 'serviceRate'"> <template v-else-if="column.key === 'serviceRate'">
{{ d.row.serviceRate | money }} {{ withdrawServiceUnit(d.row.serviceType) }} {{ d.row.withdrawHandlingCharge | money }} ‰
</template> </template>
<template v-else-if="column.key === 'costRate'"> <template v-else-if="column.key === 'costRate'">
{{ d.row.costRate | money }} % {{ d.row.costRate | money }}
</template> </template>
<template v-else-if="column.key === 'picture'"> <template v-else-if="column.key === 'picture'">
<image-preview :src="d.row.picture" :width="32" :height="32" /> <image-preview :src="d.row.picture" :width="32" :height="32" />
@ -114,6 +114,9 @@
:label="dict.value">{{ dict.label }}</el-radio> :label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="是否需要上传收款二维码" label-width="120" prop="handlingChargeType">
<el-switch v-model="form.isNeedCode" />
</el-form-item>
<el-col :span="12" v-if="form.handlingChargeType == '1'"> <el-col :span="12" v-if="form.handlingChargeType == '1'">
<el-form-item label="比例(‰)" > <el-form-item label="比例(‰)" >
<el-input v-model="form.withdrawHandlingCharge" placeholder="请输入手续费" /> <el-input v-model="form.withdrawHandlingCharge" placeholder="请输入手续费" />
@ -129,13 +132,13 @@
<!-- <el-radio v-for="dict in dict.type.withdraw_service_type" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>--> <!-- <el-radio v-for="dict in dict.type.withdraw_service_type" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>-->
<!-- </el-radio-group>--> <!-- </el-radio-group>-->
<!-- </form-col>--> <!-- </form-col>-->
<form-col :span="span" label="手续费" prop="serviceRate"> <!-- <form-col :span="span" label="手续费" prop="serviceRate">
<el-input v-model.number="form.serviceRate" :min="0" type="number"> <el-input v-model.number="form.serviceRate" :min="0" type="number">
<template #suffix> <template #suffix>
{{ withdrawServiceUnit(form.withdrawType) }} {{ withdrawServiceUnit(form.withdrawType) }}
</template> </template>
</el-input> </el-input>
</form-col> </form-col> -->
<form-col :span="span" label="渠道成本" prop="costRate"> <form-col :span="span" label="渠道成本" prop="costRate">
<el-input v-model.number="form.costRate" placeholder="请输入充值成本率" :min="0" type="number"> <el-input v-model.number="form.costRate" placeholder="请输入充值成本率" :min="0" type="number">
<template #suffix>%</template> <template #suffix>%</template>

13
src/views/system/merchant/merchantList.vue Normal file
View File

@ -0,0 +1,13 @@
<template>
<div class="">111</div>
</template>
<script>
export default {
}
</script>
<style>
</style>

3
src/views/system/model/index.vue
View File

@ -185,6 +185,7 @@ import {
listAccessory, listAccessory,
} from "@/api/rl/accessory"; } from "@/api/rl/accessory";
export default { export default {
name: "Model", name: "Model",
data() { data() {
@ -240,7 +241,7 @@ export default {
methods: { methods: {
// //
timeReturn(time){ timeReturn(time){
if (time == 'hour') { if (time == 'hours') {
return '小时' return '小时'
} else if (time == 'day') { } else if (time == 'day') {
return '天' return '天'

342
src/views/system/partner/index.vue
View File

@ -3,50 +3,23 @@
<el-col :span="24" :xs="24"> <el-col :span="24" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="名称" prop="userName"> <el-form-item label="名称" prop="userName">
<el-input <el-input v-model="queryParams.userName" placeholder="请输入名称" clearable style="width: 240px"
v-model="queryParams.userName" @keyup.enter.native="handleQuery" />
placeholder="请输入名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="手机号码" prop="phonenumber"> <el-form-item label="手机号码" prop="phonenumber">
<el-input <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
v-model="queryParams.phonenumber" @keyup.enter.native="handleQuery" />
placeholder="请输入手机号码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="类型" prop="userType"> <el-form-item label="类型" prop="userType">
<el-select <el-select v-model="queryParams.userType" placeholder="商户类型" clearable style="width: 240px">
v-model="queryParams.userType" <el-option v-for="dict in dict.type.rl_user_type" v-if="!['00', '01', '04'].includes(dict.value)"
placeholder="商户类型" :key="dict.value" :label="dict.label" :value="dict.value" />
clearable
style="width: 240px">
<el-option
v-for="dict in dict.type.rl_user_type"
v-if="!['00', '01', '04'].includes(dict.value)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select <el-select v-model="queryParams.status" placeholder="商户状态" clearable style="width: 240px">
v-model="queryParams.status" <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
placeholder="商户状态" :value="dict.value" />
clearable
style="width: 240px">
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -56,37 +29,23 @@
</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--> <!-- <el-button-->
<!-- type="primary"--> <!-- type="primary"-->
<!-- plain--> <!-- plain-->
<!-- icon="el-icon-plus"--> <!-- icon="el-icon-plus"-->
<!-- size="mini"--> <!-- size="mini"-->
<!-- @click="handleAdd"--> <!-- @click="handleAdd"-->
<!-- v-hasPermi="['system:user:add']"--> <!-- v-hasPermi="['system:user:add']"-->
<!-- >新增</el-button>--> <!-- >新增</el-button>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
type="success" v-hasPermi="['system:user:edit']">修改</el-button>
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:user:edit']"
>修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
type="danger" v-hasPermi="['system:user:remove']">删除</el-button>
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:user:remove']"
>删除</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -97,24 +56,21 @@
<el-table-column label="代理城市" align="center" prop="cityName" /> <el-table-column label="代理城市" align="center" prop="cityName" />
<el-table-column label="类型" align="center" prop="userType"> <el-table-column label="类型" align="center" prop="userType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.rl_user_type" :value="scope.row.userType"/> <dict-tag :options="dict.type.rl_user_type" :value="scope.row.userType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="手机号码" align="center" prop="phonenumber" /> <el-table-column label="手机号码" align="center" prop="phonenumber" />
<el-table-column label="分账比例(%)" align="center" prop="dividendProportion" :formatter="formatDividendProportion" /> <el-table-column label="分账比例(%)" align="center" prop="dividendProportion"
:formatter="formatDividendProportion" />
<el-table-column label="余额" align="center"> <el-table-column label="余额" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="balance-cell">{{ scope.row.balance }}元</span> <span class="balance-cell">{{ scope.row.balance }}元</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" > <el-table-column label="状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
v-model="scope.row.status" @change="handleStatusChange(scope.row)"></el-switch>
active-value="0"
inactive-value="1"
@change="handleStatusChange(scope.row)"
></el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="合作时间" align="center" prop="createTime" width="160"> <el-table-column label="合作时间" align="center" prop="createTime" width="160">
@ -122,60 +78,42 @@
<span>{{ parseTime(scope.row.cooperationTime) }}</span> <span>{{ parseTime(scope.row.cooperationTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
label="操作"
align="center"
width="160"
class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.userId !== 1"> <template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
size="mini" v-hasPermi="['system:user:edit']">修改</el-button>
type="text" <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
icon="el-icon-edit" v-hasPermi="['system:user:remove']">删除</el-button>
@click="handleUpdate(scope.row)" <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['system:user:edit']" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:user:remove']"
>删除</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button> <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleResetPwd" icon="el-icon-key" <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item> v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
<!-- <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"--> <!-- <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"-->
<!-- v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>--> <!-- v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>-->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
v-show="total>0" @pagination="getList" />
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-col> </el-col>
<!-- 添加或修改商户配置对话框 --> <!-- 添加或修改商户配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input v-model="form.userName" placeholder="请输入用户名" maxlength="30" disabled/> <el-input v-model="form.userName" placeholder="请输入用户名" maxlength="30" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.userId == undefined" label="密码" prop="password"> <el-form-item v-if="form.userId == undefined" label="密码" prop="password">
<el-input v-model="form.password" placeholder="请输入密码" type="password" maxlength="20" show-password/> <el-input v-model="form.password" placeholder="请输入密码" type="password" maxlength="20" show-password />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -183,7 +121,8 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="代理商" prop="agentId"> <el-form-item label="代理商" prop="agentId">
<el-select v-model="form.agentId" filterable placeholder="请选择"> <el-select v-model="form.agentId" filterable placeholder="请选择">
<el-option v-for="item in agentList" :key="item.agentId" :label="item.name+' ' +item.contact" :value="item.agentId"> <el-option v-for="item in agentList" :key="item.agentId" :label="item.name + ' ' + item.contact"
:value="item.agentId">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -192,13 +131,8 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="角色"> <el-form-item label="角色">
<el-select v-model="form.roleIds" placeholder="请选择角色"> <el-select v-model="form.roleIds" placeholder="请选择角色">
<el-option <el-option v-for="item in filteredRoleOptions" :key="item.roleId" :label="item.roleName"
v-for="item in filteredRoleOptions" :value="item.roleId" :disabled="item.status == 1"></el-option>
:key="item.roleId"
:label="item.roleName"
:value="item.roleId"
:disabled="item.status == 1"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -206,20 +140,14 @@
<el-row v-if="form.roleIds == 4"> <el-row v-if="form.roleIds == 4">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="分账比例(%)" label-width="100" prop="inputDividendProportion"> <el-form-item label="分账比例(%)" label-width="100" prop="inputDividendProportion">
<el-input style="width: 64%" v-model="inputDividendProportion" placeholder="请输入分账比例" maxlength="11" @input="handleInput"/> <el-input style="width: 64%" v-model="inputDividendProportion" placeholder="请输入分账比例" maxlength="11"
@input="handleInput" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="合作时间" prop="cooperationTime"> <el-form-item label="合作时间" prop="cooperationTime">
<el-date-picker <el-date-picker v-model="form.cooperationTime" style="width: 200px" value-format="yyyy-MM-dd" type="date"
v-model="form.cooperationTime" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
style="width: 200px"
value-format="yyyy-MM-dd"
type="date"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -227,26 +155,71 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
v-for="dict in dict.type.sys_normal_disable" dict.label
:key="dict.value" }}</el-radio>
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="form.roleIds == 4"> <el-col :span="12" v-if="form.roleIds == 4">
<el-form-item label="分账状态" prop="dividendStatus"> <el-form-item label="分账状态" prop="dividendStatus">
<el-radio-group v-model="form.dividendStatus"> <el-switch v-model="form.dividendStatus"></el-switch>
<el-radio <!-- <el-radio-group v-model="form.dividendStatus">
v-for="dict in dict.type.rl_dividend_switch" <el-radio v-for="dict in dict.type.rl_dividend_switch" :key="dict.value" :label="dict.value">{{
:key="dict.value" dict.label
:label="dict.value" }}</el-radio>
>{{dict.label}}</el-radio> </el-radio-group> -->
</el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row>
<el-col :span="24" v-for="(item,index) in withdList" :key="index" style="display: flexa;align-items: center;">
<img :src="item.picture" alt="" style="width: 30px;height: 30px;border-radius: 50%;">
<el-radio-group v-model="item.handlingChargeType">
<el-radio v-for="dict in dict.type.rl_handling_charge_type" :key="dict.value"
:label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-col>
</el-row> -->
<div class="witd" v-for="(item, index) in withdList" :key="index">
<img :src="item.picture" alt="" style="width: 30px;height: 30px;border-radius: 50%;">
<div class="widname">{{ item.name }}</div>
<div class=""> 渠道状态： <el-switch v-model="item.isOpen" @change="updataWithd(item)"></el-switch></div>
</el-switch>
<el-radio-group v-model="item.handlingChargeType" @change="updataWithd(item)">
<el-radio v-for="dict in dict.type.rl_handling_charge_type" :key="dict.value" :label="dict.value">{{
dict.label
}}</el-radio>
</el-radio-group>
<div class="" style="width: 150px;">
<el-col :span="12" v-if="item.handlingChargeType == '1'">
<el-form-item label="比例(‰)">
<el-input v-model="item.withdrawHandlingCharge" placeholder="请输入手续费" style="width: 100px;" @change="updataWithd(item)"/>
</el-form-item>
</el-col>
<el-col :span="12" v-else>
<el-form-item label="每笔(元)">
<el-input v-model="item.withdrawHandlingCharge" placeholder="请输入手续费" style="width: 100px;"@change="updataWithd(item)" />
</el-form-item>
</el-col>
</div>
<div class="">
单笔最低
<el-input v-model.number="item.minAmount" placeholder="请输入单笔最低提现金额" :min="0" type="number" @change="updataWithd(item)"
style="width: 100px;">
<template #suffix>元</template>
</el-input>
单笔最高
<el-input v-model.number="item.maxAmount" placeholder="请输入单笔最高提现金额" :min="0" type="number" @change="updataWithd(item)"
style="width: 100px;">
<template #suffix>元</template>
</el-input>
</div>
</div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注"> <el-form-item label="备注">
@ -265,20 +238,22 @@
</template> </template>
<script> <script>
let timerId;
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"; import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { updateExt } from "@/api/rl/ext"; import { updateExt } from "@/api/rl/ext";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import { listCity } from "@/api/rl/common"; import { listCity } from "@/api/rl/common";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import { listAgent, getAgent, delAgent, addAgent, updateAgent } from "@/api/rl/agent"; import { listAgent, getAgent, delAgent, addAgent, updateAgent } from "@/api/rl/agent";
import { getuserWithdraw, putuserWithdraw } from "@/api/rl/withdraw"
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "User", name: "User",
dicts: ['sys_normal_disable', 'sys_user_sex','et_dividend_item','rl_user_type','rl_dividend_switch'], dicts: ['sys_normal_disable', 'sys_user_sex', 'et_dividend_item', 'rl_user_type', 'rl_dividend_switch', 'rl_handling_charge_type'],
computed: { computed: {
filteredRoleOptions() { filteredRoleOptions() {
return this.roleOptions.filter(item => item.roleKey !== 'common' && item.roleKey !== 'agent'); return this.roleOptions.filter(item => item.roleKey !== 'common' );
}, },
}, },
components: { Treeselect }, components: { Treeselect },
@ -316,7 +291,7 @@ export default {
roleOptions: [], roleOptions: [],
// 表单参数 // 表单参数
form: { form: {
dividendStatus: "0" dividendStatus: false
}, },
inputDividendProportion: 30, // 用于输入的百分比 inputDividendProportion: 30, // 用于输入的百分比
defaultProps: { defaultProps: {
@ -338,6 +313,7 @@ export default {
// 上传的地址 // 上传的地址
url: process.env.VUE_APP_BASE_API + "/system/user/importData" url: process.env.VUE_APP_BASE_API + "/system/user/importData"
}, },
withdList: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -364,7 +340,7 @@ export default {
value: '04', value: '04',
label: '调度员' label: '调度员'
}], }],
agentList:[], agentList: [],
// 表单校验 // 表单校验
rules: { rules: {
agentId: [ agentId: [
@ -407,7 +383,7 @@ export default {
created() { created() {
this.getList(); this.getList();
setTimeout(() => { setTimeout(() => {
console.log(this.dicts,'dictsdicts'); console.log(this.dicts, 'dictsdicts');
}, 200); }, 200);
// this.getDeptTree(); // this.getDeptTree();
@ -418,6 +394,16 @@ export default {
this.getAgentList() this.getAgentList()
}, },
methods: { methods: {
updataWithd(item) {
clearTimeout(timerId);
// 设置一个新的定时器，在滑动停止后 500ms 执行 getmarks 方法
timerId = setTimeout(() => {
putuserWithdraw(item).then(response => {
});
}, 700);
},
handleInput() { handleInput() {
// 当输入时，将输入的百分比转换为原始值 // 当输入时，将输入的百分比转换为原始值
console.log(111111111111) console.log(111111111111)
@ -433,9 +419,9 @@ export default {
pageSize: 30, pageSize: 30,
} }
listAgent(this.addDateRange(data)).then(response => { listAgent(this.addDateRange(data)).then(response => {
console.log(response,'responseresponseresponse'); console.log(response, 'responseresponseresponse');
this.agentList=response.rows this.agentList = response.rows
console.log( this.options,' this.options this.options'); console.log(this.options, ' this.options this.options');
}); });
}, },
@ -447,7 +433,7 @@ export default {
return '—'; // 或者返回其他默认值 return '—'; // 或者返回其他默认值
}, },
/** 查询城市列表 */ /** 查询城市列表 */
getListCity(){ getListCity() {
listCity().then(response => { listCity().then(response => {
this.cityOptions = response.data; this.cityOptions = response.data;
}); });
@ -480,15 +466,15 @@ export default {
}, },
// 用户状态修改 // 用户状态修改
handleStatusChange(row) { handleStatusChange(row) {
console.log("================="+row.status); console.log("=================" + row.status);
let status = row.status ? "1":"0" let status = row.status ? "1" : "0"
let text = row.status ? "停用" : "启用"; let text = row.status ? "停用" : "启用";
console.log("=======status=========="+status); console.log("=======status==========" + status);
this.$modal.confirm('确认要"' + text + '""' + row.userName + '"商户吗？').then(function() { this.$modal.confirm('确认要"' + text + '""' + row.userName + '"商户吗？').then(function () {
return updateExt(row.userId, status); return updateExt(row.userId, status);
}).then(() => { }).then(() => {
this.$modal.msgSuccess(text + "成功"); this.$modal.msgSuccess(text + "成功");
}).catch(function() { }).catch(function () {
row.status = row.status === "0" ? "1" : "0"; row.status = row.status === "0" ? "1" : "0";
}); });
}, },
@ -509,13 +495,14 @@ export default {
dividendItemIds: [], dividendItemIds: [],
email: undefined, email: undefined,
sex: undefined, sex: undefined,
dividendStatus: "1", dividendStatus: false,
status: "0", status: "0",
remark: undefined, remark: undefined,
payChannel: undefined, payChannel: undefined,
areaIds: [], areaIds: [],
postIds: [], postIds: [],
roleIds: [] roleIds: [],
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -574,13 +561,21 @@ export default {
this.$set(this.form, "roleIds", response.roleIds[0]); this.$set(this.form, "roleIds", response.roleIds[0]);
this.$set(this.form, "areas", response.areas); this.$set(this.form, "areas", response.areas);
this.form.roleIds = response.roleIds[0]; // 取出第一个角色 ID this.form.roleIds = response.roleIds[0]; // 取出第一个角色 ID
console.log("回显-=====roleIds[0]",response.roleIds[0]) console.log("回显-=====roleIds[0]", response.roleIds[0])
this.inputDividendProportion = this.form.dividendProportion * 100; this.inputDividendProportion = this.form.dividendProportion * 100;
console.log("this.form.dividendProportion========",this.form.dividendProportion) console.log("this.form.dividendProportion========", this.form.dividendProportion)
console.log("inputDividendProportion========",this.inputDividendProportion) console.log("inputDividendProportion========", this.inputDividendProportion)
this.open = true; this.open = true;
this.title = "修改系统用户"; this.title = "修改系统用户";
this.form.password = ""; this.form.password = "";
this.getUserwit(userId)
});
},
getUserwit(userId) {
getuserWithdraw(userId).then(response => {
console.log(response, 'aaaaaaaaaaa');
this.withdList = response.data
}); });
}, },
/** 重置密码按钮操作 */ /** 重置密码按钮操作 */
@ -600,22 +595,22 @@ export default {
resetUserPwd(row.userId, value).then(response => { resetUserPwd(row.userId, value).then(response => {
this.$modal.msgSuccess("修改成功，新密码是：" + value); this.$modal.msgSuccess("修改成功，新密码是：" + value);
}); });
}).catch(() => {}); }).catch(() => { });
}, },
/** 分配角色操作 */ /** 分配角色操作 */
handleAuthRole: function(row) { handleAuthRole: function (row) {
const userId = row.userId; const userId = row.userId;
this.$router.push("/system/user-auth/role/" + userId); this.$router.push("/system/user-auth/role/" + userId);
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function () {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
this.form.userType = '03'; this.form.userType = '03';
this.form.roleIds = [this.form.roleIds]; this.form.roleIds = [this.form.roleIds];
console.log("提交roleIds=========="+this.form.roleIds) console.log("提交roleIds==========" + this.form.roleIds)
this.form.dividendProportion = this.inputDividendProportion; // 转换为0.3 this.form.dividendProportion = this.inputDividendProportion; // 转换为0.3
console.log('保存的分账比例:', this.form.dividendProportion); console.log('保存的分账比例:', this.form.dividendProportion);
this.form.dividendStatus = this.form.dividendStatus === "1" ? 1:0; // this.form.dividendStatus = this.form.dividendStatus === "1" ? 1 : 0;
if (valid) { if (valid) {
if (this.form.userId != undefined) { if (this.form.userId != undefined) {
updateUser(this.form).then(response => { updateUser(this.form).then(response => {
@ -636,12 +631,12 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const userIds = row.userId || this.ids; const userIds = row.userId || this.ids;
this.$modal.confirm('是否确认删除商户编号为"' + userIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除商户编号为"' + userIds + '"的数据项？').then(function () {
return delUser(userIds); return delUser(userIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => { });
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
@ -678,14 +673,27 @@ export default {
} }
}; };
</script> </script>
<style> <style lang="scss">
.el-form-item__tip{ .witd {
margin-top: 10px;
display: flex;
flex-wrap: nowrap;
align-items: center;
justify-content: space-around;
.widname {
width: 100px;
}
}
.el-form-item__tip {
color: #ff0000; color: #ff0000;
font-size: 12px; font-size: 12px;
line-height: 18px; line-height: 18px;
} }
.balance-cell {
.balance-cell {
font-weight: bold; font-weight: bold;
color: red; color: red;
} }
</style> </style>