|
@@ -1,12 +1,13 @@
|
|
|
<template>
|
|
|
<div>
|
|
|
<a-modal
|
|
|
+ centered
|
|
|
class="modalBox"
|
|
|
+ :maskClosable="false"
|
|
|
:title="titleText"
|
|
|
v-model="isshow"
|
|
|
@cancle="cancel"
|
|
|
- width="45%"
|
|
|
- :centered="true">
|
|
|
+ width="45%">
|
|
|
<a-form :form="form" @submit="handleSubmit">
|
|
|
<a-row :gutter="24">
|
|
|
<a-col :span="12">
|
|
@@ -17,6 +18,7 @@
|
|
|
:maxLength="30"
|
|
|
v-decorator="['formData.name', {
|
|
|
initialValue: formData.name,
|
|
|
+ getValueFromEvent: $filterEmpty,
|
|
|
rules: [{ required: true, message: '请输入用户名称(30个字以内)!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
|
|
|
/>
|
|
|
</a-form-item>
|
|
@@ -34,7 +36,33 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
-
|
|
|
+ <a-row :gutter="24">
|
|
|
+ <a-col :span="12">
|
|
|
+ <!-- 用户账号 -->
|
|
|
+ <a-form-item label="用户账号" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
|
|
|
+ <a-input
|
|
|
+ placeholder="请输入用户账号"
|
|
|
+ :maxLength="50"
|
|
|
+ v-decorator="['formData.loginName', {
|
|
|
+ initialValue: formData.loginName,
|
|
|
+ rules: [{ required: true, message: '请输入用户账号!' },{pattern: /^[0-9A-Za-z]+$/, message: '用户账号为数字或大小写字母组成!'}] }]"
|
|
|
+ />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :span="12" v-if="!data.id">
|
|
|
+ <!-- 用户密码 -->
|
|
|
+ <a-form-item label="用户密码" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
|
|
|
+ <a-input
|
|
|
+ placeholder="请输入用户密码"
|
|
|
+ :maxLength="16"
|
|
|
+ type="password"
|
|
|
+ v-decorator="['formData.password', {
|
|
|
+ initialValue: formData.password,
|
|
|
+ rules: [{ required: true, message: '请输入用户密码!' },{pattern: /^[0-9A-Za-z]{6,16}$/, message: '用户密码为6到16位数字或大小写字母组成!'}] }]"
|
|
|
+ />
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ </a-row>
|
|
|
<a-row :gutter="24">
|
|
|
<!-- 性别 -->
|
|
|
<a-col :span="12">
|
|
@@ -108,7 +136,7 @@
|
|
|
style="min-height: 50px;"
|
|
|
:maxLength="500"
|
|
|
placeholder="请输入备注(最多500个字符)"
|
|
|
- autosize />
|
|
|
+ autoSize />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
@@ -117,7 +145,7 @@
|
|
|
<a-button type="primary" @click="handleSubmit()" :style="{ marginRight: '8px' }">
|
|
|
保存
|
|
|
</a-button>
|
|
|
- <a-button :style="{ marginLeft: '8px' }" @click="handleCancel()">
|
|
|
+ <a-button :style="{ marginLeft: '8px' }" @click="cancel">
|
|
|
取消
|
|
|
</a-button>
|
|
|
</a-form-item>
|
|
@@ -159,18 +187,18 @@ export default {
|
|
|
name: '',
|
|
|
loginFlag: '', // 活动状态
|
|
|
phone: '',
|
|
|
+ loginName: '',
|
|
|
+ password: '',
|
|
|
sex: '',
|
|
|
remarks: ''
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- cancel (e) {
|
|
|
+ cancel () {
|
|
|
this.clear()
|
|
|
this.$emit('close')
|
|
|
},
|
|
|
-
|
|
|
// 保存提交
|
|
|
handleSubmit () {
|
|
|
const _this = this
|
|
@@ -178,12 +206,8 @@ export default {
|
|
|
console.log(values, 'values222')
|
|
|
if (!err) {
|
|
|
values.formData.roleNames = values.formData.roleNames.join(',')
|
|
|
-
|
|
|
- console.log(values.formData, ' formData.type222222222')
|
|
|
- console.log(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData))
|
|
|
saveUserPower(Object.assign({ id: this.data.id ? this.data.id : '' }, values.formData)).then(res => {
|
|
|
- console.log(res, 'res--save')
|
|
|
- if (res.status + '' === '200') {
|
|
|
+ if (res.status == 200) {
|
|
|
this.$message.success(res.message ? res.message : '保存成功')
|
|
|
this.$emit('refresh')
|
|
|
setTimeout(function () {
|
|
@@ -194,21 +218,6 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- // 取消
|
|
|
- handleCancel () {
|
|
|
- const _this = this
|
|
|
- this.$confirm({
|
|
|
- title: '提示',
|
|
|
- content: '确定取消吗?',
|
|
|
- centered: true,
|
|
|
- okText: '确定',
|
|
|
- cancelText: '取消',
|
|
|
- onOk () {
|
|
|
- _this.clear()
|
|
|
- _this.cancel()
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
clear () {
|
|
|
this.form.resetFields()
|
|
|
delete this.formData.id
|
|
@@ -216,22 +225,21 @@ export default {
|
|
|
this.formData.name = ''
|
|
|
this.formData.loginFlag = ''
|
|
|
this.formData.phone = ''
|
|
|
+ this.formData.loginName = ''
|
|
|
+ this.formData.password = ''
|
|
|
this.formData.sex = ''
|
|
|
this.formData.remarks = ''
|
|
|
},
|
|
|
-
|
|
|
// 获取角色列表接口
|
|
|
getRoleList () {
|
|
|
getRoleList().then(res => {
|
|
|
- console.log(res, 'res--role')
|
|
|
- if (res.status + '' === '200') {
|
|
|
+ if (res.status == 200) {
|
|
|
this.roleList = res.data
|
|
|
} else {
|
|
|
this.$message.warning(res.message)
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
-
|
|
|
},
|
|
|
mounted () {
|
|
|
this.getRoleList()
|
|
@@ -250,13 +258,9 @@ export default {
|
|
|
this.formData = Object.assign({}, this.data)
|
|
|
delete this.formData.no
|
|
|
let roleNames = this.formData.roleNames
|
|
|
- console.log(roleNames, 'roleNames')
|
|
|
if (roleNames) {
|
|
|
roleNames = roleNames.split(',')
|
|
|
- console.log(roleNames, 'roleNames22')
|
|
|
const arr = []
|
|
|
- console.log(this.roleList, 'this.roleList')
|
|
|
-
|
|
|
roleNames.map(item => {
|
|
|
const row = this.roleList.find(a => {
|
|
|
return a.name == item
|
|
@@ -265,16 +269,11 @@ export default {
|
|
|
arr.push(row.id)
|
|
|
}
|
|
|
})
|
|
|
-
|
|
|
- console.log(arr, 'arrs')
|
|
|
this.formData.roleNames = arr
|
|
|
} else {
|
|
|
this.formData.roleNames = []
|
|
|
}
|
|
|
-
|
|
|
this.formData.loginFlag = Number(this.formData.loginFlag)
|
|
|
- // this.formData.sex = Number(this.formData.sex)
|
|
|
- console.log(this.formData, 'this.formData')
|
|
|
} else {
|
|
|
this.titleText = '添加用户'
|
|
|
}
|
|
@@ -286,9 +285,7 @@ export default {
|
|
|
}
|
|
|
</script>
|
|
|
|
|
|
-<style >
|
|
|
- .modalBox{
|
|
|
- }
|
|
|
+<style>
|
|
|
.ant-modal-footer {
|
|
|
display: none;
|
|
|
}
|