Skip to content

A
adminv2
Commit fe787bf4 authored by zhangsan's avatar zhangsan
Browse files
Options

1

parent 6c5aa02a
Show whitespace changes
Inline Side-by-side
Showing with 221 additions and 404 deletions
src/views/system/user/index.vue
View file @ fe787bf4
......@@ -12,78 +12,32 @@
</p>
</div>
<!--用户数据-->
<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="search">
<el-input
v-model="queryParams.search"
placeholder="请输入用户名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.search" placeholder="请输入用户名称" clearable style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="会员等级" prop="vip">
<el-select
v-model="queryParams.vip"
placeholder="选择会员等级"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_user_vip"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-select v-model="queryParams.vip" placeholder="选择会员等级" clearable style="width: 240px">
<el-option v-for="dict in dict.type.sys_user_vip" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-input
v-model="queryParams.phonenumber"
placeholder="请输入手机号码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="身份证" prop="identityId">
<el-input
v-model="queryParams.identityId"
placeholder="请输入身份证号码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.identityId" placeholder="请输入身份证号码" clearable style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="搜索下级" prop="wdzh">
<el-input
v-model="wdzh"
placeholder="请输入我账号"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="wdzh" placeholder="请输入我账号" clearable style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="用户状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.commen_status0"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
<el-option v-for="dict in dict.type.commen_status0" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<!-- <el-form-item label="创建时间">-->
......@@ -98,79 +52,41 @@
<!-- ></el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索
<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 icon="el-icon-refresh" size="mini" @click="resetQuery">重置
</el-button>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="px"
>排序
<el-button type="primary" icon="el-icon-search" size="mini" @click="px">排序
</el-button>
<el-button type="danger" icon="el-icon-refresh" @click="resetQuery1">批量重置密码</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="userList"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="50" align="center" />-->
<el-table-column
label="ID"
align="center"
key="userId"
prop="userId"
v-if="columns[0].visible"
/>
<el-table-column
label="注册时间"
align="center"
prop="createTime"
v-if="columns[6].visible"
width="160"
>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="ID" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
<el-table-column label="注册时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="手机号码"
align="center"
key="phonenumber"
prop="phonenumber"
width="120"
/>
<el-table-column
label="用户名"
align="center"
key="userName"
prop="userName"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column label="账户余额" align="center" prop="resultVo">-->
<!-- <template slot-scope="scope">-->
<!-- <div v-for="(item,index) in scope.row.resultVo" :key="index"><span-->
<!-- v-if="item.walletType==0"> {{ +item.balance }}</span></div>-->
<el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" width="120" />
<el-table-column label="用户名" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
<!-- <el-table-column label="账户余额" align="center" prop="resultVo">-->
<!-- <template slot-scope="scope">-->
<!-- <div v-for="(item,index) in scope.row.resultVo" :key="index"><span-->
<!-- v-if="item.walletType==0"> {{ +item.balance }}</span></div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="交易密码"-->
<!-- align="center"-->
<!-- key="email"-->
<!-- prop="email"-->
<!-- :show-overflow-tooltip="true"-->
<!-- />-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- label="交易密码"-->
<!-- align="center"-->
<!-- key="email"-->
<!-- prop="email"-->
<!-- :show-overflow-tooltip="true"-->
<!-- />-->
<!-- <el-table-column-->
<!-- label="用户会员"-->
<!-- align="center"-->
......@@ -185,116 +101,44 @@
<!-- ></DictTag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="邀请码" align="center" prop="yqm"/>
<el-table-column
label="上级名称"
align="center"
key="pName"
prop="pName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="上级账号"
align="center"
key="pPhone"
prop="pPhone"
width="120"
/>
<el-table-column
label="余额"
align="center"
key="balance"
prop="balance"
width="120"
/>
<el-table-column
label="直推人数"
align="center"
key="ztNum"
prop="ztNum"
width="120"
/>
<el-table-column
label="是否实名"
align="center"
key=""
prop="identityId "
width="120"
>
<el-table-column label="邀请码" align="center" prop="yqm" />
<el-table-column label="上级名称" align="center" key="pName" prop="pName" :show-overflow-tooltip="true" />
<el-table-column label="上级账号" align="center" key="pPhone" prop="pPhone" width="120" />
<el-table-column label="余额" align="center" key="balance" prop="balance" width="120" />
<el-table-column label="直推人数" align="center" key="ztNum" prop="ztNum" width="120" />
<el-table-column label="是否实名" align="center" key="" prop="identityId " width="120">
<template slot-scope="scope">
{{ scope.row.identityId | switchTrue }}
</template>
</el-table-column>
<el-table-column
label="身份证号"
align="center"
key="identityId"
prop="identityId"
width="120"
/>
<el-table-column
label="状态"
align="center"
key="status"
v-if="columns[5].visible"
>
<el-table-column label="身份证号" align="center" key="identityId" prop="identityId" width="120" />
<el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
<template slot-scope="scope">
<DictTag
:options="dict.type.commen_status0"
:value="scope.row.status"
></DictTag>
<DictTag :options="dict.type.commen_status0" :value="scope.row.status"></DictTag>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
width="160"
class-name="small-padding fixed-width"
>
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="handleparssword(scope.row)"
v-hasPermi="['system:user:edit']"
>删除用户
<el-button size="mini" type="danger" @click="handleparssword(scope.row)"
v-hasPermi="['system:user:edit']">删除用户
</el-button>
<el-button
size="mini"
type="primary"
@click="updateparssword(scope.row)"
v-hasPermi="['system:user:edit']"
>密码修改
<el-button size="mini" type="primary" @click="updateparssword(scope.row)"
v-hasPermi="['system:user:edit']">密码修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']"
>修改
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']">修改
</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"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<el-dialog :title="title" :visible.sync="openpwd" width="600px" append-to-body>
<el-input
v-model="pwd"
placeholder="请输入新密码"
maxlength="30"
/>
<el-input v-model="pwd" placeholder="请输入新密码" maxlength="30" />
<div slot="footer" class="dialog-footer">
......@@ -308,61 +152,41 @@
<el-row>
<el-col :span="12">
<el-form-item label="真实姓名" prop="nickName">
<el-input
v-model="form.nickName"
placeholder="请输入真实姓名"
maxlength="30"
/>
<el-input v-model="form.nickName" placeholder="请输入真实姓名" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号码" prop="identityId">
<el-input
v-model="form.identityId"
placeholder="请输入身份证号码"
/>
<el-input v-model="form.identityId" placeholder="请输入身份证号码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邀请码" prop="yqm">
<el-input v-model="form.yqm" placeholder="请输入邀请码"/>
<el-input v-model="form.yqm" placeholder="请输入邀请码" />
</el-form-item>
<el-form-item label="账户余额" prop="balance">
<el-input v-model="zhye.balance" placeholder="请输入余额"/>
<el-input v-model="zhye.balance" placeholder="请输入余额" />
</el-form-item>
<!-- <el-form-item label="交易密码" prop="email">-->
<!-- <el-input v-model="form.email" placeholder="请输入交易密码"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="交易密码" prop="email">-->
<!-- <el-input v-model="form.email" placeholder="请输入交易密码"/>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="会员等级" prop="vip">
<el-select
v-model="form.vip"
placeholder="选择会员等级"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.sys_user_vip"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-select v-model="form.vip" placeholder="选择会员等级" clearable style="width: 240px">
<el-option v-for="dict in dict.type.sys_user_vip" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="手机号码" prop="phonenumber">
<el-input
v-model="form.phonenumber"
placeholder="请输入手机号码"
maxlength="11"
/>
<el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
</el-form-item>
</el-col>
......@@ -372,11 +196,8 @@
<el-col :span="12">
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.commen_status0"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
<el-radio v-for="dict in dict.type.commen_status0" :key="dict.value" :label="dict.value">{{ dict.label
}}
</el-radio>
</el-radio-group>
</el-form-item>
......@@ -384,11 +205,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="备注">
<el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
></el-input>
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -400,38 +217,20 @@
</el-dialog>
<!-- 用户导入对话框 -->
<el-dialog
:title="upload.title"
:visible.sync="upload.open"
width="400px"
append-to-body
>
<el-upload
ref="upload"
:limit="1"
accept=".xlsx, .xls"
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
:auto-upload="false"
drag
>
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport"/>
<el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link
type="primary"
:underline="false"
style="font-size: 12px; vertical-align: baseline"
@click="importTemplate"
>下载模板
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
@click="importTemplate">下载模板
</el-link>
</div>
</el-upload>
......@@ -461,18 +260,18 @@ import {
getcount,
getpassword, edipwd, deleteuse
} from "@/api/ops/user/guanli";
import {getToken} from "@/utils/auth";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import request from '@/utils/request'
export default {
name: "User",
dicts: ["commen_status0", "sys_user_sex", "sys_user_vip"],
components: {Treeselect},
components: { Treeselect },
data() {
return {
pxs:'',
wdzh:'',
pxs: '',
wdzh: '',
zhye: {},
pwdId: null,
pwd: '',
......@@ -528,7 +327,7 @@ export default {
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: {Authorization: "Bearer " + getToken()},
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/system/user/importData",
},
......@@ -543,21 +342,21 @@ export default {
},
// 列信息
columns: [
{key: 0, label: `ID`, visible: true},
{key: 1, label: `注册时间`, visible: true},
{key: 2, label: `手机号码`, visible: true},
{key: 3, label: `用户名`, visible: true},
{key: 4, label: `用户会员`, visible: true},
{key: 5, label: `上级名称`, visible: true},
{key: 6, label: `上级账号`, visible: true},
{key: 7, label: `直推人数`, visible: true},
{key: 6, label: `身份证号`, visible: true},
{key: 6, label: `状态`, visible: true},
{ key: 0, label: `ID`, visible: true },
{ key: 1, label: `注册时间`, visible: true },
{ key: 2, label: `手机号码`, visible: true },
{ key: 3, label: `用户名`, visible: true },
{ key: 4, label: `用户会员`, visible: true },
{ key: 5, label: `上级名称`, visible: true },
{ key: 6, label: `上级账号`, visible: true },
{ key: 7, label: `直推人数`, visible: true },
{ key: 6, label: `身份证号`, visible: true },
{ key: 6, label: `状态`, visible: true },
],
// 表单校验
rules: {
userName: [
{required: true, message: "用户名称不能为空", trigger: "blur"},
{ required: true, message: "用户名称不能为空", trigger: "blur" },
{
min: 2,
max: 20,
......@@ -695,8 +494,8 @@ export default {
// console.log(res)
// })
this.loading = true;
this.queryParams.params={pPhone:this.wdzh,ztSort:this.pxs}
getdata( this.addDateRange(this.queryParams, this.dateRange)).then((res) => {
this.queryParams.params = { pPhone: this.wdzh, ztSort: this.pxs }
getdata(this.addDateRange(this.queryParams, this.dateRange)).then((res) => {
console.log(res);
this.userList = res.rows;
......@@ -744,7 +543,7 @@ export default {
},
// 表单重置
reset() {
this.wdzh=''
this.wdzh = ''
this.form = {
search: undefined,
phonenumber: undefined,
......@@ -762,8 +561,26 @@ export default {
this.getList();
},
/** 重置按钮操作 */
resetQuery1() {
if (!this.ids.length) {
this.$message({
type: "info",
message: "请先选择用户",
});
}
request({
url: "/system/user/profile/updatePwdReset",
method: 'post',
data: {
userIds: this.ids
}
}).then(res=>{
this.$message.success("重置成功")
this.getList();
})
},
resetQuery() {
this.wdzh=''
this.wdzh = ''
this.dateRange = [];
this.resetForm("queryForm");
this.queryParams.deptId = undefined;
......@@ -804,7 +621,7 @@ export default {
handleUpdate(row) {
this.reset();
const userId = row.userId;
getuser({userId: userId}).then((response) => {
getuser({ userId: userId }).then((response) => {
// console.log(response)
this.form = response.data;
......@@ -841,7 +658,7 @@ export default {
inputPattern: /^.{5,20}$/,
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
})
.then(({value}) => {
.then(({ value }) => {
resetUserPwd(row.userId, value).then((response) => {
this.$modal.msgSuccess("修改成功，新密码是：" + value);
});
......@@ -960,7 +777,7 @@ export default {
response.msg +
"</div>",
"导入结果",
{dangerouslyUseHTMLString: true}
{ dangerouslyUseHTMLString: true }
);
this.getList();
},
......
vue.config.js
View file @ fe787bf4
......@@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://27.124.5.14:9012`,
target: `http://27.124.5.14:9014`,
// target: `http://192.168.1.5:8100`,
// target: `https://www.yinlian168.vip/api`,
// target: `https://www.yidaiyiluzf.com/api`,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment