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

冲突

Browse Source
This commit is contained in:
tx 2024-10-24 15:24:07 +08:00
commit 4c2d8ec78d
9 changed files with 490 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.production
View File

@ -9,3 +9,4 @@ ENV = 'production'
# 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/prod-api'
VUE_APP_BASE_API = 'https://zc.chuangtewl.com/prod-api'

44
src/api/rl/userWithdraw.js Normal file
View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询用户提现渠道列表
export function listUserWithdraw(query) {
return request({
url: '/system/userWithdraw/list',
method: 'get',
params: query
})
}
// 查询用户提现渠道详细
export function getUserWithdraw(userChannelId) {
return request({
url: '/system/userWithdraw/' + userChannelId,
method: 'get'
})
}
// 新增用户提现渠道
export function addUserWithdraw(data) {
return request({
url: '/system/userWithdraw',
method: 'post',
data: data
})
}
// 修改用户提现渠道
export function updateUserWithdraw(data) {
return request({
url: '/system/userWithdraw',
method: 'put',
data: data
})
}
// 删除用户提现渠道
export function delUserWithdraw(userChannelId) {
return request({
url: '/system/userWithdraw/' + userChannelId,
method: 'delete'
})
}

9
src/api/user/user.js
View File

@ -10,6 +10,15 @@ export function listUser(query) {
})
}
// 查询app用户列表
export function listAppUser(query) {
return request({
url: '/user/user/appList',
method: 'get',
params: query
})
}
// 根据手机号快速搜索用户列表
export function fastSearch(query) {
return request({

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

@ -148,17 +148,17 @@
<el-table-column label="电量" align="center" prop="remainingPower" sortable="custom" :sort-orders="['descending', 'ascending']" :formatter="formatPower" v-if="columns[10].visible"/>
<el-table-column label="车辆状态" align="center" prop="status" v-if="columns[11].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.as_device_status" :value="scope.row.status"/>
<dict-tag :options="dict.type.rl_device_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="锁" align="center" prop="lockStatus" width="60" v-if="columns[12].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.et_device_lock_status" :value="scope.row.lockStatus"/>
<dict-tag :options="dict.type.rl_device_lock_status" :value="scope.row.lockStatus"/>
</template>
</el-table-column>
<el-table-column label="网络" align="center" prop="onlineStatus" width="60" v-if="columns[13].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.as_online_status" :value="scope.row.onlineStatus"/>
<dict-tag :options="dict.type.rl_online_status" :value="scope.row.onlineStatus"/>
</template>
</el-table-column>
<el-table-column label="二维码" align="center" v-if="columns[14].visible">
@ -480,7 +480,7 @@ import { listStore, getStore, delStore, addStore, updateStore } from "@/api/rl/s
export default {
name: "Device",
dicts: ['as_online_status', 'as_device_status','et_device_lock_status'],
dicts: ['rl_online_status', 'rl_device_status','rl_device_lock_status'],
components: {},
props: {
initLng: {
@ -586,7 +586,7 @@ export default {
window.removeEventListener('scroll', this.handleScroll, true)
},
created() {
listHardwareVersion(this.queryParams).then(response => {
this.hardwareVersionOptions = response.rows;
this.loading2 = false;
@ -629,7 +629,7 @@ export default {
let data = {
pageNum: 1,
pageSize: 20,
}
listModel(data).then(response => {
// console.log(response,'responseresponseresponse');
@ -640,13 +640,13 @@ export default {
// }));
console.log( this.options,' this.options this.options');
});
},
getlistStore() {
let data = {
pageNum: 1,
pageSize: 20,
}
listStore(data).then(response => {
console.log(response,'店铺');
@ -657,7 +657,7 @@ export default {
// }));
console.log( this.options,' this.options this.options');
});
},
handleScroll() {
let scrollTop = window.scrollY;

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

@ -186,22 +186,15 @@
<el-option v-for="item in agentList" :key="item.agentId" :label="item.name+' ' +item.contact" :value="item.agentId">
</el-option>
</el-select>
<!-- <el-select v-model="form.cityId" placeholder="请选择代理城市">
<el-option
v-for="item in cityOptions"
:key="item.cityId"
:label="item.name"
:value="item.cityId"
></el-option>
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="角色">
<el-select v-model="form.roleIds" placeholder="请选择角色">
<el-select v-model="form.roleIds" placeholder="请选择角色">
<el-option
v-for="item in roleOptions"
v-for="item in filteredRoleOptions"
:key="item.roleId"
:label="item.roleName"
:value="item.roleId"
@ -211,10 +204,10 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="form.roleIds == 4">
<el-col :span="12">
<el-form-item label="分账比例(%)" label-width="100" prop="dividendProportion">
<el-input style="width: 64%" v-model="form.dividendProportion" placeholder="请输入分账比例" maxlength="11" />
<el-form-item label="分账比例(%)" label-width="100" prop="inputDividendProportion">
<el-input style="width: 64%" v-model="inputDividendProportion" placeholder="请输入分账比例" maxlength="11" @input="handleInput"/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -243,7 +236,7 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="12" v-if="form.roleIds == 4">
<el-form-item label="分账状态" prop="dividendStatus">
<el-radio-group v-model="form.dividendStatus">
<el-radio
@ -284,6 +277,11 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "User",
dicts: ['sys_normal_disable', 'sys_user_sex','et_dividend_item','rl_user_type','rl_dividend_switch'],
computed: {
filteredRoleOptions() {
return this.roleOptions.filter(item => item.roleKey !== 'common' && item.roleKey !== 'agent');
},
},
components: { Treeselect },
data() {
return {
@ -321,6 +319,7 @@ export default {
form: {
dividendStatus: "0"
},
inputDividendProportion: 30, // 用于输入的百分比
defaultProps: {
children: "children",
label: "label"
@ -369,9 +368,11 @@ export default {
agentList:[],
// 表单校验
rules: {
agentId: [
{ required: true, message: "请选择代理商", trigger: "blur" },
],
dividendProportion: [
{ required: true, message: "分账比例不能为空", trigger: "blur" },
{ pattern: /^\d+$/, message: '分账比例必须为正整数', trigger: 'blur' }
],
cityId: [
{ required: true, message: "代理城市不能为空", trigger: "blur" },
@ -409,7 +410,7 @@ export default {
setTimeout(() => {
console.log(this.dicts,'dictsdicts');
}, 200);
// this.getDeptTree();
this.getConfigKey("sys.user.initPassword").then(response => {
this.initPassword = response.msg;
@ -418,11 +419,20 @@ export default {
this.getAgentList()
},
methods: {
handleInput() {
// 当输入时，将输入的百分比转换为原始值
console.log(111111111111)
const proportion = parseFloat(this.inputDividendProportion);
if (!isNaN(proportion)) {
console.log(22222222222)
this.form.dividendProportion = proportion / 100;
}
},
getAgentList() {
let data = {
pageNum: 1,
pageSize: 30,
}
listAgent(this.addDateRange(data)).then(response => {
console.log(response,'responseresponseresponse');
@ -433,7 +443,7 @@ export default {
// }));
console.log( this.options,' this.options this.options');
});
},
formatDividendProportion(row) {
let dividendProportion = row.dividendProportion;
@ -567,9 +577,11 @@ export default {
this.roleOptions = response.roles;
this.areaOptions = response.areas;
this.$set(this.form, "postIds", response.postIds);
this.$set(this.form, "roleIds", response.roleIds);
// console.log(1111111111111)
this.$set(this.form, "roleIds", response.roleIds[0]);
this.$set(this.form, "areas", response.areas);
this.form.roleIds = response.roleIds[0]; // 取出第一个角色 ID
console.log("回显-=====roleIds[0]",response.roleIds[0])
this.inputDividendProportion = this.form.dividendProportion * 100;
this.open = true;
this.title = "修改系统用户";
this.form.password = "";
@ -603,6 +615,10 @@ export default {
submitForm: function() {
this.$refs["form"].validate(valid => {
this.form.userType = '03';
this.form.roleIds = [this.form.roleIds];
console.log("提交roleIds=========="+this.form.roleIds)
this.form.dividendProportion = this.inputDividendProportion; // 转换为0.3
// console.log('保存的分账比例:', this.form.dividendProportion);
this.form.dividendStatus = this.form.dividendStatus === "1" ? 1:0;
if (valid) {
if (this.form.userId != undefined) {

22
src/views/system/store/index.vue
View File

@ -47,8 +47,8 @@
<el-table v-loading="loading" :data="storeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="storeId" width="50" />
<el-table-column label="所属用户" align="center" prop="userName" width="120">
<user-link slot-scope="d" :id="d.row.userId" :name="d.row.userName" />
<el-table-column label="所属用户" align="center" prop="createBy" width="120">
<user-link slot-scope="d" :id="d.row.userId" :name="d.row.createBy" />
</el-table-column>
<el-table-column label="商户图片" align="center" prop="picture" width="100">
<template slot-scope="scope">
@ -101,7 +101,7 @@
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
@pagination="getList" />
<!-- 添加或修改商户列表对话框 -->
<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body :close-on-click-modal="false">
@ -117,7 +117,7 @@
</el-select>
<!-- <user-input v-model="form.userId" :query="userQuery" :disabled="hasView(views.user)"/> -->
</form-col>
<form-col label="是否在地图展示" prop="show" :span="span" label-width="9em">
<form-col label="是否在地图展示" prop="show" :span="span" label-width="9em">
<el-switch v-model="form.show" />
</form-col>
<form-col label="店铺名称" prop="name" :span="span * 2">
@ -222,7 +222,7 @@ export default {
address: null,
deleted: null
},
// 表单参数
form: {},
// 表单校验
@ -248,7 +248,7 @@ export default {
},
showPlaceSearchMap: false,
span: 12,
options:[],
modelList:[]
};
@ -280,7 +280,7 @@ export default {
this.searchList()
this.getList();
this.getlistModel()
},
methods: {
parseTime,
@ -315,13 +315,13 @@ export default {
}));
console.log( this.options,' this.options this.options');
});
},
getlistModel() {
let data = {
pageNum: 1,
pageSize: 20,
}
listModel(this.addDateRange(data)).then(response => {
console.log(response,'responseresponseresponse');
@ -332,9 +332,9 @@ export default {
}));
console.log( this.options,' this.options this.options');
});
},
/** 查询商户列表列表 */
getList() {
this.loading = true;

4
src/views/system/user/index.vue
View File

@ -341,7 +341,7 @@
</template>
<script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { listAppUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@ -673,4 +673,4 @@ export default {
}
}
};
</script>
</script>

370
src/views/system/userWithdraw/index.vue Normal file
View File

@ -0,0 +1,370 @@
<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="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入用户"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="提现渠道" prop="channelId">-->
<!-- <el-input-->
<!-- v-model="queryParams.channelId"-->
<!-- placeholder="请输入提现渠道"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="渠道名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入渠道名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="提现类型" prop="handlingChargeType">
<el-select v-model="queryParams.handlingChargeType" placeholder="请选择提现类型" clearable>
<el-option
v-for="dict in dict.type.rl_handling_charge_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="提现手续费" prop="withdrawHandlingCharge">-->
<!-- <el-input-->
<!-- v-model="queryParams.withdrawHandlingCharge"-->
<!-- placeholder="请输入提现手续费"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="是否开通" prop="isOpen">
<el-select v-model="queryParams.isOpen" placeholder="请选择是否开通" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
: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>
</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="['system:userWithdraw: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:userWithdraw: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="['system:userWithdraw: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="['system:userWithdraw:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="userWithdrawList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="userChannelId" />
<el-table-column label="用户" align="center" prop="userId" />
<el-table-column label="提现渠道ID" align="center" prop="channelId" />
<el-table-column label="渠道名称" align="center" prop="name" />
<el-table-column label="提现类型" align="center" prop="handlingChargeType">
<template slot-scope="scope">
<dict-tag :options="dict.type.rl_handling_charge_type" :value="scope.row.handlingChargeType"/>
</template>
</el-table-column>
<el-table-column label="提现手续费" align="center" prop="withdrawHandlingCharge" />
<el-table-column label="单笔最低提现金额" align="center" prop="minAmount" />
<el-table-column label="单笔最高提现金额" align="center" prop="maxAmount" />
<el-table-column label="是否开通" align="center" prop="isOpen">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.isOpen"/>
</template>
</el-table-column>
<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="['system:userWithdraw:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:userWithdraw: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">
<el-input v-model="form.userId" placeholder="请输入用户" />
</el-form-item>
<el-form-item label="提现渠道ID" prop="channelId">
<el-input v-model="form.channelId" placeholder="请输入提现渠道ID" />
</el-form-item>
<el-form-item label="渠道名称" prop="name">
<el-input v-model="form.name" placeholder="请输入渠道名称" />
</el-form-item>
<el-form-item label="提现类型" prop="handlingChargeType">
<el-select v-model="form.handlingChargeType" placeholder="请选择提现类型">
<el-option
v-for="dict in dict.type.rl_handling_charge_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="提现手续费" prop="withdrawHandlingCharge">
<el-input v-model="form.withdrawHandlingCharge" placeholder="请输入提现手续费" />
</el-form-item>
<el-form-item label="单笔最低提现金额" prop="minAmount">
<el-input v-model="form.minAmount" placeholder="请输入单笔最低提现金额" />
</el-form-item>
<el-form-item label="单笔最高提现金额" prop="maxAmount">
<el-input v-model="form.maxAmount" placeholder="请输入单笔最高提现金额" />
</el-form-item>
<el-form-item label="是否开通" prop="isOpen">
<el-select v-model="form.isOpen" placeholder="请选择是否开通">
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</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 { listUserWithdraw, getUserWithdraw, delUserWithdraw, addUserWithdraw, updateUserWithdraw } from "@/api/rl/userWithdraw";
export default {
name: "UserWithdraw",
dicts: ['rl_handling_charge_type', 'sys_normal_disable'],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 用户提现渠道表格数据
userWithdrawList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
userId: null,
channelId: null,
name: null,
handlingChargeType: null,
withdrawHandlingCharge: null,
minAmount: null,
maxAmount: null,
isOpen: null
},
// 表单参数
form: {},
// 表单校验
rules: {
userId: [
{ required: true, message: "用户不能为空", trigger: "blur" }
],
channelId: [
{ required: true, message: "提现渠道ID不能为空", trigger: "blur" }
],
name: [
{ required: true, message: "渠道名称不能为空", trigger: "blur" }
],
minAmount: [
{ required: true, message: "单笔最低提现金额不能为空", trigger: "blur" }
],
maxAmount: [
{ required: true, message: "单笔最高提现金额不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询用户提现渠道列表 */
getList() {
this.loading = true;
listUserWithdraw(this.queryParams).then(response => {
this.userWithdrawList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
userChannelId: null,
userId: null,
channelId: null,
name: null,
handlingChargeType: null,
withdrawHandlingCharge: null,
minAmount: null,
maxAmount: null,
createTime: null,
isOpen: 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.userChannelId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加用户提现渠道";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const userChannelId = row.userChannelId || this.ids
getUserWithdraw(userChannelId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改用户提现渠道";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.userChannelId != null) {
updateUserWithdraw(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addUserWithdraw(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const userChannelIds = row.userChannelId || this.ids;
this.$modal.confirm('是否确认删除用户提现渠道编号为"' + userChannelIds + '"的数据项？').then(function() {
return delUserWithdraw(userChannelIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/userWithdraw/export', {
...this.queryParams
}, `userWithdraw_${new Date().getTime()}.xlsx`)
}
}
};
</script>

82
src/views/user/user/index.vue
View File

@ -55,48 +55,6 @@
<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="['system:user: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:user: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="['system:user:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="info"-->
<!-- plain-->
<!-- icon="el-icon-upload2"-->
<!-- size="mini"-->
<!-- @click="handleImport"-->
<!-- v-hasPermi="['system:user:import']"-->
<!-- >导入</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@ -135,35 +93,11 @@
></el-switch>
</template>
</el-table-column>
<!-- <el-table-column label="是否实名" align="center" prop="isAuthentication">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.et_user_is_authentication" :value="scope.row.isAuthentication" />-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="操作"-->
<!-- align="center"-->
<!-- width="240"-->
<!-- 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="['system:user:edit']"-->
<!-- >修改</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-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item command="handleResetPwd" icon="el-icon-key"-->
<!-- v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>-->
<!-- <el-dropdown-item command="handleBandSysUser" icon="el-icon-circle-check"-->
<!-- v-hasPermi="['system:user:edit']">绑定系统用户</el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="是否实名" align="center" prop="isAuthentication">
<template slot-scope="scope">
<dict-tag :options="dict.type.rl_user_is_authentication" :value="scope.row.isAuthentication" />
</template>
</el-table-column>
</el-table>
<pagination
@ -321,13 +255,13 @@
</template>
<script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus,bandSystemUser } from "@/api/user/user";
import { listAppUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus,bandSystemUser } from "@/api/user/user";
import { getToken } from "@/utils/auth";
import { listUser as getSysUserList } from "@/api/system/user";
export default {
name: "User",
dicts: ['sys_normal_disable', 'sys_user_sex','et_user_is_authentication','et_asuser_role'],
dicts: ['sys_normal_disable', 'sys_user_sex','rl_user_is_authentication','et_asuser_role'],
data() {
return {
// 遮罩层
@ -452,7 +386,7 @@ export default {
/** 查询用户列表 */
getList() {
this.loading = true;
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listAppUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.userList = response.rows;
this.total = response.total;
this.loading = false;