|
@@ -7,11 +7,11 @@
|
|
|
<!-- 用户名称 -->
|
|
|
<a-form-item label="员工姓名" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
|
|
|
<a-input
|
|
|
- placeholder="请输入员工姓名"
|
|
|
+ placeholder="请输入员工姓名30个字以内"
|
|
|
id="userModal-name"
|
|
|
v-decorator="['formData.name', {
|
|
|
initialValue: formData.name,
|
|
|
- rules: [{ required: true, message: '请输入员工姓名!' },{pattern:'^[^<|>]{1,20}$',message:'请输入不含<或>的字符,最多20个字符'}] }]"
|
|
|
+ rules: [{ required: true, message: '请输入员工姓名!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
|
|
|
allowClear/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -20,6 +20,7 @@
|
|
|
<a-form-item label="手机号码" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
|
|
|
<a-input
|
|
|
placeholder="请输入手机号码"
|
|
|
+ :maxLength="11"
|
|
|
id="userModal-phone"
|
|
|
v-decorator="['formData.phone', {
|
|
|
initialValue: formData.phone,
|
|
@@ -77,7 +78,6 @@
|
|
|
<a-form-model-item class="form-label" label="所属机构" prop="orgCode" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
|
|
|
<a-tree-select
|
|
|
id="userModal-orgCode"
|
|
|
- v-model="formData.orgCode"
|
|
|
allowClear
|
|
|
style="width: 100%"
|
|
|
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
|
|
@@ -167,9 +167,8 @@ export default {
|
|
|
}),
|
|
|
roleList: [], // 角色
|
|
|
parentCodePaths: '', // 组织机构父路径
|
|
|
- orgCode: '', // 组织机构
|
|
|
formData: {
|
|
|
- orgCode: null,
|
|
|
+ orgCode: null, // 组织机构
|
|
|
name: '', // 员工姓名
|
|
|
loginFlag: '', // 状态
|
|
|
phone: '', // 手机号码
|
|
@@ -221,7 +220,6 @@ export default {
|
|
|
handleSubmit () {
|
|
|
const _this = this
|
|
|
this.form.validateFields((err, values) => {
|
|
|
- // console.log(values)
|
|
|
if (!err) {
|
|
|
values.formData.roleNames = values.formData.roleNames.join(',')
|
|
|
// values.formData.org.id = values.orgCode
|
|
@@ -232,13 +230,13 @@ export default {
|
|
|
id: this.data.id ? this.data.id : ''
|
|
|
}, formData)).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
- this.$message.success(res.message ? res.message : '保存成功')
|
|
|
- this.$emit('refresh')
|
|
|
+ _this.$message.success(res.message)
|
|
|
+ _this.$emit('refresh')
|
|
|
setTimeout(function () {
|
|
|
_this.cancel()
|
|
|
}, 300)
|
|
|
} else {
|
|
|
- this.$message.error(res.message)
|
|
|
+ _this.$message.error(res.message)
|
|
|
}
|
|
|
})
|
|
|
}
|
|
@@ -261,12 +259,12 @@ export default {
|
|
|
clear () {
|
|
|
this.form.resetFields()
|
|
|
delete this.formData.id
|
|
|
- this.formData.orgCode = '' // 所属机构
|
|
|
- this.formData.name = ''
|
|
|
- this.formData.loginFlag = ''
|
|
|
- this.formData.phone = ''
|
|
|
- this.formData.sex = ''
|
|
|
- this.formData.roleNames = []
|
|
|
+ this.formData.orgCode = null // 所属机构
|
|
|
+ this.formData.name = '' // 员工姓名
|
|
|
+ this.formData.loginFlag = '' // 状态
|
|
|
+ this.formData.phone = '' // 手机号码
|
|
|
+ this.formData.sex = '' // 性别
|
|
|
+ this.formData.roleNames = undefined // 角色
|
|
|
},
|
|
|
// 获取角色列表接口
|
|
|
getRoleData () {
|
|
@@ -277,6 +275,33 @@ export default {
|
|
|
this.$message.warning(res.message)
|
|
|
}
|
|
|
})
|
|
|
+ },
|
|
|
+ pageInitData () {
|
|
|
+ const _this = this
|
|
|
+ this.titleText = '编辑用户'
|
|
|
+ this.formData.orgCode = this.data.org.id // 组织机构
|
|
|
+ this.formData.name = this.data.name // 员工姓名
|
|
|
+ this.formData.loginFlag = Number(this.data.loginFlag) // 状态
|
|
|
+ this.formData.phone = this.data.phone // 手机号码
|
|
|
+ this.formData.sex = this.data.sex // 性别
|
|
|
+ let roleNames = this.data.roleNames
|
|
|
+ if (roleNames) {
|
|
|
+ roleNames = roleNames.split(',')
|
|
|
+ setTimeout(() => {
|
|
|
+ const arr = []
|
|
|
+ roleNames.map(item => {
|
|
|
+ console.log(item)
|
|
|
+ const row = this.roleList.find(a => a.name == item)
|
|
|
+ console.log(row, '------------juese')
|
|
|
+ if (row) {
|
|
|
+ arr.push(row.id)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ this.formData.roleNames = arr
|
|
|
+ }, 500)
|
|
|
+ } else {
|
|
|
+ this.formData.roleNames = []
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
beforeCreate () {
|
|
@@ -290,30 +315,11 @@ export default {
|
|
|
},
|
|
|
isshow (newValue, oldValue) {
|
|
|
if (newValue) {
|
|
|
- this.getOrgData()
|
|
|
- this.getRoleData()
|
|
|
+ this.getOrgData() // 打开弹窗获取组织机构数据
|
|
|
+ this.getRoleData() // 打开弹窗获取角色列表数据
|
|
|
+ console.log(this.data, '===shuju')
|
|
|
if (this.data.id) { // 编辑
|
|
|
- console.log(this.data.id)
|
|
|
- this.titleText = '编辑用户'
|
|
|
- this.formData = Object.assign({}, this.data)
|
|
|
- delete this.formData.no
|
|
|
- let roleNames = this.formData.roleNames
|
|
|
- if (roleNames) {
|
|
|
- roleNames = roleNames.split(',')
|
|
|
- const arr = []
|
|
|
- roleNames.map(item => {
|
|
|
- const row = this.roleList.find(a => {
|
|
|
- return a.name == item
|
|
|
- })
|
|
|
- if (row) {
|
|
|
- arr.push(row.id)
|
|
|
- }
|
|
|
- })
|
|
|
- this.formData.roleNames = arr
|
|
|
- } else {
|
|
|
- this.formData.roleNames = []
|
|
|
- }
|
|
|
- this.formData.loginFlag = Number(this.formData.loginFlag)
|
|
|
+ this.pageInitData()
|
|
|
} else {
|
|
|
this.titleText = '添加用户'
|
|
|
}
|
|
@@ -325,7 +331,7 @@ export default {
|
|
|
}
|
|
|
</script>
|
|
|
|
|
|
-<style>
|
|
|
+<style >
|
|
|
.ant-modal-footer {
|
|
|
display: none;
|
|
|
}
|