|
@@ -17,8 +17,8 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="用户性别" prop="sex">
|
|
|
- <el-select v-model="queryParams.sex" placeholder="用户性别" clearable>
|
|
|
+ <el-form-item label="性别" prop="sex">
|
|
|
+ <el-select v-model="queryParams.sex" placeholder="性别" clearable>
|
|
|
<el-option
|
|
|
v-for="dict in dict.type.sys_user_sex"
|
|
|
:key="dict.value"
|
|
@@ -27,18 +27,18 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="城市" prop="city">
|
|
|
+ <el-form-item label="电话号" prop="phone">
|
|
|
<el-input
|
|
|
- v-model="queryParams.city"
|
|
|
- placeholder="请输入城市"
|
|
|
+ v-model="queryParams.phone"
|
|
|
+ placeholder="请输入电话号"
|
|
|
clearable
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="地区" prop="area">
|
|
|
+ <el-form-item label="城市" prop="city">
|
|
|
<el-input
|
|
|
- v-model="queryParams.area"
|
|
|
- placeholder="请输入地区"
|
|
|
+ v-model="queryParams.city"
|
|
|
+ placeholder="请输入城市"
|
|
|
clearable
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
@@ -68,18 +68,28 @@
|
|
|
<el-table-column label="openid" align="center" prop="openid" />
|
|
|
<el-table-column label="姓名" align="center" prop="name" />
|
|
|
<el-table-column label="昵称" align="center" prop="nickname" />
|
|
|
- <el-table-column label="用户性别" align="center" prop="sex" >
|
|
|
+ <el-table-column label="性别" align="center" prop="sex" >
|
|
|
<template slot-scope="scope">
|
|
|
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column label="电话号" align="center" prop="phone" />
|
|
|
<el-table-column label="城市" align="center" prop="city" />
|
|
|
- <el-table-column label="地区" align="center" prop="area" />
|
|
|
- <el-table-column label="身高" align="center" prop="height" />
|
|
|
- <el-table-column label="体重" align="center" prop="weight" />
|
|
|
- <el-table-column label="主要项目" align="center" prop="type" />
|
|
|
- <el-table-column label="球龄" align="center" prop="ballYears" />
|
|
|
- <el-table-column label="队内位置" align="center" prop="place" />
|
|
|
+ <el-table-column label="主要项目" align="center" prop="type" >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <dict-tag :options="dict.type.sys_user_type" :value="scope.row.type"/>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="球龄" align="center" prop="ballYears" >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <dict-tag :options="dict.type.sys_user_year" :value="scope.row.ballYears"/>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="队内位置" align="center" prop="place" >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <dict-tag :options="dict.type.sys_user_place" :value="scope.row.place"/>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
@@ -100,24 +110,23 @@
|
|
|
:limit.sync="queryParams.pageSize"
|
|
|
@pagination="getList"
|
|
|
/>
|
|
|
-
|
|
|
<!-- 添加或修改代码生成用户字段对话框 -->
|
|
|
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
|
|
+ <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="true">
|
|
|
- <el-form-item label="openid" prop="openid">
|
|
|
- <el-input v-model="form.openid" placeholder="请输入openid" />
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="头像" prop="icon">
|
|
|
<el-avatar shape="square" size="large" :src="form.icon"></el-avatar>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="openid" prop="openid">
|
|
|
+ <el-input v-model="form.openid" placeholder="请输入openid" />
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="姓名" prop="name">
|
|
|
<el-input v-model="form.name" placeholder="请输入姓名" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="昵称" prop="nickname">
|
|
|
<el-input v-model="form.nickname" placeholder="请输入昵称" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="用户性别" prop="sex">
|
|
|
- <el-radio-group v-model="form.status">
|
|
|
+ <el-form-item label="性别" prop="sex">
|
|
|
+ <el-radio-group v-model="form.sex">
|
|
|
<el-radio
|
|
|
v-for="dict in dict.type.sys_user_sex"
|
|
|
:key="dict.value"
|
|
@@ -125,23 +134,47 @@
|
|
|
>{{dict.label}}</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="电话号" prop="phone">
|
|
|
+ <el-input v-model="form.phone" placeholder="请输入电话号" />
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="城市" prop="city">
|
|
|
<el-input v-model="form.city" placeholder="请输入城市" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="地区" prop="area">
|
|
|
- <el-input v-model="form.area" placeholder="请输入地区" />
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="身高" prop="height">
|
|
|
<el-input v-model="form.height" placeholder="请输入身高" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="体重" prop="weight">
|
|
|
<el-input v-model="form.weight" placeholder="请输入体重" />
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="主要项目" prop="type">
|
|
|
+ <el-select v-model="form.type" placeholder="请选择主要项目">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.sys_user_type"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="球龄" prop="ballYears">
|
|
|
- <el-input v-model="form.ballYears" placeholder="请输入球龄" />
|
|
|
+ <el-select v-model="form.ballYears" placeholder="请选择球龄">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.sys_user_year"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="队内位置" prop="place">
|
|
|
- <el-input v-model="form.place" placeholder="请输入队内位置" />
|
|
|
+ <el-select v-model="form.place" placeholder="请选择队内位置">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.sys_user_place"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</el-dialog>
|
|
@@ -153,7 +186,7 @@ import { listUser, getUser } from "@/api/system/matchUser";
|
|
|
|
|
|
export default {
|
|
|
name: "User",
|
|
|
- dicts: ['sys_user_sex'],
|
|
|
+ dicts: ['sys_user_sex','sys_user_type','sys_user_place','sys_user_year'],
|
|
|
data() {
|
|
|
return {
|
|
|
// 遮罩层
|
|
@@ -178,18 +211,10 @@ export default {
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
- openid: null,
|
|
|
- icon: null,
|
|
|
name: null,
|
|
|
nickname: null,
|
|
|
sex: null,
|
|
|
city: null,
|
|
|
- area: null,
|
|
|
- height: null,
|
|
|
- weight: null,
|
|
|
- type: null,
|
|
|
- ballYears: null,
|
|
|
- place: null
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
@@ -219,14 +244,13 @@ export default {
|
|
|
// 表单重置
|
|
|
reset() {
|
|
|
this.form = {
|
|
|
- Id: null,
|
|
|
+ id: null,
|
|
|
openid: null,
|
|
|
icon: null,
|
|
|
name: null,
|
|
|
nickname: null,
|
|
|
sex: null,
|
|
|
city: null,
|
|
|
- area: null,
|
|
|
height: null,
|
|
|
weight: null,
|
|
|
type: null,
|
|
@@ -247,14 +271,14 @@ export default {
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
- this.ids = selection.map(item => item.Id)
|
|
|
+ this.ids = selection.map(item => item.id)
|
|
|
this.single = selection.length!==1
|
|
|
this.multiple = !selection.length
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleView(row) {
|
|
|
this.reset();
|
|
|
- const Id = row.Id || this.ids
|
|
|
+ const Id = row.id || this.ids
|
|
|
getUser(Id).then(response => {
|
|
|
this.form = response.data;
|
|
|
this.open = true;
|