添加默认设置

This commit is contained in:
huangdeliang 2020-10-08 10:51:59 +08:00
parent 92fc73e923
commit 8f656d7ee0
7 changed files with 1408 additions and 1336 deletions

View File

@ -18,6 +18,16 @@ public class CusUserPost implements Serializable {
private String postName; private String postName;
private String remark;
public void setRemark(String remark) {
this.remark = remark;
}
public String getRemark() {
return remark;
}
public void setPostName(String postName) { public void setPostName(String postName) {
this.postName = postName; this.postName = postName;
} }
@ -66,6 +76,7 @@ public class CusUserPost implements Serializable {
", postCode='" + postCode + '\'' + ", postCode='" + postCode + '\'' +
", postid='" + postId + '\'' + ", postid='" + postId + '\'' +
", postName='" + postName + '\'' + ", postName='" + postName + '\'' +
", remark='" + remark + '\'' +
'}'; '}';
} }
} }

View File

@ -10,10 +10,11 @@
<result property="postId" column="post_id"/> <result property="postId" column="post_id"/>
<result property="postCode" column="post_code"/> <result property="postCode" column="post_code"/>
<result property="postName" column="post_name"/> <result property="postName" column="post_name"/>
<result property="remark" column="remark"/>
</resultMap> </resultMap>
<sql id="selectCusUserPostVo"> <sql id="selectCusUserPostVo">
SELECT u.user_id, u.nick_name, p.post_id, p.post_code, p.post_name SELECT u.user_id, u.nick_name, p.post_id, p.post_code, p.post_name, u.remark
FROM sys_user u, sys_post p, sys_user_post up FROM sys_user u, sys_post p, sys_user_post up
WHERE up.user_id = u.user_id AND p.post_id = up.post_id AND p.post_id > 4 WHERE up.user_id = u.user_id AND p.post_id = up.post_id AND p.post_id > 4
</sql> </sql>

View File

@ -65,7 +65,7 @@
</el-table-column> </el-table-column>
<el-table-column label="提成" align="center" prop="commision"> <el-table-column label="提成" align="center" prop="commision">
<template scope="scope"> <template scope="scope">
{{toThousands(scope.row.commision)}} {{scope.row.commision.toFixed(2)}}
</template> </template>
</el-table-column> </el-table-column>

View File

@ -19,7 +19,7 @@
<el-option v-for="dict in payTypeIdOptions" <el-option v-for="dict in payTypeIdOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue"/> :value="parseInt(dict.dictValue)"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -29,7 +29,7 @@
<el-option v-for="dict in preSaleIdOptions" <el-option v-for="dict in preSaleIdOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue"/> :value="parseInt(dict.dictValue)"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -39,7 +39,7 @@
<el-option v-for="dict in afterSaleIdOptions" <el-option v-for="dict in afterSaleIdOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue"/> :value="parseInt(dict.dictValue)"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -49,7 +49,7 @@
<el-option v-for="dict in nutritionistIdOptions" <el-option v-for="dict in nutritionistIdOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue"/> :value="parseInt(dict.dictValue)"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -60,7 +60,7 @@
<el-option v-for="dict in nutriAssisIdOptions" <el-option v-for="dict in nutriAssisIdOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue"/> :value="parseInt(dict.dictValue)"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -72,7 +72,7 @@
v-for="dict in accountIdOptions" v-for="dict in accountIdOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue" :value="parseInt(dict.dictValue)"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -84,7 +84,7 @@
<el-option v-for="dict in plannerIdOptions" <el-option v-for="dict in plannerIdOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue"/> :value="parseInt(dict.dictValue)"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -95,7 +95,7 @@
<el-option v-for="dict in plannerAssisIdOptions" <el-option v-for="dict in plannerAssisIdOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue"/> :value="parseInt(dict.dictValue)"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -106,7 +106,7 @@
<el-option v-for="dict in operatorIdOptions" <el-option v-for="dict in operatorIdOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue"/> :value="parseInt(dict.dictValue)"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -537,9 +537,9 @@
getOptions().then(response => { getOptions().then(response => {
const options = response.data.reduce((opts, cur) => { const options = response.data.reduce((opts, cur) => {
if (!opts[cur.postCode]) { if (!opts[cur.postCode]) {
opts[cur.postCode] = []; opts[cur.postCode] = [{dictValue: 0, dictLabel: ' ', remark: null}];
} }
opts[cur.postCode].push({dictValue: cur.userId, dictLabel: cur.userName}) opts[cur.postCode].push({dictValue: cur.userId, dictLabel: cur.userName, remark: cur.remark})
return opts; return opts;
}, {}) }, {})
this.preSaleIdOptions = options['pre_sale'] || []; this.preSaleIdOptions = options['pre_sale'] || [];
@ -616,28 +616,38 @@
// //
reset() { reset() {
const defaultPayType = this.payTypeIdOptions.find(opt => opt.remark === 'default'); const defaultPayType = this.payTypeIdOptions.find(opt => opt.remark === 'default');
const defaultServeMonth = this.serveMonthOption.find(opt => opt.remark === 'default');
const defaultAccount = this.accountIdOptions.find(opt => opt.remark === 'default');
const defaultOperator = this.operatorIdOptions.find(opt => opt.remark === 'default');
const defaultPresale = this.preSaleIdOptions.find(opt => opt.remark === 'default');
const defaultAftersale = this.afterSaleIdOptions.find(opt => opt.remark === 'default');
const defaultNutritionist = this.nutritionistIdOptions.find(opt => opt.remark === 'default');
const defaultNutriAssis = this.nutriAssisIdOptions.find(opt => opt.remark === 'default');
const defaultPlanner = this.plannerIdOptions.find(opt => opt.remark === 'default');
const defaultPlannerAssis = this.plannerAssisIdOptions.find(opt => opt.remark === 'default');
this.form = { this.form = {
orderId: null, orderId: null,
customer: null, customer: null,
phone: null, phone: null,
amount: null, amount: null,
payTypeId: defaultPayType ? parseInt(defaultPayType.dictValue) : null, payTypeId: defaultPayType ? parseInt(defaultPayType.dictValue) : null,
preSaleId: null, preSaleId: defaultPresale ? parseInt(defaultPresale.dictValue) : null,
createBy: null, createBy: null,
createTime: null, createTime: null,
afterSaleId: null, afterSaleId: defaultAftersale ? parseInt(defaultAftersale.dictValue) : null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
nutritionistId: null, nutritionistId: defaultNutritionist ? parseInt(defaultNutritionist.dictValue) : null,
remark: null, remark: null,
nutriAssisId: null, nutriAssisId: defaultNutriAssis ? parseInt(defaultNutriAssis.dictValue) : null,
accountId: null, accountId: defaultAccount ? parseInt(defaultAccount.dictValue) : null,
plannerId: null, plannerId: defaultPlanner ? parseInt(defaultPlanner.dictValue) : null,
plannerAssisId: null, plannerAssisId: defaultPlannerAssis ? parseInt(defaultPlannerAssis.dictValue) : null,
operatorId: null, operatorId: defaultOperator ? parseInt(defaultOperator.dictValue) : null,
recommender: null, recommender: null,
orderTime: null, orderTime: null,
serveMonth: 1, serveMonth: defaultServeMonth ? parseInt(defaultServeMonth.dictValue) : 1,
reviewStatus: 'no'
}; };
this.resetForm("form"); this.resetForm("form");
}, },

View File

@ -45,26 +45,26 @@
v-hasPermi="['system:post:add']" v-hasPermi="['system:post: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" <!-- type="success"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
v-hasPermi="['system:post:edit']" <!-- v-hasPermi="['system:post:edit']"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
v-hasPermi="['system:post:remove']" <!-- v-hasPermi="['system:post:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -78,11 +78,11 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="岗位编号" align="center" prop="postId" /> <!-- <el-table-column label="岗位编号" align="center" prop="postId" />-->
<el-table-column label="岗位编码" align="center" prop="postCode" /> <!-- <el-table-column label="岗位编码" align="center" prop="postCode" />-->
<el-table-column label="岗位名称" align="center" prop="postName" /> <el-table-column label="岗位名称" align="center" prop="postName" />
<el-table-column label="岗位排序" align="center" prop="postSort" /> <!-- <el-table-column label="岗位排序" align="center" prop="postSort" />-->
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" /> <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
@ -126,9 +126,9 @@
<el-form-item label="岗位编码" prop="postCode"> <el-form-item label="岗位编码" prop="postCode">
<el-input v-model="form.postCode" placeholder="请输入编码名称" /> <el-input v-model="form.postCode" placeholder="请输入编码名称" />
</el-form-item> </el-form-item>
<el-form-item label="岗位顺序" prop="postSort"> <!-- <el-form-item label="岗位顺序" prop="postSort">-->
<el-input-number v-model="form.postSort" controls-position="right" :min="0" /> <!-- <el-input-number v-model="form.postSort" controls-position="right" :min="0" />-->
</el-form-item> <!-- </el-form-item>-->
<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
@ -195,9 +195,9 @@ export default {
postCode: [ postCode: [
{ required: true, message: "岗位编码不能为空", trigger: "blur" } { required: true, message: "岗位编码不能为空", trigger: "blur" }
], ],
postSort: [ // postSort: [
{ required: true, message: "岗位顺序不能为空", trigger: "blur" } // { required: true, message: "", trigger: "blur" }
] // ]
} }
}; };
}, },

View File

@ -65,26 +65,26 @@
v-hasPermi="['system:role:add']" v-hasPermi="['system:role: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" <!-- type="success"-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
v-hasPermi="['system:role:edit']" <!-- v-hasPermi="['system:role:edit']"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
v-hasPermi="['system:role:remove']" <!-- v-hasPermi="['system:role:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -98,11 +98,11 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="角色编号" prop="roleId" width="120" /> <el-table-column label="角色编号" prop="roleId" width="120" />
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" /> <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
<el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" /> <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
<el-table-column label="显示顺序" prop="roleSort" width="100" /> <!-- <el-table-column label="显示顺序" prop="roleSort" width="100" />-->
<el-table-column label="状态" align="center" width="100"> <el-table-column label="状态" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
@ -162,9 +162,9 @@
<el-form-item label="权限字符" prop="roleKey"> <el-form-item label="权限字符" prop="roleKey">
<el-input v-model="form.roleKey" placeholder="请输入权限字符" /> <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
</el-form-item> </el-form-item>
<el-form-item label="角色顺序" prop="roleSort"> <!-- <el-form-item label="角色顺序" prop="roleSort">-->
<el-input-number v-model="form.roleSort" controls-position="right" :min="0" /> <!-- <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />-->
</el-form-item> <!-- </el-form-item>-->
<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
@ -329,9 +329,9 @@ export default {
roleKey: [ roleKey: [
{ required: true, message: "权限字符不能为空", trigger: "blur" } { required: true, message: "权限字符不能为空", trigger: "blur" }
], ],
roleSort: [ // roleSort: [
{ required: true, message: "角色顺序不能为空", trigger: "blur" } // { required: true, message: "", trigger: "blur" }
] // ]
} }
}; };
}, },

View File

@ -4,28 +4,35 @@
<!--部门数据--> <!--部门数据-->
<el-col :span="4" :xs="24"> <el-col :span="4" :xs="24">
<div class="head-container"> <div class="head-container">
<el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" /> <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
style="margin-bottom: 20px"/>
</div> </div>
<div class="head-container"> <div class="head-container">
<el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" default-expand-all @node-click="handleNodeClick" /> <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
:filter-node-method="filterNode" ref="tree" default-expand-all @node-click="handleNodeClick"/>
</div> </div>
</el-col> </el-col>
<!--用户数据--> <!--用户数据-->
<el-col :span="20" :xs="24"> <el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户名称" prop="userName"> <el-form-item label="用户名称" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable size="small" 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 v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable size="small"
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 v-model="queryParams.status" placeholder="用户状态" clearable size="small" style="width: 240px"> <el-select v-model="queryParams.status" placeholder="用户状态" clearable size="small" style="width: 240px">
<el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" /> <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel"
:value="dict.dictValue"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> <el-date-picker v-model="dateRange" size="small" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期"
end-placeholder="结束日期"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -35,33 +42,40 @@
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button> <el-button type="primary" 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" 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" 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" icon="el-icon-upload2" size="mini" @click="handleImport"
v-hasPermi="['system:user:import']">导入
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button> <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport"
</el-col> v-hasPermi="['system:user:export']">导出
<el-col :span="1.5"> </el-button>
<el-button type="danger" 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" 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" icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</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>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" /> <!-- <el-table-column type="selection" width="50" align="center" />-->
<el-table-column label="用户编号" align="center" prop="userId" /> <el-table-column label="用户编号" align="center" prop="userId"/>
<el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" /> <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true"/>
<el-table-column label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" /> <el-table-column label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true"/>
<el-table-column label="岗位" align="center" prop="postName" :show-overflow-tooltip="true" /> <el-table-column label="岗位" align="center" prop="postName" :show-overflow-tooltip="true"/>
<el-table-column label="手机号码" align="center" prop="phonenumber" width="120" /> <el-table-column label="手机号码" align="center" prop="phonenumber" width="120"/>
<el-table-column label="状态" align="center"> <el-table-column label="状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch> <el-switch v-model="scope.row.status" 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">
@ -71,14 +85,21 @@
</el-table-column> </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"> <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-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
<el-button v-if="scope.row.userId !== 1" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button> v-hasPermi="['system:user:edit']">修改
<el-button size="mini" type="text" icon="el-icon-key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']">重置</el-button> </el-button>
<el-button v-if="scope.row.userId !== 1" size="mini" type="text" icon="el-icon-delete"
@click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除
</el-button>
<el-button size="mini" type="text" icon="el-icon-key" @click="handleResetPwd(scope.row)"
v-hasPermi="['system:user:resetPwd']">重置
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </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-col> </el-col>
</el-row> </el-row>
@ -88,36 +109,36 @@
<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 v-model="form.nickName" placeholder="请输入用户昵称" /> <el-input v-model="form.nickName" placeholder="请输入用户昵称"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="归属部门" prop="deptId"> <el-form-item label="归属部门" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" /> <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" 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="phonenumber"> <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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="邮箱" prop="email"> <el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" /> <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50"/>
</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 v-if="form.userId == undefined" label="用户名称" prop="userName"> <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户名称" /> <el-input v-model="form.userName" placeholder="请输入用户名称"/>
</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" /> <el-input v-model="form.password" placeholder="请输入用户密码" type="password"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -125,14 +146,17 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用户性别"> <el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择"> <el-select v-model="form.sex" placeholder="请选择">
<el-option v-for="dict in sexOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option> <el-option v-for="dict in sexOptions" :key="dict.dictValue" :label="dict.dictLabel"
:value="dict.dictValue"/>
</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="状态"> <el-form-item label="状态">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{dict.dictLabel}}</el-radio> <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">
{{dict.dictLabel}}
</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -140,15 +164,23 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="岗位"> <el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择"> <el-select v-model="form.postId" placeholder="请选择">
<el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" :disabled="item.status == 1"></el-option> <el-option v-for="item in postOptions"
:key="item.postId"
:label="item.postName"
:value="parseInt(item.postId)"
:disabled="item.status == 1"/>
</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="角色"> <el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择"> <el-select v-model="form.roleId" placeholder="请选择">
<el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option> <el-option v-for="item in roleOptions"
:key="item.roleId"
:label="item.roleName"
:value="parseInt(item.roleId)"
:disabled="item.status == 1"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -169,14 +201,17 @@
<!-- 用户导入对话框 --> <!-- 用户导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body> <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-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"> <div class="el-upload__text">
将文件拖到此处 将文件拖到此处
<em>点击上传</em> <em>点击上传</em>
</div> </div>
<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"/>
是否更新已经存在的用户数据
<el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link> <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
</div> </div>
<div class="el-upload__tip" style="color:red" slot="tip">提示仅允许导入xlsxlsx格式文件</div> <div class="el-upload__tip" style="color:red" slot="tip">提示仅允许导入xlsxlsx格式文件</div>
@ -190,364 +225,379 @@
</template> </template>
<script> <script>
import { import {
listUser, listUser,
getUser, getUser,
delUser, delUser,
addUser, addUser,
updateUser, updateUser,
exportUser, exportUser,
resetUserPwd, resetUserPwd,
changeUserStatus, changeUserStatus,
importTemplate, importTemplate,
} from "@/api/system/user"; } from "@/api/system/user";
import { getToken } from "@/utils/auth"; import {getToken} from "@/utils/auth";
import { treeselect } from "@/api/system/dept"; import {treeselect} from "@/api/system/dept";
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";
export default { export default {
name: "User", name: "User",
components: { Treeselect }, components: {Treeselect},
data() { data() {
return { return {
// //
loading: true, loading: true,
// //
ids: [], ids: [],
// //
single: true, single: true,
// //
multiple: true, multiple: true,
// //
showSearch: true, showSearch: true,
// //
total: 0, total: 0,
// //
userList: null, userList: null,
// //
title: "",
//
deptOptions: undefined,
//
open: false,
//
deptName: undefined,
//
initPassword: undefined,
//
dateRange: [],
//
statusOptions: [],
//
sexOptions: [],
//
postOptions: [],
//
roleOptions: [],
//
form: {},
defaultProps: {
children: "children",
label: "label",
},
//
upload: {
//
open: false,
//
title: "", title: "",
// //
isUploading: false, deptOptions: undefined,
// //
updateSupport: 0, open: false,
// //
headers: { Authorization: "Bearer " + getToken() }, deptName: undefined,
// //
url: process.env.VUE_APP_BASE_API + "/system/user/importData", initPassword: undefined,
}, //
// dateRange: [],
queryParams: { //
pageNum: 1, statusOptions: [],
pageSize: 10, //
userName: undefined, sexOptions: [],
phonenumber: undefined, //
status: undefined, postOptions: [],
deptId: undefined, //
}, roleOptions: [],
// //
rules: { form: {},
userName: [ defaultProps: {
{ required: true, message: "用户名称不能为空", trigger: "blur" }, children: "children",
], label: "label",
nickName: [ },
{ required: true, message: "用户昵称不能为空", trigger: "blur" }, //
], upload: {
deptId: [ //
{ required: true, message: "归属部门不能为空", trigger: "blur" }, open: false,
], //
password: [ title: "",
{ required: true, message: "用户密码不能为空", trigger: "blur" }, //
], isUploading: false,
email: [ //
{ required: true, message: "邮箱地址不能为空", trigger: "blur" }, updateSupport: 0,
{ //
type: "email", headers: {Authorization: "Bearer " + getToken()},
message: "'请输入正确的邮箱地址", //
trigger: ["blur", "change"], url: process.env.VUE_APP_BASE_API + "/system/user/importData",
}, },
], //
phonenumber: [ queryParams: {
{ required: true, message: "手机号码不能为空", trigger: "blur" }, pageNum: 1,
{ pageSize: 10,
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, userName: undefined,
message: "请输入正确的手机号码", phonenumber: undefined,
trigger: "blur", status: undefined,
}, deptId: undefined,
], },
}, //
}; rules: {
}, userName: [
watch: { {required: true, message: "用户名称不能为空", trigger: "blur"},
// ],
deptName(val) { nickName: [
this.$refs.tree.filter(val); {required: true, message: "用户昵称不能为空", trigger: "blur"},
}, ],
}, deptId: [
created() { {required: true, message: "归属部门不能为空", trigger: "blur"},
this.getList(); ],
this.getTreeselect(); password: [
this.getDicts("sys_normal_disable").then((response) => { {required: true, message: "用户密码不能为空", trigger: "blur"},
this.statusOptions = response.data; ],
}); email: [
this.getDicts("sys_user_sex").then((response) => { {required: true, message: "邮箱地址不能为空", trigger: "blur"},
this.sexOptions = response.data; {
}); type: "email",
this.getConfigKey("sys.user.initPassword").then((response) => { message: "'请输入正确的邮箱地址",
this.initPassword = response.msg; trigger: ["blur", "change"],
}); },
}, ],
methods: { phonenumber: [
/** 查询用户列表 */ {required: true, message: "手机号码不能为空", trigger: "blur"},
getList() { {
this.loading = true; pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
listUser(this.addDateRange(this.queryParams, this.dateRange)).then( message: "请输入正确的手机号码",
(response) => { trigger: "blur",
this.userList = response.rows; },
this.total = response.total; ],
this.loading = false; },
}
);
},
/** 查询部门下拉树结构 */
getTreeselect() {
treeselect().then((response) => {
this.deptOptions = response.data;
});
},
//
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
//
handleNodeClick(data) {
this.queryParams.deptId = data.id;
this.getList();
},
//
handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用";
this.$confirm(
'确认要"' + text + '""' + row.userName + '"用户吗?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(function () {
return changeUserStatus(row.userId, row.status);
})
.then(() => {
this.msgSuccess(text + "成功");
})
.catch(function () {
row.status = row.status === "0" ? "1" : "0";
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
userId: undefined,
deptId: undefined,
userName: undefined,
nickName: undefined,
password: undefined,
phonenumber: undefined,
email: undefined,
sex: undefined,
status: "0",
remark: undefined,
postIds: [],
roleIds: [],
}; };
this.resetForm("form");
}, },
/** 搜索按钮操作 */ watch: {
handleQuery() { //
this.queryParams.page = 1; deptName(val) {
this.$refs.tree.filter(val);
},
},
created() {
this.getList(); this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.userId);
this.single = selection.length != 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.getTreeselect(); this.getTreeselect();
getUser().then((response) => { this.getDicts("sys_normal_disable").then((response) => {
this.postOptions = response.posts; this.statusOptions = response.data;
this.roleOptions = response.roles; });
this.open = true; this.getDicts("sys_user_sex").then((response) => {
this.title = "添加用户"; this.sexOptions = response.data;
this.form.password = this.initPassword; });
this.getConfigKey("sys.user.initPassword").then((response) => {
this.initPassword = response.msg;
}); });
}, },
/** 修改按钮操作 */ methods: {
handleUpdate(row) { /** 查询用户列表 */
this.reset(); getList() {
this.getTreeselect(); this.loading = true;
const userId = row.userId || this.ids; listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
getUser(userId).then((response) => { (response) => {
this.form = response.data; this.userList = response.rows;
this.postOptions = response.posts; this.total = response.total;
this.roleOptions = response.roles; this.loading = false;
this.form.postIds = response.postIds;
this.form.roleIds = response.roleIds;
this.open = true;
this.title = "修改用户";
this.form.password = "";
});
},
/** 重置密码按钮操作 */
handleResetPwd(row) {
this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
})
.then(({ value }) => {
resetUserPwd(row.userId, value).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功,新密码是:" + value);
}
});
})
.catch(() => {});
},
/** 提交按钮 */
submitForm: function () {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.userId != undefined) {
updateUser(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
}
});
} else {
addUser(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
}
});
} }
} );
}); },
}, /** 查询部门下拉树结构 */
/** 删除按钮操作 */ getTreeselect() {
handleDelete(row) { treeselect().then((response) => {
const userIds = row.userId || this.ids; this.deptOptions = response.data;
this.$confirm( });
'是否确认删除用户编号为"' + userIds + '"的数据项?', },
"警告", //
{ filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
//
handleNodeClick(data) {
this.queryParams.deptId = data.id;
this.getList();
},
//
handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用";
this.$confirm(
'确认要"' + text + '""' + row.userName + '"用户吗?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(function () {
return changeUserStatus(row.userId, row.status);
})
.then(() => {
this.msgSuccess(text + "成功");
})
.catch(function () {
row.status = row.status === "0" ? "1" : "0";
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
userId: undefined,
deptId: undefined,
userName: undefined,
nickName: undefined,
password: undefined,
phonenumber: undefined,
email: undefined,
sex: undefined,
status: "0",
remark: undefined,
postIds: [],
roleIds: [],
postId: undefined,
roleId: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.page = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.userId);
this.single = selection.length != 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.getTreeselect();
getUser().then((response) => {
this.postOptions = response.posts;
const defPost = this.postOptions.find(opt => opt.remark === 'default');
this.form.postId = defPost ? defPost.postId : undefined;
this.roleOptions = response.roles;
const defRole = this.roleOptions.find(opt => opt.remark === 'default');
this.form.roleId = defRole ? defRole.roleId : undefined;
this.open = true;
this.title = "添加用户";
this.form.password = this.initPassword;
});
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
this.getTreeselect();
const userId = row.userId || this.ids;
getUser(userId).then((response) => {
this.form = {
...response.data,
roleId: response.data.roles[0].roleId
};
this.postOptions = response.posts;
this.roleOptions = response.roles;
this.form.postIds = response.postIds;
this.form.roleIds = response.roleIds;
this.open = true;
this.title = "修改用户";
this.form.password = "";
});
},
/** 重置密码按钮操作 */
handleResetPwd(row) {
this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
})
.then(({value}) => {
resetUserPwd(row.userId, value).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功,新密码是:" + value);
}
});
})
.catch(() => {
});
},
/** 提交按钮 */
submitForm: function () {
this.$refs["form"].validate((valid) => {
if (valid) {
this.form.postId && (this.form.postIds = [this.form.postId]);
this.form.roleId && (this.form.roleIds = [this.form.roleId]);
// console.log(this.form)
if (this.form.userId != undefined) {
updateUser(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
}
});
} else {
addUser(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
}
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const userIds = row.userId || this.ids;
this.$confirm(
'是否确认删除用户编号为"' + userIds + '"的数据项?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(function () {
return delUser(userIds);
})
.then(() => {
this.getList();
this.msgSuccess("删除成功");
})
.catch(function () {
});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm("是否确认导出所有用户数据项?", "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}
)
.then(function () {
return delUser(userIds);
}) })
.then(() => { .then(function () {
this.getList(); return exportUser(queryParams);
this.msgSuccess("删除成功"); })
}) .then((response) => {
.catch(function () {}); this.download(response.msg);
}, })
/** 导出按钮操作 */ .catch(function () {
handleExport() { });
const queryParams = this.queryParams; },
this.$confirm("是否确认导出所有用户数据项?", "警告", { /** 导入按钮操作 */
confirmButtonText: "确定", handleImport() {
cancelButtonText: "取消", this.upload.title = "用户导入";
type: "warning", this.upload.open = true;
}) },
.then(function () { /** 下载模板操作 */
return exportUser(queryParams); importTemplate() {
}) importTemplate().then((response) => {
.then((response) => {
this.download(response.msg); this.download(response.msg);
}) });
.catch(function () {}); },
//
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
},
//
handleFileSuccess(response, file, fileList) {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert(response.msg, "导入结果", {dangerouslyUseHTMLString: true});
this.getList();
},
//
submitFileForm() {
this.$refs.upload.submit();
},
}, },
/** 导入按钮操作 */ };
handleImport() {
this.upload.title = "用户导入";
this.upload.open = true;
},
/** 下载模板操作 */
importTemplate() {
importTemplate().then((response) => {
this.download(response.msg);
});
},
//
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
},
//
handleFileSuccess(response, file, fileList) {
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
this.getList();
},
//
submitFileForm() {
this.$refs.upload.submit();
},
},
};
</script> </script>