|
|
@@ -71,11 +71,16 @@
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="角色" prop="roleId">
|
|
|
- <el-select v-model="adForm.roleId" size="small" placeholder="请选择角色">
|
|
|
+ <el-select
|
|
|
+ v-model="adForm.roleName"
|
|
|
+ size="small"
|
|
|
+ placeholder="请选择角色"
|
|
|
+ @change="selRoleFn"
|
|
|
+ >
|
|
|
<el-option
|
|
|
v-for="(item, index) in roleList"
|
|
|
:key="index"
|
|
|
- :value="item.id"
|
|
|
+ :value="item.roleName"
|
|
|
>{{ item.roleName }}</el-option
|
|
|
>
|
|
|
</el-select>
|
|
|
@@ -112,9 +117,9 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="手机号" prop="mobile">
|
|
|
<el-input
|
|
|
- v-model="adForm.mobile"
|
|
|
- placeholder="请输入手机号"
|
|
|
- size="small"
|
|
|
+ v-model="adForm.mobile"
|
|
|
+ placeholder="请输入手机号"
|
|
|
+ size="small"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="登陆密码" prop="password">
|
|
|
@@ -165,17 +170,17 @@ export default {
|
|
|
roleSet
|
|
|
},
|
|
|
data() {
|
|
|
- var checkMobile = (rule, value, callback) => {
|
|
|
- if (this.$util.isEmpty(value)) {
|
|
|
- callback(new Error('请输入手机号'));
|
|
|
- } else {
|
|
|
- if(this.$util.checkPhone(value)){
|
|
|
- callback();
|
|
|
- }else {
|
|
|
- callback(new Error('输入手机号错误'));
|
|
|
+ var checkMobile = (rule, value, callback) => {
|
|
|
+ if (this.$util.isEmpty(value)) {
|
|
|
+ callback(new Error('请输入手机号'));
|
|
|
+ } else {
|
|
|
+ if (this.$util.checkPhone(value)) {
|
|
|
+ callback();
|
|
|
+ } else {
|
|
|
+ callback(new Error('输入手机号错误'));
|
|
|
}
|
|
|
- }
|
|
|
- };
|
|
|
+ }
|
|
|
+ };
|
|
|
return {
|
|
|
app: null,
|
|
|
// 修改弹窗
|
|
|
@@ -186,6 +191,7 @@ export default {
|
|
|
adForm: {
|
|
|
adminName: '',
|
|
|
roleId: '',
|
|
|
+ roleName: '',
|
|
|
remind: '1',
|
|
|
password: '',
|
|
|
userId: '',
|
|
|
@@ -194,9 +200,9 @@ export default {
|
|
|
},
|
|
|
ruleForm: {
|
|
|
adminName: [{ required: true, message: '请输入名称', trigger: 'blur' }],
|
|
|
- roleId: [{ required: true, message: '请选择角色', trigger: 'change' }],
|
|
|
+ roleName: [{ required: true, message: '请选择角色', trigger: 'change' }],
|
|
|
userId: [{ required: true, message: '请选择会员', trigger: 'blur' }],
|
|
|
- mobile: [{ required: true, trigger: 'blur',validator:checkMobile }],
|
|
|
+ mobile: [{ required: true, trigger: 'blur', validator: checkMobile }],
|
|
|
password: [{ required: true, message: '请输入密码', trigger: 'blur' }]
|
|
|
},
|
|
|
// 角色列表
|
|
|
@@ -245,7 +251,7 @@ export default {
|
|
|
data.endTime = this.$util.$formatDate(data.endTime);
|
|
|
if (this.$util.isEmpty(data)) return;
|
|
|
Object.keys(this.adForm).forEach(i => {
|
|
|
- if (i == 'password') return false;
|
|
|
+ // if (i == 'password') return false;
|
|
|
this.adForm[i] = data[i];
|
|
|
});
|
|
|
},
|
|
|
@@ -261,6 +267,12 @@ export default {
|
|
|
this.$message.success('操作成功!');
|
|
|
});
|
|
|
},
|
|
|
+ // dialog
|
|
|
+ selRoleFn(val) {
|
|
|
+ let index = this.roleList.findIndex(e => e.roleName == val);
|
|
|
+ this.adForm.roleId = this.roleList[index].id;
|
|
|
+ console.log('this.adForm.roleId', this.adForm.roleId);
|
|
|
+ },
|
|
|
resetForm() {
|
|
|
this.$refs['adForm'].resetFields();
|
|
|
this.memberData = {};
|
|
|
@@ -268,7 +280,9 @@ export default {
|
|
|
},
|
|
|
|
|
|
addFn() {
|
|
|
+ let adForm = JSON.parse(JSON.stringify(this.adForm));
|
|
|
let host = null;
|
|
|
+ delete adForm.roleName;
|
|
|
if (this.addOrModify == 1) {
|
|
|
host = () => {
|
|
|
return this.$service.staff.add(this.adForm);
|
|
|
@@ -277,11 +291,11 @@ export default {
|
|
|
host = () => {
|
|
|
return this.$service.staff.update({
|
|
|
id: this.modifyData.id,
|
|
|
- ...this.adForm
|
|
|
+ ...adForm
|
|
|
});
|
|
|
};
|
|
|
}
|
|
|
- host(this.adForm).then(res => {
|
|
|
+ host(adForm).then(res => {
|
|
|
this.$message.success('操作成功!');
|
|
|
this.resetForm();
|
|
|
this.app.refresh({ type: this.tabIndex });
|
liujd