Skip to content

9
91isoft_vue_manage
Commit 97af6d6c authored by shen_yan_pu's avatar shen_yan_pu
Browse files
Options

修改部分功能

parent 3e1dfc0e
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 52 deletions
src/api/system/user.js
View file @ 97af6d6c
......@@ -31,7 +31,10 @@ export function addUser(data) {
return request({
url: '/system/user/add',
method: 'post',
data
data,
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
}
})
}
......@@ -61,7 +64,7 @@ export function delUser(userId) {
export function exportUser(query) {
return request({
url: '/system/user/export',
method: 'post',
method: 'get',
params: query,
responseType: 'blob'
})
......
src/views/system/user/index.vue
View file @ 97af6d6c
......@@ -110,7 +110,7 @@
</el-table-column>
<el-table-column label="用户类型" prop="userType" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.nickName || '-' }}
{{ scope.row.name || '-' }}
</template>
</el-table-column>
<el-table-column label="手机号" prop="phone" :show-overflow-tooltip="true">
......@@ -199,13 +199,17 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="手机号码" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
<el-form-item label="手机号码" prop="phone">
<el-input
value="phone"
v-model.trim="form.phone"
placeholder="请输入手机号码"
maxlength="11" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
<el-form-item label="邮箱" prop="email">
<el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" />
</el-form-item>
</el-col>
</el-row>
......@@ -223,13 +227,13 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入用户姓名" />
<el-form-item label="用户类型" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入用户类型" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model="form.idNumber" placeholder="请输入身份证号" />
<el-form-item label="身份证号" prop="idNumber">
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
</el-form-item>
</el-col>
</el-row>
......@@ -270,8 +274,8 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<!-- 用户导入对话框 -->
......@@ -357,15 +361,13 @@ import { getToken } from '@/utils/auth'
import { getChildrenDept, treeselect } from '@/api/system/dept'
import TreeSelect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
// import business from '../../../../mock/business'
// import business from '../../../../mock/business'
export default {
name: 'User',
components: { TreeSelect },
data() {
var trueGroupName = (rule, value, callback) => {
if (!value.trim()) {
if (value && !value.trim()) {
return callback(new Error('请输入正确的用户昵称'))
}
callback()
......@@ -377,6 +379,27 @@ export default {
}
callback()
}
var phone = (rule, value, callback) => {
if (!value) {
return callback(new Error('请输入手机号'))
} else {
callback()
}
}
var idNumber = (rule, value, callback) => {
if (!value) {
return callback(new Error('请输入身份证号'))
} else {
callback()
}
}
var name = (rule, value, callback) => {
if (!value) {
return callback(new Error('请输入用户类型'))
} else {
callback()
}
}
return {
pwdTypeMap: {
text: true,
......@@ -413,10 +436,6 @@ export default {
// dateRange: ['', ''],
// 状态数据字典
statusOptions: [
{
dictLabel: '全部',
dictValue: ''
},
{
dictLabel: '启用',
dictValue: '1'
......@@ -438,7 +457,13 @@ export default {
// 子部门信息
deptChildren: [],
// 表单参数
form: {},
form: {
username: '',
phone: '',
email: '',
idNumber: '',
name: ''
},
defaultProps: {
children: 'children',
label: 'label'
......@@ -467,10 +492,13 @@ export default {
pageNum: 1,
pageSize: 10,
username: '',
email: '',
phone: '',
nickName: '',
idNumber: '',
userType: '',
allowLogin: '',
status: '',
phone: '',
deptId: '',
flag: undefined,
name: undefined
......@@ -495,6 +523,10 @@ export default {
trigger: 'blur'
}
],
name: [
{ require: true, message: '用户姓名不能为空', trigger: 'blur' },
{ validator: name, trigger: 'blur' }
],
email: [
{ required: false, message: '请输入邮箱地址', trigger: 'blur' },
{
......@@ -504,12 +536,9 @@ export default {
}
],
newPassword: [
{ required: true, message: '请输入新密码', trigger: 'blur' },
{ required: true, message: '请输入密码', trigger: 'blur' },
{ min: 8, max: 16, message: '长度在 8 到 16 个字符', trigger: 'blur' },
{
validator: passwordCheck,
trigger: 'blur'
}
{ validator: passwordCheck, trigger: 'blur' }
],
phone: [
{ required: false, message: '请输入手机号码', trigger: 'blur' },
......@@ -517,7 +546,13 @@ export default {
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: '请输入正确的手机号码',
trigger: 'blur'
}
},
{ validator: phone, trigger: 'blur' }
],
idNumber: [
{ require: true, message: '请输入身份证号', trigger: 'blur' },
{ min: 18, max: 18, message: '长度18字符', trigger: 'blur' },
{ validator: idNumber, trigger: 'blur' }
]
},
userInfoLoading: false,
......@@ -543,8 +578,8 @@ export default {
changeValue() {
this.$refs.form.validateField('id')
},
// 用户登录控制
/** toggleLoginAuth(row) {
/** // 用户登录控制
toggleLoginAuth(row) {
const status = row.allowLogin === '1' ? '禁止' : '允许'
this.$confirm(`“${row.username}”即将被${status}登录, 是否继续？`, '提示', {
confirmButtonText: '确定',
......@@ -648,6 +683,7 @@ export default {
userType: undefined,
nickName: undefined,
password: undefined,
idNumber: undefined,
email: undefined,
sex: undefined,
status: '0',
......@@ -676,26 +712,20 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset()
getUser().then(response => {
this.open = true
this.postOptions = response.posts
this.roleOptions = response.roles
this.getChildrenDept()
this.title = '添加'
this.form.password = this.initPassword
})
this.getChildrenDept(0)
this.open = true
this.title = '添加用户'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const businessId = row.businessId || this.ids
getUser(row.businessId).then(response => {
this.form = response.data
const userId = row.businessId || this.ids
getUser(userId).then(response => {
this.open = true
this.form = response.data
this.title = '修改'
this.form.password = ''
})
this.getChildrenDept(businessId)
this.getChildrenDept(userId)
},
/** 重置密码按钮操作 */
handleResetPwd(row) {
......@@ -703,9 +733,9 @@ export default {
confirmButtonText: '确定',
cancelButtonText: '取消'
}).then(({ value }) => {
resetUserPwd(row.businessId, value).then(response => {
resetUserPwd(this.businessId, value).then(response => {
this.$message({
message: '修改成功，新密码是：' + value
message: '修改成功，新密码是：' + 'value'
})
})
}).catch(() => {})
......@@ -754,14 +784,11 @@ export default {
})
} else {
addUser(this.form).then(response => {
if (response.code === 200) {
this.$message({
message: '新增成功',
type: 'success'
})
this.open = false
this.getList()
}
this.$message({
message: '新增成功', type: 'success'
})
this.open = false
this.getList()
})
}
}
......
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