Commit fe787bf4 authored by zhangsan's avatar zhangsan

1

parent 6c5aa02a
...@@ -12,78 +12,32 @@ ...@@ -12,78 +12,32 @@
</p> </p>
</div> </div>
<!--用户数据--> <!--用户数据-->
<el-form <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="用户名称" prop="search"> <el-form-item label="用户名称" prop="search">
<el-input <el-input v-model="queryParams.search" placeholder="请输入用户名称" clearable style="width: 240px"
v-model="queryParams.search" @keyup.enter.native="handleQuery" />
placeholder="请输入用户名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="会员等级" prop="vip"> <el-form-item label="会员等级" prop="vip">
<el-select <el-select v-model="queryParams.vip" placeholder="选择会员等级" clearable style="width: 240px">
v-model="queryParams.vip" <el-option v-for="dict in dict.type.sys_user_vip" :key="dict.value" :label="dict.label" :value="dict.value" />
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-select>
</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="identityId"> <el-form-item label="身份证" prop="identityId">
<el-input <el-input v-model="queryParams.identityId" placeholder="请输入身份证号码" clearable style="width: 240px"
v-model="queryParams.identityId" @keyup.enter.native="handleQuery" />
placeholder="请输入身份证号码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="搜索下级" prop="wdzh"> <el-form-item label="搜索下级" prop="wdzh">
<el-input <el-input v-model="wdzh" placeholder="请输入我账号" clearable style="width: 240px"
v-model="wdzh" @keyup.enter.native="handleQuery" />
placeholder="请输入我账号"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</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.commen_status0" :key="dict.value" :label="dict.label"
placeholder="用户状态" :value="dict.value" />
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-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="创建时间">--> <!-- <el-form-item label="创建时间">-->
...@@ -98,79 +52,41 @@ ...@@ -98,79 +52,41 @@
<!-- ></el-date-picker>--> <!-- ></el-date-picker>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索
</el-button> </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>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="px">排序
type="primary"
icon="el-icon-search"
size="mini"
@click="px"
>排序
</el-button> </el-button>
<el-button type="danger" icon="el-icon-refresh" @click="resetQuery1">批量重置密码</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
v-loading="loading" <el-table-column type="selection" width="50" align="center" />
:data="userList" <el-table-column label="ID" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
@selection-change="handleSelectionChange" <el-table-column label="注册时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
>
<!-- <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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" width="120" />
label="手机号码" <el-table-column label="用户名" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
align="center" <!-- <el-table-column label="账户余额" align="center" prop="resultVo">-->
key="phonenumber" <!-- <template slot-scope="scope">-->
prop="phonenumber" <!-- <div v-for="(item,index) in scope.row.resultVo" :key="index"><span-->
width="120" <!-- v-if="item.walletType==0"> {{ +item.balance }}</span></div>-->
/>
<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>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="交易密码"--> <!-- label="交易密码"-->
<!-- align="center"--> <!-- align="center"-->
<!-- key="email"--> <!-- key="email"-->
<!-- prop="email"--> <!-- prop="email"-->
<!-- :show-overflow-tooltip="true"--> <!-- :show-overflow-tooltip="true"-->
<!-- />--> <!-- />-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="用户会员"--> <!-- label="用户会员"-->
<!-- align="center"--> <!-- align="center"-->
...@@ -185,116 +101,44 @@ ...@@ -185,116 +101,44 @@
<!-- ></DictTag>--> <!-- ></DictTag>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="邀请码" align="center" prop="yqm"/> <el-table-column label="邀请码" align="center" prop="yqm" />
<el-table-column <el-table-column label="上级名称" align="center" key="pName" prop="pName" :show-overflow-tooltip="true" />
label="上级名称" <el-table-column label="上级账号" align="center" key="pPhone" prop="pPhone" width="120" />
align="center" <el-table-column label="余额" align="center" key="balance" prop="balance" width="120" />
key="pName" <el-table-column label="直推人数" align="center" key="ztNum" prop="ztNum" width="120" />
prop="pName" <el-table-column label="是否实名" align="center" key="" prop="identityId " width="120">
: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"> <template slot-scope="scope">
{{ scope.row.identityId | switchTrue }} {{ scope.row.identityId | switchTrue }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="身份证号" align="center" key="identityId" prop="identityId" width="120" />
label="身份证号" <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
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"> <template slot-scope="scope">
<DictTag <DictTag :options="dict.type.commen_status0" :value="scope.row.status"></DictTag>
:options="dict.type.commen_status0"
:value="scope.row.status"
></DictTag>
</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"> <template slot-scope="scope">
<el-button <el-button size="mini" type="danger" @click="handleparssword(scope.row)"
size="mini" v-hasPermi="['system:user:edit']">删除用户
type="danger"
@click="handleparssword(scope.row)"
v-hasPermi="['system:user:edit']"
>删除用户
</el-button> </el-button>
<el-button <el-button size="mini" type="primary" @click="updateparssword(scope.row)"
size="mini" v-hasPermi="['system:user:edit']">密码修改
type="primary"
@click="updateparssword(scope.row)"
v-hasPermi="['system:user:edit']"
>密码修改
</el-button> </el-button>
<el-button <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
size="mini" v-hasPermi="['system:user:edit']">修改
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']"
>修改
</el-button> </el-button>
</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-dialog :title="title" :visible.sync="openpwd" width="600px" append-to-body> <el-dialog :title="title" :visible.sync="openpwd" width="600px" append-to-body>
<el-input <el-input v-model="pwd" placeholder="请输入新密码" maxlength="30" />
v-model="pwd"
placeholder="请输入新密码"
maxlength="30"
/>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -308,61 +152,41 @@ ...@@ -308,61 +152,41 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="真实姓名" prop="nickName"> <el-form-item label="真实姓名" prop="nickName">
<el-input <el-input v-model="form.nickName" placeholder="请输入真实姓名" maxlength="30" />
v-model="form.nickName"
placeholder="请输入真实姓名"
maxlength="30"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证号码" prop="identityId"> <el-form-item label="身份证号码" prop="identityId">
<el-input <el-input v-model="form.identityId" placeholder="请输入身份证号码" />
v-model="form.identityId"
placeholder="请输入身份证号码"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="邀请码" prop="yqm"> <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>
<el-form-item label="账户余额" prop="balance"> <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>
<!-- <el-form-item label="交易密码" prop="email">--> <!-- <el-form-item label="交易密码" prop="email">-->
<!-- <el-input v-model="form.email" placeholder="请输入交易密码"/>--> <!-- <el-input v-model="form.email" placeholder="请输入交易密码"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="会员等级" prop="vip"> <el-form-item label="会员等级" prop="vip">
<el-select <el-select v-model="form.vip" placeholder="选择会员等级" clearable style="width: 240px">
v-model="form.vip" <el-option v-for="dict in dict.type.sys_user_vip" :key="dict.value" :label="dict.label"
placeholder="选择会员等级" :value="dict.value" />
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-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机号码" prop="phonenumber"> <el-form-item label="手机号码" prop="phonenumber">
<el-input <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
v-model="form.phonenumber"
placeholder="请输入手机号码"
maxlength="11"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -372,11 +196,8 @@ ...@@ -372,11 +196,8 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="状态"> <el-form-item label="状态">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio v-for="dict in dict.type.commen_status0" :key="dict.value" :label="dict.value">{{ dict.label
v-for="dict in dict.type.commen_status0" }}
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
...@@ -384,11 +205,7 @@ ...@@ -384,11 +205,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -400,38 +217,20 @@ ...@@ -400,38 +217,20 @@
</el-dialog> </el-dialog>
<!-- 用户导入对话框 --> <!-- 用户导入对话框 -->
<el-dialog <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
:title="upload.title" <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:visible.sync="upload.open" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
width="400px" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
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> <i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div> <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip"> <div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip"> <div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport"/> <el-checkbox v-model="upload.updateSupport" />
是否更新已经存在的用户数据 是否更新已经存在的用户数据
</div> </div>
<span>仅允许导入xls、xlsx格式文件。</span> <span>仅允许导入xls、xlsx格式文件。</span>
<el-link <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
type="primary" @click="importTemplate">下载模板
:underline="false"
style="font-size: 12px; vertical-align: baseline"
@click="importTemplate"
>下载模板
</el-link> </el-link>
</div> </div>
</el-upload> </el-upload>
...@@ -461,18 +260,18 @@ import { ...@@ -461,18 +260,18 @@ import {
getcount, getcount,
getpassword, edipwd, deleteuse getpassword, edipwd, deleteuse
} from "@/api/ops/user/guanli"; } from "@/api/ops/user/guanli";
import {getToken} from "@/utils/auth"; import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import request from '@/utils/request'
export default { export default {
name: "User", name: "User",
dicts: ["commen_status0", "sys_user_sex", "sys_user_vip"], dicts: ["commen_status0", "sys_user_sex", "sys_user_vip"],
components: {Treeselect}, components: { Treeselect },
data() { data() {
return { return {
pxs:'', pxs: '',
wdzh:'', wdzh: '',
zhye: {}, zhye: {},
pwdId: null, pwdId: null,
pwd: '', pwd: '',
...@@ -528,7 +327,7 @@ export default { ...@@ -528,7 +327,7 @@ export default {
// 是否更新已经存在的用户数据 // 是否更新已经存在的用户数据
updateSupport: 0, updateSupport: 0,
// 设置上传的请求头部 // 设置上传的请求头部
headers: {Authorization: "Bearer " + getToken()}, headers: { Authorization: "Bearer " + getToken() },
// 上传的地址 // 上传的地址
url: process.env.VUE_APP_BASE_API + "/system/user/importData", url: process.env.VUE_APP_BASE_API + "/system/user/importData",
}, },
...@@ -543,21 +342,21 @@ export default { ...@@ -543,21 +342,21 @@ export default {
}, },
// 列信息 // 列信息
columns: [ columns: [
{key: 0, label: `ID`, visible: true}, { key: 0, label: `ID`, visible: true },
{key: 1, label: `注册时间`, visible: true}, { key: 1, label: `注册时间`, visible: true },
{key: 2, label: `手机号码`, visible: true}, { key: 2, label: `手机号码`, visible: true },
{key: 3, label: `用户名`, visible: true}, { key: 3, label: `用户名`, visible: true },
{key: 4, label: `用户会员`, visible: true}, { key: 4, label: `用户会员`, visible: true },
{key: 5, label: `上级名称`, visible: true}, { key: 5, label: `上级名称`, visible: true },
{key: 6, label: `上级账号`, visible: true}, { key: 6, label: `上级账号`, visible: true },
{key: 7, label: `直推人数`, visible: true}, { key: 7, label: `直推人数`, visible: true },
{key: 6, label: `身份证号`, visible: true}, { key: 6, label: `身份证号`, visible: true },
{key: 6, label: `状态`, visible: true}, { key: 6, label: `状态`, visible: true },
], ],
// 表单校验 // 表单校验
rules: { rules: {
userName: [ userName: [
{required: true, message: "用户名称不能为空", trigger: "blur"}, { required: true, message: "用户名称不能为空", trigger: "blur" },
{ {
min: 2, min: 2,
max: 20, max: 20,
...@@ -637,26 +436,26 @@ export default { ...@@ -637,26 +436,26 @@ export default {
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
console.log(row.userName); console.log(row.userName);
// let data = { // let data = {
// userId: row.userId, // userId: row.userId,
// }; // };
// console.log(data); // console.log(data);
deleteuse(row.userId).then((res) => { deleteuse(row.userId).then((res) => {
this.$message({
type: "success",
message: "删除成功!",
});
this.getList();
});
})
.catch(() => {
this.$message({ this.$message({
type: "info", type: "success",
message: "已取消删除", message: "删除成功!",
}); });
this.getList();
}); });
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除",
});
});
}, },
// 提示内容 // 提示内容
edit() { edit() {
...@@ -665,18 +464,18 @@ export default { ...@@ -665,18 +464,18 @@ export default {
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
this.$message({ this.$message({
type: "success", type: "success",
message: "删除成功!", message: "删除成功!",
}); });
}) })
.catch(() => { .catch(() => {
this.$message({ this.$message({
type: "info", type: "info",
message: "已取消删除", message: "已取消删除",
});
}); });
});
}, },
gettol() { gettol() {
getdata().then((res) => { getdata().then((res) => {
...@@ -695,8 +494,8 @@ export default { ...@@ -695,8 +494,8 @@ export default {
// console.log(res) // console.log(res)
// }) // })
this.loading = true; this.loading = true;
this.queryParams.params={pPhone:this.wdzh,ztSort:this.pxs} this.queryParams.params = { pPhone: this.wdzh, ztSort: this.pxs }
getdata( this.addDateRange(this.queryParams, this.dateRange)).then((res) => { getdata(this.addDateRange(this.queryParams, this.dateRange)).then((res) => {
console.log(res); console.log(res);
this.userList = res.rows; this.userList = res.rows;
...@@ -724,16 +523,16 @@ export default { ...@@ -724,16 +523,16 @@ export default {
handleStatusChange(row) { handleStatusChange(row) {
let text = row.status === "0" ? "正常" : "停用"; let text = row.status === "0" ? "正常" : "停用";
this.$modal this.$modal
.confirm('确认要"' + text + '""' + row.userName + '"用户吗?') .confirm('确认要"' + text + '""' + row.userName + '"用户吗?')
.then(function () { .then(function () {
return changeUserStatus(row.userId, row.status); return changeUserStatus(row.userId, row.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";
}); });
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
...@@ -744,7 +543,7 @@ export default { ...@@ -744,7 +543,7 @@ export default {
}, },
// 表单重置 // 表单重置
reset() { reset() {
this.wdzh='' this.wdzh = ''
this.form = { this.form = {
search: undefined, search: undefined,
phonenumber: undefined, phonenumber: undefined,
...@@ -762,8 +561,26 @@ export default { ...@@ -762,8 +561,26 @@ export default {
this.getList(); 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() { resetQuery() {
this.wdzh='' this.wdzh = ''
this.dateRange = []; this.dateRange = [];
this.resetForm("queryForm"); this.resetForm("queryForm");
this.queryParams.deptId = undefined; this.queryParams.deptId = undefined;
...@@ -804,7 +621,7 @@ export default { ...@@ -804,7 +621,7 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const userId = row.userId; const userId = row.userId;
getuser({userId: userId}).then((response) => { getuser({ userId: userId }).then((response) => {
// console.log(response) // console.log(response)
this.form = response.data; this.form = response.data;
...@@ -841,13 +658,13 @@ export default { ...@@ -841,13 +658,13 @@ export default {
inputPattern: /^.{5,20}$/, inputPattern: /^.{5,20}$/,
inputErrorMessage: "用户密码长度必须介于 5 和 20 之间", inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
}) })
.then(({value}) => { .then(({ value }) => {
resetUserPwd(row.userId, value).then((response) => { resetUserPwd(row.userId, value).then((response) => {
this.$modal.msgSuccess("修改成功,新密码是:" + value); this.$modal.msgSuccess("修改成功,新密码是:" + value);
});
})
.catch(() => {
}); });
})
.catch(() => {
});
}, },
qrxgmm() { qrxgmm() {
...@@ -869,68 +686,68 @@ export default { ...@@ -869,68 +686,68 @@ export default {
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.userId != undefined) { if (this.form.userId != undefined) {
if (this.zhye.balance) { if (this.zhye.balance) {
balanceupdata({ balanceupdata({
walletType: 0, walletType: 0,
balance: +this.zhye.balance, balance: +this.zhye.balance,
userId: this.form.userId, userId: this.form.userId,
walletId: +this.zhye.walletId walletId: +this.zhye.walletId
}).then(res => { }).then(res => {
console.log(res) console.log(res)
}) })
}
edituser(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
this.getzuce();
this.gettol();
});
} else {
addUser(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
} }
edituser(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
this.getzuce();
this.gettol();
});
} else {
addUser(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
} }
}); }
})
.catch(() => {
this.$message({
type: "info",
message: "已取消更改",
});
}); });
})
.catch(() => {
this.$message({
type: "info",
message: "已取消更改",
});
});
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const userIds = row.userId || this.ids; const userIds = row.userId || this.ids;
this.$modal this.$modal
.confirm('是否确认删除用户编号为"' + userIds + '"的数据项?') .confirm('是否确认删除用户编号为"' + userIds + '"的数据项?')
.then(function () { .then(function () {
return delUser(userIds); return delUser(userIds);
}) })
.then(() => { .then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}) })
.catch(() => { .catch(() => {
}); });
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download( this.download(
"system/user/export", "system/user/export",
{ {
...this.queryParams, ...this.queryParams,
}, },
`user_${new Date().getTime()}.xlsx` `user_${new Date().getTime()}.xlsx`
); );
}, },
/** 导入按钮操作 */ /** 导入按钮操作 */
...@@ -941,9 +758,9 @@ export default { ...@@ -941,9 +758,9 @@ export default {
/** 下载模板操作 */ /** 下载模板操作 */
importTemplate() { importTemplate() {
this.download( this.download(
"system/user/importTemplate", "system/user/importTemplate",
{}, {},
`user_template_${new Date().getTime()}.xlsx` `user_template_${new Date().getTime()}.xlsx`
); );
}, },
// 文件上传中处理 // 文件上传中处理
...@@ -956,11 +773,11 @@ export default { ...@@ -956,11 +773,11 @@ export default {
this.upload.isUploading = false; this.upload.isUploading = false;
this.$refs.upload.clearFiles(); this.$refs.upload.clearFiles();
this.$alert( this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg + response.msg +
"</div>", "</div>",
"导入结果", "导入结果",
{dangerouslyUseHTMLString: true} { dangerouslyUseHTMLString: true }
); );
this.getList(); this.getList();
}, },
......
...@@ -35,7 +35,7 @@ module.exports = { ...@@ -35,7 +35,7 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [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: `http://192.168.1.5:8100`,
// target: `https://www.yinlian168.vip/api`, // target: `https://www.yinlian168.vip/api`,
// target: `https://www.yidaiyiluzf.com/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